Webtest fix
Merge pull request #4212 from jitendrapurohit/webtestfixes

Webtest fix