Split camera tests into two and into camera folder
Merge pull request #519 from zacc/split_camera_tests

Split camera tests into two and into camera folder