Tidy the tests