test script related fixes