Reasonable level of test coverage.
Clean up the configuration file organization