Added new model tests and restructured tests