Improved test coverage
Added model test