Tidy up of tests.