Refs #8131 Add basis for new tests.
Refs #8131 Tidy up existing tests
Merge branch 'feature/8131_calc_corr_update' into develop