refs #796 Fix unit tests