updated settings model and new test cases