CRM-15207 attempt to fix tests