Issue #182 - fix tests