Improvements in test scripts