Webtest fixes and cleanup
Merge pull request #4192 from colemanw/Webtest

Webtest fixes and cleanup