Resolved unit test issues

Refs #9344