More test script updates