Webtest fixes and cleanup