tidying up of tests