Index: tst_Treatment_BloodDialysateFlowRate/test.py
===================================================================
diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rcea779e4d5eb422603a9194f6b9a01ec7e268612
--- tst_Treatment_BloodDialysateFlowRate/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
+++ tst_Treatment_BloodDialysateFlowRate/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_FlowsSection():
@@ -31,49 +33,49 @@
 
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "0")
 
-    hd_simulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage
-    hd_simulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0)
+    HDSimulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0) # coverage
+    HDSimulator.setTreatmentBloodFlowRate(125, 0, 0, 0, 0, 0, 0)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "125")
 
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "0")
 
-    hd_simulator.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(175, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "175")
 
-    hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
+    HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145")
 
-    hd_simulator.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(150, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "150")
     
-    hd_simulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25)
+    HDSimulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125")
     
-    hd_simulator.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(200, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "200")
 
-    hd_simulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25)
+    HDSimulator.setTreatmentDialysateFlowRate(125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "125")
 
-    hd_simulator.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(250, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "250")
 
-    hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
+    HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145")
     
-    hd_simulator.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(275, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "275")
     
-    hd_simulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
+    HDSimulator.setTreatmentDialysateFlowRate(145, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "145")
     
-    hd_simulator.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(300, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "300")
 
-    hd_simulator.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55)
+    HDSimulator.setTreatmentDialysateFlowRate(155, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).dialysateFlowSetPoint), "155")
     
-    hd_simulator.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1)
+    HDSimulator.setTreatmentBloodFlowRate(350, 1, 1, 1, 1, 1, 1)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).bloodFlowSetPoint), "350")
 
     utils.tstDone()
\ No newline at end of file