More test script syntax fixes