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

webtest code improvement and cleanup