[#5361] Puppet-test fixes