Webtest fixes
Merge pull request #4188 from colemanw/Race-condition

Webtest fixes