All tests now clean