diff --git a/tests/FuncUtils.py b/tests/FuncUtils.py
index cbbf87e..14d8023 100644
--- a/tests/FuncUtils.py
+++ b/tests/FuncUtils.py
@@ -5,7 +5,7 @@
 import random
 
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/actions.py b/tests/actions.py
index bacb67c..ef323a0 100644
--- a/tests/actions.py
+++ b/tests/actions.py
@@ -14,7 +14,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/bsn_ipmask.py b/tests/bsn_ipmask.py
index 8304958..b26fe3c 100644
--- a/tests/bsn_ipmask.py
+++ b/tests/bsn_ipmask.py
@@ -6,7 +6,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.base_tests as base_tests
 
diff --git a/tests/bsn_mirror.py b/tests/bsn_mirror.py
index 10c3f93..1a114f9 100644
--- a/tests/bsn_mirror.py
+++ b/tests/bsn_mirror.py
@@ -6,7 +6,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.action as action
 import oftest.action_list as action_list
diff --git a/tests/bsn_shell.py b/tests/bsn_shell.py
index f4d9969..cc06ebe 100644
--- a/tests/bsn_shell.py
+++ b/tests/bsn_shell.py
@@ -6,7 +6,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.base_tests as base_tests
 
diff --git a/tests/caps.py b/tests/caps.py
index b87b0e2..9621923 100644
--- a/tests/caps.py
+++ b/tests/caps.py
@@ -9,7 +9,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/counters.py b/tests/counters.py
index be6c979..1c35dd7 100644
--- a/tests/counters.py
+++ b/tests/counters.py
@@ -11,7 +11,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/cxn.py b/tests/cxn.py
index 34bacad..37c2e52 100644
--- a/tests/cxn.py
+++ b/tests/cxn.py
@@ -12,7 +12,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/default_drop.py b/tests/default_drop.py
index 7103f2a..42261e5 100644
--- a/tests/default_drop.py
+++ b/tests/default_drop.py
@@ -6,7 +6,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/detailed_contr_sw_messages.py b/tests/detailed_contr_sw_messages.py
index 4ca6a6b..e4ebcfb 100644
--- a/tests/detailed_contr_sw_messages.py
+++ b/tests/detailed_contr_sw_messages.py
@@ -11,7 +11,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/flow_expire.py b/tests/flow_expire.py
index 484f22f..6b497cc 100644
--- a/tests/flow_expire.py
+++ b/tests/flow_expire.py
@@ -11,7 +11,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/flow_matches.py b/tests/flow_matches.py
index 9d04093..4c6df05 100644
--- a/tests/flow_matches.py
+++ b/tests/flow_matches.py
@@ -12,7 +12,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/flow_query.py b/tests/flow_query.py
index 271be11..ba59812 100644
--- a/tests/flow_query.py
+++ b/tests/flow_query.py
@@ -67,7 +67,7 @@
 
 from oftest import config
 import oftest.controller  as controller
-import oftest.cstruct     as ofp
+import ofp
 import oftest.message     as message
 import oftest.dataplane   as dataplane
 import oftest.action      as action
diff --git a/tests/flow_stats.py b/tests/flow_stats.py
index 2f14156..25ba005 100644
--- a/tests/flow_stats.py
+++ b/tests/flow_stats.py
@@ -12,7 +12,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/load.py b/tests/load.py
index 830aeed..a57b51f 100644
--- a/tests/load.py
+++ b/tests/load.py
@@ -20,7 +20,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/message_types.py b/tests/message_types.py
index fe19f61..c2427d7 100644
--- a/tests/message_types.py
+++ b/tests/message_types.py
@@ -11,7 +11,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/nicira_role.py b/tests/nicira_role.py
index fa4cc97..e8ff88e 100644
--- a/tests/nicira_role.py
+++ b/tests/nicira_role.py
@@ -6,7 +6,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.base_tests as base_tests
 
diff --git a/tests/openflow_protocol_messages.py b/tests/openflow_protocol_messages.py
index b182015..81b1e05 100644
--- a/tests/openflow_protocol_messages.py
+++ b/tests/openflow_protocol_messages.py
@@ -12,7 +12,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/pktact.py b/tests/pktact.py
index fe92aa0..c965f89 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -21,7 +21,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action
diff --git a/tests/port_stats.py b/tests/port_stats.py
index 5e0648f..d2ade19 100644
--- a/tests/port_stats.py
+++ b/tests/port_stats.py
@@ -11,7 +11,7 @@
 
 from oftest import config
 import oftest.controller as controller
-import oftest.cstruct as ofp
+import ofp
 import oftest.message as message
 import oftest.dataplane as dataplane
 import oftest.action as action