Improve test coverage for Model