#98 tests fixed