Fix some problems in test scripts. No code changes.