Webtest fixes
Merge pull request #4178 from colemanw/Webtest

Webtest fixes