refs #199 - fix tests