diff --git a/py_gen/codegen.py b/py_gen/codegen.py
index 90ddf23..2221e5a 100644
--- a/py_gen/codegen.py
+++ b/py_gen/codegen.py
@@ -87,6 +87,8 @@
         oxm_len = of_g.base_length[(cls, version)] - 4
         type_values['type_len'] = '%#x' % (oxm_class << 16 | oxm_type << 8 | \
                                            oxm_masked << 8 | oxm_len)
+    elif cls == "of_match_v2":
+        type_values['type'] = 0
     elif cls == "of_match_v3":
         type_values['type'] = 1
 
diff --git a/py_gen/tests/of11.py b/py_gen/tests/of11.py
index 51514ce..ac1c02e 100644
--- a/py_gen/tests/of11.py
+++ b/py_gen/tests/of11.py
@@ -70,7 +70,6 @@
 
     def test_serialization(self):
         expected_failures = [
-            ofp.common.flow_stats_entry,
             ofp.common.group_desc_stats_entry,
             ofp.common.instruction,
             ofp.common.instruction_apply_actions,
@@ -80,16 +79,7 @@
             ofp.common.instruction_header,
             ofp.common.instruction_write_actions,
             ofp.common.instruction_write_metadata,
-            ofp.common.match_v2,
             ofp.common.table_stats_entry,
-            ofp.message.aggregate_stats_request,
-            ofp.message.flow_add,
-            ofp.message.flow_delete,
-            ofp.message.flow_delete_strict,
-            ofp.message.flow_modify,
-            ofp.message.flow_modify_strict,
-            ofp.message.flow_removed,
-            ofp.message.flow_stats_request,
             ofp.message.group_desc_stats_reply,
             ofp.message.group_mod,
             ofp.message.group_stats_reply,