Webtest cleanup and fixes