webtest cleanup and code improvement
Merge pull request #58 from pratik-joshi/webtests-cleanup

webtest cleanup and code improvement