refs #4377 fix some tests