Fixed failing SettingsController tests
Test fixes