refs #726 - fix tests