Some more tests passing