Calibration tested -- needs some weirdness handling