Calibration and Capture bug fixes - Real Tests