Implemented usage of calibration constants
Updated test routine