refs #767 - fix tests