Re #9118. Correct tests to fix builds.
Merge branch 'feature/9118_simplify_imddimensionfactory' into develop