Static model test
Start writing image tests
Finish working on tests
Merge branch 'tests-cleanup' into develop