improved test coverage of models