devicecalibrator with tests added