refs #400 - fix tests