refs #4564 fix tests