webtest fixes
Merge pull request #4332 from rohankatkar/webtest-4.5.0

webtest fixes