A bit of improvements on test scripting.