Improved inside-camera testing.