Fixes in test script