Added Some Picture Model tests
Merge branch 'NewModelTests' into dev