Merge "Fix tests in UserSettingsTest" into main