Bug 1004963 - Update camera tests

Uplift from 5b1b0dc master.