Refined Models, introduced Model subclasses and created test data