CRM-14521 syntaxConformance test fixes