#90 all tests fixed