Index: tst_Treatment_Adjustment_Heparin/test.py
===================================================================
diff -u -r6d01b12355c38d1a14b9aa6fb3578c52928d285b -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1
--- tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision 6d01b12355c38d1a14b9aa6fb3578c52928d285b)
+++ tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1)
@@ -14,12 +14,11 @@
 
 
 import names
-from dialin.squish import utils, denaliMessages
-from dialin.squish.denaliMessages import txStates
+from dialin.ui import HDSimulator, utils, TXStates
 from dialin.common.msg_defs import RequestRejectReasons as rejectReason
 from numpy.distutils.fcompiler import none
+HDSimulator = HDSimulator()
 
-
 def gotoScreenNtest_Contains_TreatmentHeparinData():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinSection).buttonText), "HEPARIN DELIVERY")
@@ -35,11 +34,11 @@
 def test_state(vAccept, vText, vState):
     mReason = 0
     if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION.value
-    denaliMessages.setHeparinResponse(vAccept, mReason, vState)
+    HDSimulator.setHeparinResponse(vAccept, mReason, vState)
     utils.waitForGUI(0.2)
 
     heparin_button = findObject(names.o_treatmentStart_HeparinPause) # heparin button is not always enable for click 
-    if vState == txStates.HEPARIN_STATE_DISPENSING or vState == txStates.HEPARIN_STATE_PAUSED or vState == txStates.HEPARIN_STATE_COMPLETED :
+    if vState == TXStates.HEPARIN_STATE_DISPENSING or vState == TXStates.HEPARIN_STATE_PAUSED or vState == TXStates.HEPARIN_STATE_COMPLETED :
         if not heparin_button is None:
             test.compare(heparin_button.enabled, True)
             mouseClick(heparin_button)
@@ -59,50 +58,50 @@
     gotoScreenNtest_Contains_TreatmentHeparinData()
     
     # set the Treatment to running state, otherwise the heparin section will be disabled.
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IDLE, txStates.HEPARIN_STATE_OFF)
+    HDSimulator.setTreatmentStatesData(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF)
     
     # it is not working upon user request so there is not rejection
     # Initial OFF => BOLUS -> Bolus/HEPARIN
-    test_state(True, "HEPARIN"  , txStates.HEPARIN_STATE_INITIAL_BOLUS ) 
+    test_state(True, "HEPARIN"  , TXStates.HEPARIN_STATE_INITIAL_BOLUS ) 
     
     # it is not working upon user request so there is not rejection
     # Now BOLUS => DISPENSING -> Dispensing/PAUSE
-    test_state(True, "PAUSE"  , txStates.HEPARIN_STATE_DISPENSING ) 
+    test_state(True, "PAUSE"  , TXStates.HEPARIN_STATE_DISPENSING ) 
 
     # Now   Dispensing => Paused => Rejected -> Dispensing/PAUSE
-    test_state(False, "PAUSE"  , txStates.HEPARIN_STATE_DISPENSING ) 
+    test_state(False, "PAUSE"  , TXStates.HEPARIN_STATE_DISPENSING ) 
 
     # Retry Dispensing => Paused => Rejected -> Dispensing/PAUSE
-    test_state(False, "PAUSE"  , txStates.HEPARIN_STATE_DISPENSING ) 
+    test_state(False, "PAUSE"  , TXStates.HEPARIN_STATE_DISPENSING ) 
 
     # Still Dispensing => paused => Accepted -> Paused/RESUME
-    test_state(True, "RESUME"  , txStates.HEPARIN_STATE_PAUSED ) 
+    test_state(True, "RESUME"  , TXStates.HEPARIN_STATE_PAUSED ) 
     
     # Now   Paused => Dispensing => Rejected -> Paused/RESUME
-    test_state(False, "RESUME"  , txStates.HEPARIN_STATE_PAUSED )
+    test_state(False, "RESUME"  , TXStates.HEPARIN_STATE_PAUSED )
     
     # Retry Paused => Dispensing => Rejected -> Paused/RESUME
-    test_state(False, "RESUME"  , txStates.HEPARIN_STATE_PAUSED )
+    test_state(False, "RESUME"  , TXStates.HEPARIN_STATE_PAUSED )
 
     # Still Paused => Dispensing => Accepted -> Dispensing/PAUSE
-    test_state(True , "PAUSE" , txStates.HEPARIN_STATE_DISPENSING )
+    test_state(True , "PAUSE" , TXStates.HEPARIN_STATE_DISPENSING )
     
     # it is not working upon user request so there is not rejection
     # Now   Dispensing => Complete -> Complete/RESUME
-    test_state(True, "RESUME" , txStates.HEPARIN_STATE_COMPLETED )
+    test_state(True, "RESUME" , TXStates.HEPARIN_STATE_COMPLETED )
     
     # Now   Complete => Dispensing => Rejected -> Complete/RESUME 
-    test_state(False, "RESUME" , txStates.HEPARIN_STATE_COMPLETED )
+    test_state(False, "RESUME" , TXStates.HEPARIN_STATE_COMPLETED )
     
     # Retry Complete => Dispensing => Rejected -> Complete/RESUME 
-    test_state(False, "RESUME" , txStates.HEPARIN_STATE_COMPLETED )
+    test_state(False, "RESUME" , TXStates.HEPARIN_STATE_COMPLETED )
     
     # Still Complete => Dispensing => Accepted -> Dispensing/PAUSE 
-    test_state(True, "PAUSE" , txStates.HEPARIN_STATE_DISPENSING )
+    test_state(True, "PAUSE" , TXStates.HEPARIN_STATE_DISPENSING )
     
     # it is not working upon user request so there is not rejection
     # the dispensing to pause retry tested above and we assume it will deliver until is empty
     # Now Dispensing => Empty => -> Dispensing/PAUSE  
-    test_state(True, "HEPARIN" , txStates.HEPARIN_STATE_EMPTY )
+    test_state(True, "HEPARIN" , TXStates.HEPARIN_STATE_EMPTY )
 
     utils.tstDone()