move setting changes in tests to override_settings