Refactor config - throw away '--test-sanity'