Model setter added, all tests pass