some more tests fixed