Improved test scripting.