--added webtest for CRM-12018 and did some code cleanup
Merge pull request #84 from pradpnayak/CRM-12018

--added webtest for CRM-12018 and did some code cleanup