Added 2 models and test classes for each