Refactored and added more SettingsLogicTests