Calibration code sets origin point too
Improve some error messages
Remove obsolete comments
Add a comment
Avoid invalid test case