FBTest: clean up Script tests code (related to issue 7166)
Merge branch 'jsd2' of github.com:firebug/firebug into jsd2