CRM test fixes