Various improvements to tests and code. (will be squashed later)
Merge branch 'yumrepo' of https://github.com/apenney/puppet into yumrepo