Merge take photo - tests added