Fixed tests that broke with Adrian's config file changes