Minor changes to test scripts.