refs #4869 fix tests