refs #7472. Fix errors in unit test.
Merge branch 'feature/7472_test_auxilary' into develop