Fixed tests that broke with Adrian's config file changes
Merge pull request #1 from sethmcl/issue164

Fixed tests that broke with Adrian's config file changes