Improve test coverage

[Monarda]

Test coverage is only 60% on our model, it needs to be at least 80%

[Monarda]

I think these are linked because #3 (comment)