webtest fixes
Merge pull request #4470 from rohankatkar/tests

webtest fixes