Tidying up the tests