Merge pull request #296 from ravishnair/webtest-fix/improvement