CRM-15168 increase test coverage