Added a few more unit tests around the models