fixed tests
Merge branch 'photos' of https://github.com/codedragon/calibrate into photos