Improve test scripts