refs #1486 fix tests