Modifications to test script.