updated tests, renamed settings model