Merge "TEST_MAPPING: enable SettingsTests"