Merge "Add test case for SettingsProvider" into main