2 more tests fixed