Issue #188 - fixing tests