A few more tests complete