Fixed failing tests in MainControllerSpec & UserSettingSpec