Improved test coverage. Should be close to 100% for models and other packages where possible