More tests and calibrating…