more tests fixed, still some to go