Tidying up test script references