Increase test coverage
Tidy up model tests.