Added calibrator test