-- webtest fixes and some inprovements based on the error on server
Merge pull request #1605 from ravishnair/webtestfix

-- webtest fixes and some improvements based on the error on server