Updated camera and tests