Changed tests now that config settings are refactored. Closes #21