Index: tst_Treatment_Adjustment_Saline/test.py
===================================================================
diff -u -re2b1198b35a5e13749755e0839255d13f746a7c9 -rbefca1db0402e031a5b692aa93dc74bfb314eb9e
--- tst_Treatment_Adjustment_Saline/test.py	(.../test.py)	(revision e2b1198b35a5e13749755e0839255d13f746a7c9)
+++ tst_Treatment_Adjustment_Saline/test.py	(.../test.py)	(revision befca1db0402e031a5b692aa93dc74bfb314eb9e)
@@ -24,8 +24,8 @@
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "START BOLUS")
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).title     ), "SALINE BOLUS")
     test.compare(    waitForObjectExists(names.o_treatmentStart_SalineSection).visible    , True)
+    utils.waitForGUI(1)
 
-
 def getUnit():
     return str(waitForObjectExists(names.o_treatmentStart_SalineSection).unit)
     
@@ -48,7 +48,7 @@
     test_target(target)
 
 
-def test_ultrafiltration(vEnabled):
+def test_ultrafiltration_touchable(vEnabled):
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).isTouchable, vEnabled)
 
 
@@ -58,37 +58,45 @@
     startApplication(names.AUT_NAME)
     utils.waitForGUI(1)
   
-    #initially is stopped                          (Text => START)
+    # Initial Idle                        -> Idle/START/UF_True
     gotoScreenNtest_Contains_TreatmentSalineBolusData()
-    utils.waitForGUI(1)
-   
-    # Init  stopped, stopped =(accepted)=> running (Text => STOP )
+    test_ultrafiltration_touchable(True )
+    
+    # Initial Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START"  , txStates.SALINE_BOLUS_STATE_IDLE ) 
+    test_ultrafiltration_touchable(True )
+
+    # retry   Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START"  , txStates.SALINE_BOLUS_STATE_IDLE ) 
+    test_ultrafiltration_touchable(True )
+
+    # Still   Idle => Running => Accepted -> Running/STOP/UF_False
     test_state(True , "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
-    test_ultrafiltration(False)
+    test_ultrafiltration_touchable(False)
     
-    # Now   running, running =(rejected)== running (Text == STOP )
+    # Now     Running => Idle => Rejected -> Running/STOP/UF_False
     test_state(False, "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
-    test_ultrafiltration(False)
+    test_ultrafiltration_touchable(False)
     
-    # multiple same request should not affect if rejected
-    # Now   running, running =(rejected)== running (Text == STOP )
+    # Retry   Running => Idle => Rejected -> Running/STOP/UF_False
     test_state(False, "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
-    test_ultrafiltration(False)
+    test_ultrafiltration_touchable(False)
 
-    # Still running, running =(accepted)=> stopped (Text == START)
+    # Still   Running => Idle => Accepted -> Idle/START/UF_True
     test_state(True , "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
-    test_ultrafiltration(True)
+    test_ultrafiltration_touchable(True )
     
-    # Now   stopped, stopped =(rejected)== stopped (Text == START)
+    # Now     Idle => Running => Rejected -> Idle/START/UF_True
     test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
-    test_ultrafiltration(True)
+    test_ultrafiltration_touchable(True )
     
-    # Now   stopped, stopped =(accepted)=> running (Text == STOP )
+    # Retry   Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
+    test_ultrafiltration_touchable(True )
+
+    # Still   Idle => Running => Accepted -> Running/STOP/UF_False
     test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS  )
-    test_ultrafiltration(False)
+    test_ultrafiltration_touchable(False)
     
-    # Still running, running =(accepted)=> stopped (Text == START)
-    test_state(True, "START", txStates.SALINE_BOLUS_STATE_IDLE          )
-    test_ultrafiltration(True)
-    
+
     utils.tstDone()