Fixed some error to pass test.  Refs #7184.
Merge branch 'feature/7184_add_splitter_info' into develop