--code cleanup for CRM-11986
Merge pull request #43 from pradpnayak/webtest

--code cleanup for CRM-11986