Merge "Update Settings to match new mocks"