Index: tst_TreatmentStatesData/test.py
===================================================================
diff -u -r2b0ff4367443cf0458594c81c32598df5b6c39cb -r6d01b12355c38d1a14b9aa6fb3578c52928d285b
--- tst_TreatmentStatesData/test.py	(.../test.py)	(revision 2b0ff4367443cf0458594c81c32598df5b6c39cb)
+++ tst_TreatmentStatesData/test.py	(.../test.py)	(revision 6d01b12355c38d1a14b9aa6fb3578c52928d285b)
@@ -83,13 +83,18 @@
     # Heparin section touchable
     if (vHeparinState == txStates.HEPARIN_STATE_OFF or vHeparinState == txStates.HEPARIN_STATE_INITIAL_BOLUS or vHeparinState == txStates.HEPARIN_STATE_EMPTY):
         test.compare(    waitForObjectExists(names.o_treatmentStart_HeparinSection                  ).isTouchable, False )
-    # Heparin Button text
-    if (vHeparinState == txStates.HEPARIN_STATE_DISPENSING):
-        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "PAUSE DELIVERY")
-    if (vHeparinState == txStates.HEPARIN_STATE_PAUSED):
-        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "RESUME DELIVERY")
-    if (vHeparinState == txStates.HEPARIN_STATE_COMPLETED):
-        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "RESUME DELIVERY")
+    
+    if vSubMode == txStates.TREATMENT_DIALYSIS_STATE:
+        # Heparin Button text
+        if (vHeparinState == txStates.HEPARIN_STATE_DISPENSING):
+            test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "PAUSE DELIVERY")
+        if (vHeparinState == txStates.HEPARIN_STATE_PAUSED):
+            test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "RESUME DELIVERY")
+        if (vHeparinState == txStates.HEPARIN_STATE_COMPLETED):
+            test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "RESUME DELIVERY")
+    else:
+        test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinPause         ).text.text), "HEPARIN DELIVERY")
+        
     #Heparin notification text        
     if (vHeparinState == txStates.HEPARIN_STATE_INITIAL_BOLUS):
         test.compare(    waitForObjectExists(names.o_treatmentStart_HeparinNotification  ).visible, True)
Index: tst_Treatment_Adjustment_Heparin/test.py
===================================================================
diff -u -r0a4b4e4653203852eae6d9edb24116f2147a7c3e -r6d01b12355c38d1a14b9aa6fb3578c52928d285b
--- tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision 0a4b4e4653203852eae6d9edb24116f2147a7c3e)
+++ tst_Treatment_Adjustment_Heparin/test.py	(.../test.py)	(revision 6d01b12355c38d1a14b9aa6fb3578c52928d285b)
@@ -58,6 +58,9 @@
     # Initial OFF    -> Idle/START/UF_True
     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)
+    
     # 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 )