fixed bare minimum tests
Merge branch 'model-tests'