Index: tst_HDInletFlowData/test.py
===================================================================
diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rcea779e4d5eb422603a9194f6b9a01ec7e268612
--- tst_HDInletFlowData/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
+++ tst_HDInletFlowData/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()
 
 
 def gotoScreenNtest_Contains_InletFlowData():
@@ -42,17 +44,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        hd_simulator.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
+        HDSimulator.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
         test_values                                 (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
 
-    hd_simulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
     test_values                                 (100, 200, 300, 400, 500, 600, 700)
 
     # Coverage
-    hd_simulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
     test_values                                 (100, 200, 300, 400, 500, 600, 700)
 
-    hd_simulator.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0)
+    HDSimulator.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0)
     test_values                                 (0, 0, 0, 0, 0, 0, 0)
 
     utils.tstDone()