Index: tst_HDOperationModeData/test.py
===================================================================
diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rcea779e4d5eb422603a9194f6b9a01ec7e268612
--- tst_HDOperationModeData/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
+++ tst_HDOperationModeData/test.py	(.../test.py)	(revision cea779e4d5eb422603a9194f6b9a01ec7e268612)
@@ -13,7 +13,9 @@
 #
 
 import names
-from dialin.ui import utils, hd_simulator
+from dialin.ui import utils
+from dialin import HDSimulator
+HDSimulator = HDSimulator()
 
 
 opModes = [ 
@@ -51,21 +53,21 @@
 
     step = 1
     for i in range ( 0, len(opModes), step):
-        hd_simulator.setHDOperationModeData(i + step * 0)
+        HDSimulator.setHDOperationModeData(i + step * 0)
         test_values                          (i + step * 0)
 
-    hd_simulator.setHDOperationModeData(1)
+    HDSimulator.setHDOperationModeData(1)
     test_values                          (1)
 
     # Coverage
-    hd_simulator.setHDOperationModeData(1)
+    HDSimulator.setHDOperationModeData(1)
     test_values                          (1)
 
-    hd_simulator.setHDOperationModeData(0)
+    HDSimulator.setHDOperationModeData(0)
     test_values                          (0)
 
     outOfRangeCheck = len(opModes) + 1
-    hd_simulator.setHDOperationModeData(outOfRangeCheck)
+    HDSimulator.setHDOperationModeData(outOfRangeCheck)
     test_values                          (outOfRangeCheck)
 
     utils.tstDone()