Index: tst_TreatmentStatesData/test.py
===================================================================
diff -u -rc5a7028efbf4a343a6ce3d92d3d534a5e15d784c -r211e5b6d52df1fb7af4b50ed652afdd373a64231
--- tst_TreatmentStatesData/test.py	(.../test.py)	(revision c5a7028efbf4a343a6ce3d92d3d534a5e15d784c)
+++ tst_TreatmentStatesData/test.py	(.../test.py)	(revision 211e5b6d52df1fb7af4b50ed652afdd373a64231)
@@ -40,13 +40,11 @@
 def test_values(vSubMode, vUFState, vSalineState):
     # these test cases are not always depending to each other
     if (vSubMode     == txStates.TREATMENT_DIALYSIS_STATE_NOT):
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_section       ).visible, True )
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage    ).visible, True )
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_second        ).visible, True )
-        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_notification  ).visible, False)
+        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage    ).visible, vSalineState != txStates.SALINE_START_STATE )
+        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_second        ).visible, vSalineState != txStates.SALINE_START_STATE )
+        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_notification  ).visible, vSalineState == txStates.SALINE_START_STATE )
         
     if (vSubMode     == txStates.TREATMENT_DIALYSIS_STATE    ):
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_section       ).visible, True )
         test.compare(       findObject      (names.o_treatmentStart_treatmentTime_arrowImage    ).visible, False)
         test.compare(       findObject      (names.o_treatmentStart_treatmentTime_second        ).visible, False)
         test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_notification  ).visible, True )
@@ -65,18 +63,20 @@
         test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineStart         ).text.text), "START BOLUS")
         test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineNotification  ).text     ), "Maximum cumulative saline bolus volume delivered")
         test.compare(    waitForObjectExists(names.o_treatmentStart_SalineNotification  ).visible, True)
-        print(7)
 
     # in all the other cases it should be enabled
     test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_DISABLE_STATE)
 
-    
     if (vSalineState == txStates.SALINE_STOP_STATE           ):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_section         ).isTouchable, True  )
         utils.waitForGUI()
         mouseClick  (    waitForObject      (names.o_treatmentStart_ultrafiltration_section))
         utils.waitForGUI()
-        test.compare(       findObject      (names.o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible    , True )
+        if (vUFState     == txStates.UF_PAUSED_STATE ):
+            test.compare(       findObject      (names.o_treatmentAdjustmentUltrafiltrationPaused_Screen ).visible    , True )
+        else:
+            test.compare(       findObject      (names.o_treatmentAdjustmentUltrafiltrationStart_Screen  ).visible    , True )
+        
         mouseClick  (    waitForObject      (names.o_closeButton))
                                                              
     if (vSalineState == txStates.SALINE_START_STATE          ):