Webtest fixes
Merge pull request #4336 from jitendrapurohit/webtestfixes

Webtest fixes