-- webtest fixes
Merge pull request #226 from ravishnair/webtest-fix/improvement

-- webtest fixes