Fixed some issues found in unit test.  Refs #6968.