tidying up some tests