Tests tidy-up