refs #860 - fix tests