Updating tests per recommendations from #puppet-dev, zaphod42