-- webtest fixes
Merge pull request #1590 from ravishnair/webtestfix

-- webtest fixes