Tidy up acceptance tests.