Webtest fix
Merge pull request #1588 from monishdeb/WebTestFixes

Webtest fix