Added config and other cleanup refactor to test.