Changed the models and created test suites for them