Tidying of tests.