Merge pull request #475 from ravishnair/webtest-fix