Crm 12545 fix failing tests caused by CRM-12274