Issue #110 - fixing tests