Fix test issues uncovered after update to Puppet 5
Fix test issues uncovered after update to Puppet 5

Eventually we should just switch this whole project to onceover rather
than the custom stuff in here now.

Just working around stuff for the moment.

puppetlabs-seteam/control-repo,robertmaury/control-repo,puppetlabs-seteam/control-repo,murdok5/control-repo,robertmaury/control-repo,murdok5/control-repo,puppetlabs-seteam/control-repo,murdok5/control-repo