Fix unit tests

refs #7883