Test tidy-up