#201 tests fixed