Added some more Model tests
Added specs for Class definitions