Index: suite_leahi/tst_main_treatment/test.py
===================================================================
diff -u -rf9812770166a529dd87003269cb05d12153e57de -r4f9e56b35635368ce440e2cfffdaba7631b5d120
--- suite_leahi/tst_main_treatment/test.py	(.../test.py)	(revision f9812770166a529dd87003269cb05d12153e57de)
+++ suite_leahi/tst_main_treatment/test.py	(.../test.py)	(revision 4f9e56b35635368ce440e2cfffdaba7631b5d120)
@@ -38,10 +38,7 @@
 total_time_list = [90,120]
 uf_filtration =   [
     {"uf_volume": 1,  "uf_rate": 0.53, "vol_delivered": 0.37  },
-    {"uf_volume": 10, "uf_rate": 5.05, "vol_delivered": 2.37  },
-    {"uf_volume": 20, "uf_rate": 10.0, "vol_delivered": 5.0   },
-    {"uf_volume": 100,"uf_rate": 140.0,"vol_delivered": 156.0 },
-    {"uf_volume": 0,  "uf_rate": 0.0,  "vol_delivered": 0.0   }
+    {"uf_volume": 10, "uf_rate": 5.05, "vol_delivered": 2.37  }
     ]
 
 td = TD_Messaging()
@@ -192,8 +189,8 @@
     @return: N/A
     """
     test.compare(utility.get_object_from_names(names.o_treatmentUltrafiltration).visible, True, "UltraFiltration section is visible")
-    test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, "UF Volume", "UF Volume text verified")
-    test.compare(waitForObjectExists(names.o_UF_Rate_Text).topText, "UF Rate", "UF Rate text verified")
+    test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, config.UF_VOLUME_GOAL, "UF Volume text verified")
+    test.compare(waitForObjectExists(names.o_UF_Rate_Text).topText, config.UF_RATE, "UF Rate text verified")
    
 def start_test_treatment_ultrafiltration(uf_volume,uf_rate,vol_delivered):
     """
@@ -248,10 +245,10 @@
         ]
     
     #Verify the title values in the set points
-    test.compare(utility.get_object_from_names(names.o_blood_flow_title_Text).title,     "Blood Flow",           "Blood flow text verified"                        )
-    test.compare(utility.get_object_from_names(names.o_dialyste_flow_title_Text).title,  "Dialysate Flow",       "Dialysate Flow text verified"                    )
-    test.compare(utility.get_object_from_names(names.o_dialyste_tmp_title_Text).title,   "Dialysate Temp.",       "Dialysate trancememberance text verified"       )
-    test.compare(utility.get_object_from_names(names.o_dialyste_cond_title_Text).title,  "Dialysate Cond.",      "Dialysate cond text verified"                    )
+    test.compare(utility.get_object_from_names(names.o_blood_flow_title_Text).title,     config.BLOOD_FLOW,      "Blood flow text verified"                        )
+    test.compare(utility.get_object_from_names(names.o_dialyste_flow_title_Text).title,  config.DIALYSATE_FLOW,  "Dialysate Flow text verified"                    )
+    test.compare(utility.get_object_from_names(names.o_dialyste_tmp_title_Text).title,   config.DIALYSATE_TEMP,  "Dialysate trancememberance text verified"       )
+    test.compare(utility.get_object_from_names(names.o_dialyste_cond_title_Text).title,  config.DIALYSATE_COND,   "Dialysate cond text verified"                    )
     
     for index in range(0, len(TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES), 1):
         test.startSection("Checking the value of the set points".format(index))     
@@ -267,11 +264,11 @@
       
         bloodFlow = utility.get_object_from_names(names.o_blood_flow_value)
         bloodFlow_properties = object.properties(bloodFlow)
-        test.compare(str(bloodFlow_properties["value"]), str(target_blood_flow), "Blood Flow value should be :" + str(target_blood_flow))
+        test.compare(bloodFlow_properties["value"], target_blood_flow, "Blood Flow value should be :" + str(target_blood_flow))
         
         dialFlow = utility.get_object_from_names(names.o_dial_flow_value)
         dialFlow_properties = object.properties(dialFlow)
-        test.compare(str(dialFlow_properties["value"]), str(target_dial_flow),  "Dialyste flow value should be :" + str(target_dial_flow))
+        test.compare(dialFlow_properties["value"], target_dial_flow,  "Dialyste flow value should be :" + str(target_dial_flow))
         
         dialTmp = utility.get_object_from_names(names.o_dial_tmp_value)
         dialTmp_properties = object.properties(dialTmp)
@@ -290,7 +287,7 @@
 def main():
     
     utils.tstStart(__file__)
-    startApplication(config.AUT_NAME_ONLY + " -q")
+    startApplication(utility.aut("-q"))
     
     td.td_operation_mode(TDOpModes.MODE_STAN.value,0)