Re #8497. Missed a unit test that needed to be changed.
Merge branch 'feature/8497_two_pi' into develop