#67 tests fixed