added tests for models
Merge branch 'tests'