Update UserSettings class
Update methods for UserSetting class
Updated unit tests for UserSettings class