added model category and tests
Merge branch 'develop'
deleted factories.swp