Added some more unit tests to the model