Tidying up testing.