Improve test scripts

No match.