Added additional tests, and changed to handle new response from server for settings