Added more tests
Cropping images now works
Merge branch 'master' into testing