Modify ParameterCalibrationByHeight to pass unit test with borderline cases