CRM-12350  fix failing unit tests