Merge "Call clearSettingsProvider before and after test"