refs #4377 some more test fixes