[#4978] Fix a couple of puppet-test bugs