Webtest fixes
Merge pull request #4114 from colemanw/Webtest

Webtest fixes