More model test coverage