Tidying up test harness