refactored config - all unit tests passing
acceptance tests also now passing