refs #866 - fix tests