Fix for Webtest
Additional fixes.
Merge pull request #4043 from rohankatkar/webtest

Fix for Webtest