CB-6958 Removed camera tests

Removed potential merge conflicts