Added some model/unit tests