tidying up some test code