nearly all tests fixed