Webtest fixes
Merge pull request #4179 from colemanw/Webtest

Webtest fixes