keep test models for travis
keep test models for travis
simplify tests
save changes on test model
Merge branch 'develop'