Minor changes in testscripts.