refs #835 - fix tests