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