refs #832 - fix tests