Merge "Improve Test coverage of pmproducer Issue-ID: NONRTRIC-877"