Refs #9714 better test for calibration
Merge branch 'feature/9714_doc_tests' into develop