Many more tests passing