refactored configuration settings and updated three tests