more tidying up of tests