-- webtest fixes and improvement
Merge pull request #181 from ravishnair/webtest-improvement

-- webtest fixes and improvement