More test script cleanup