Fix test
Fix test

Made some code more consistent during the rebase, which broke some unit
tests. Updated those tests.

Fixes puppetlabs/puppetlabs-git#33 and fixes
puppetlabs/puppetlabs-git#24

mhaskel/puppetlabs-git,johnduarte/puppetlabs-git,michaeldfallen/puppetlabs-git,redhat-cip/puppetlabs-git,coffeecoco/puppet-git,patrickkelso/puppetlabs-git,gwdg/puppetlabs-git,patrickkelso/puppetlabs-git,redhat-cip/puppetlabs-git,pagemachine/puppetlabs-git,mhaskel/puppetlabs-git,gwdg/puppetlabs-git,michaeldfallen/puppetlabs-git,pagemachine/puppetlabs-git,puppetlabs/puppetlabs-git,mbrodala/puppetlabs-git,coffeecoco/puppet-git,puppetlabs/puppetlabs-git,mbrodala/puppetlabs-git,johnduarte/puppetlabs-git