Add more properties to abstract model object
Monstuous commit with huge banch of changes resulted to modified test data structure. Fails tests.
Remove old test data