improvements in test script