Fix SyntaxConformanceTest and EnumValues