Finished model test 3
Merge branch 'modeltests'