Webtest improvement

webtest cleanup and fixes