Added untested tests
Merge branch 'test4' into development
Fixed so test hopefully works
Merge branch 'development' into model0.2.1