refs #4564 fixing tests