refs #4610 fix tests