Added add locked method for measure
Added checkpoints
Fixed correlator test