Fixed bugs during running unit test (unfinished).  Refs #7788.