refs #837 - fix tests