Add factories for models
Add model specs to test data structure