Fixes for errors when doing "make test" on a clean checkout
Merge pull request #440 from LHCGreg/master

Fixes for errors when doing "make test" on a clean checkout