Index: tst_TreatmentSalineData/test.py
===================================================================
diff -u -r2b0ff4367443cf0458594c81c32598df5b6c39cb -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7
--- tst_TreatmentSalineData/test.py	(.../test.py)	(revision 2b0ff4367443cf0458594c81c32598df5b6c39cb)
+++ tst_TreatmentSalineData/test.py	(.../test.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
@@ -14,7 +14,9 @@
 
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import utils
+from dialin import HDSimulator
+HDSimulator = HDSimulator()
 
 def getUnit():
     global saline_unit 
@@ -54,22 +56,22 @@
     cumulitive = 0
     step = 1
     for target in [100, 200, 300]:
-        denaliMessages.setTreatmentSalineBolusData(target, 0, 0)
+        HDSimulator.cmd_set_treatment_saline_bolus_data(target, 0, 0)
         test_target(target)
         for value in range ( 0, target, step):
             cumulitive += step
-            denaliMessages.setTreatmentSalineBolusData(target, cumulitive, value+1) # 0 is not a step
+            HDSimulator.cmd_set_treatment_saline_bolus_data(target, cumulitive, value + 1) # 0 is not a step
             test_values                               (        cumulitive, value+1) # 0 is not a step
         
-    denaliMessages.setTreatmentSalineBolusData(200, 110, 10)
+    HDSimulator.cmd_set_treatment_saline_bolus_data(200, 110, 10)
     test_target                               (200         )
     test_values                               (     110, 10)
 
-    denaliMessages.setTreatmentSalineBolusData(200, 110, 10)
+    HDSimulator.cmd_set_treatment_saline_bolus_data(200, 110, 10)
     test_target                               (200         )
     test_values                               (     110, 10)
 
-    denaliMessages.setTreatmentSalineBolusData(  0,   0,  0)
+    HDSimulator.cmd_set_treatment_saline_bolus_data(0, 0, 0)
     test_target                               (  0         )
     test_values                               (       0,  0)