Fixups for cameratest