Index: tst_Treatment_Adjustment_Heparin/test.py
===================================================================
diff -u -rca79dc7f50fc912b05da91321d8652934aee0764 -rcea6eac6a05f57e3317b45762a470eb18b314ab3
--- tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision ca79dc7f50fc912b05da91321d8652934aee0764)
+++ tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision cea6eac6a05f57e3317b45762a470eb18b314ab3)
@@ -16,7 +16,7 @@
 import names
 from dialin.ui import HDSimulator, utils, TXStates
 from dialin.common.msg_defs import RequestRejectReasons as rejectReason
-HDSimulator = HDSimulator()
+hd_sim = HDSimulator()
 
 
 def gotoScreenNtest_Contains_TreatmentHeparinData():
@@ -34,7 +34,7 @@
 def test_state(vAccept, vText, vState):
     mReason = 0
     if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION.value
-    HDSimulator.cmd_set_heparin_pause_resume_response(vAccept, mReason, vState)
+    hd_sim.cmd_set_heparin_pause_resume_response(vAccept, mReason, vState)
     utils.waitForGUI(0.2)
 
     heparin_button = findObject(names.o_treatmentStart_HeparinPause) # heparin button is not always enable for click 
@@ -57,9 +57,14 @@
   
     # Initial OFF    -> Idle/START/UF_True
     gotoScreenNtest_Contains_TreatmentHeparinData()
+#     hd_sim.cmd_set_hd_operation_mode_data(HDDefs.MODE_TREA.value)
+    hd_sim.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE,
+                                           TXStates.UF_OFF_STATE,
+                                           TXStates.SALINE_BOLUS_STATE_IDLE,
+                                           TXStates.HEPARIN_STATE_OFF)
     
     # set the Treatment to running state, otherwise the heparin section will be disabled.
-    HDSimulator.cmd_set_treatment_states_data(TXStates.TREATMENT_DIALYSIS_STATE, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF)
+    hd_sim.cmd_set_treatment_states_data(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