Added ticket #88 tests