Resolved unit test issues

Refs #9344
Merge branch 'bugfix/9344_indirect_python_refactoring' into develop