more webtest cleanup and code improvement
Merge pull request #7 from pratik-joshi/webtests-cleanup-and-fixes

more webtest cleanup and code improvement