Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r1547724bb70c688198d577634a0e433dae410831 -r499efbd537dd868fdc0e3e55057faae002d7161a
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 1547724bb70c688198d577634a0e433dae410831)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 499efbd537dd868fdc0e3e55057faae002d7161a)
@@ -7,56 +7,54 @@
 
 
 # # Top Parents
-o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1}
-o_QQuickView = { "type": "QQuickView"}
-o_Overlay = {"container": o_QQuickView, "type": "Overlay"}
-o_treatmentHome = {"container": o_QQuickView   , "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1}
+o_Gui_MainView          = {"type": "Gui::MainView", "unnamed": 1}
+o_QQuickView            = { "type": "QQuickView"}
+o_Overlay               = {"container": o_QQuickView, "type": "Overlay"}
+o_treatmentHome         = {"container": o_QQuickView   , "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1}
 
 standByScreen_MainHome      = {"container": o_Gui_MainView,"type": "MainHome","visible": True}
 treatmentStack              = {"container": o_Gui_MainView,"type": "TreatmentStack", "visible": True}
 startTreatmentButton        = {"container": standByScreen_MainHome, "id": "_startTreatmentRect","type": "TouchRect","unnamed": 1}
 mainTreatmentScreen         = {"container": treatmentStack,         "id": "_treatmentHome", "type": "TreatmentHome","unnamed": 1}
+startFluidButton            = {"container": mainTreatmentScreen,    "id": "_startFluidButton",              "type": "TouchRect",        "unnamed": 1    }
+salineDeliveredText         = {"container": mainTreatmentScreen,    "objectName": "salineDescriptionText",  "type": "Text"                              }
+currentBolusVolume          = {"container": mainTreatmentScreen,                                            "type": "Label",            "unnamed": 1    }
+treatmentSaline             = {"container": mainTreatmentScreen,    "objectName": "treatmentSaline",        "type": "TreatmentSaline"                   }
+salineProgressBar           = {"container": mainTreatmentScreen,    "id": "_fluidProgressBar",              "type": "ProgressBar",      "unnamed": 1    }
 
 #treatment screen - pressures
-mainTreatmentScreen_arterialRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_arterialRangeBar", "type": "RangeBar", "unnamed": 1}
-mainTreatmentScreen_arterialRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
-# pressure_arterial_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "type": "RangeMarker", "unnamed": 1}
-mainTreatmentScreen_venousRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1}
-mainTreatmentScreen_venousRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
-pressure_venous_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 2, "type": "RangeMarker", "unnamed": 1}
-mainTreatmentScreen_tempRangeBar_RangeBar = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1}
-mainTreatmentScreen_tempRangeBar_RangeBar_marker = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
-pressure_temp_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 3, "type": "RangeMarker", "unnamed": 1}
-arterial_RangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
-venous_rangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 2, "type": "RangeBar", "unnamed": 1}
-temp_rangeBar = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 3, "type": "RangeBar", "unnamed": 1}
-pressure_text_obj = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1,"visible": True}
-treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration"}
-UF_Volume_Text = {"container": mainTreatmentScreen, "text": "UF Volume","type": "Text", "unnamed": 1}
-UF_Rate_Text = {"container": mainTreatmentScreen, "text": "UF Rate", "type": "Text", "unnamed": 1}
+mainTreatmentScreen_arterialRangeBar_RangeBar           = {"container": mainTreatmentScreen, "id": "_arterialRangeBar", "type": "RangeBar", "unnamed": 1}
+mainTreatmentScreen_arterialRangeBar_RangeBar_marker    = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
+mainTreatmentScreen_venousRangeBar_RangeBar             = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1}
+mainTreatmentScreen_venousRangeBar_RangeBar_marker      = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
+pressure_venous_marker_text                             = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 2, "type": "RangeMarker", "unnamed": 1}
+mainTreatmentScreen_tempRangeBar_RangeBar               = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "RangeBar", "unnamed": 1}
+mainTreatmentScreen_tempRangeBar_RangeBar_marker        = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
+pressure_temp_marker_text                               = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 3, "type": "RangeMarker", "unnamed": 1}
+arterial_RangeBar                                       = {"container": mainTreatmentScreen, "id": "_rangeBar", "type": "RangeBar", "unnamed": 1}
+venous_rangeBar                                         = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 2, "type": "RangeBar", "unnamed": 1}
+temp_rangeBar                                           = {"container": mainTreatmentScreen, "id": "_rangeBar", "occurrence": 3, "type": "RangeBar", "unnamed": 1}
+pressure_text_obj                                       = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1,"visible": True}
+treatmentUltrafiltration                                = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration"}
+UF_Volume_Text                                          = {"container": mainTreatmentScreen, "text": "UF Volume","type": "Text", "unnamed": 1}
+UF_Rate_Text                                            = {"container": mainTreatmentScreen, "text": "UF Rate", "type": "Text", "unnamed": 1}
+treatment_duration                                      = {"container": mainTreatmentScreen, "objectName": "treatmentTime", "type": "TreatmentTime"}
 
-treatment_duration = {"container": mainTreatmentScreen, "objectName": "treatmentTime", "type": "TreatmentTime"}
-# o_treatmentHome_Treatment_Paused_Text = {"container": mainTreatmentScreen, "text": "Treatment Paused", "type": "Text", "unnamed": 1}
+UF_Volume_LabelValue                                    = {"container": mainTreatmentScreen, "id": "_ufVolume","type": "LabelValue", "unnamed": 1}
+UF_Rate_LabelValue                                      = {"container": mainTreatmentScreen, "id": "_ufRate","type": "LabelValue", "unnamed": 1}
+Volume_Delivered                                        = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1}
 
-UF_Volume_LabelValue= {"container": mainTreatmentScreen, "id": "_ufVolume","type": "LabelValue", "unnamed": 1}
-UF_Rate_LabelValue ={"container": mainTreatmentScreen, "id": "_ufRate","type": "LabelValue", "unnamed": 1}
-Volume_Delivered = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1}
+blood_flow_value                                        = {"container": mainTreatmentScreen, "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent", "id": "_bloodFlow"}
+dial_flow_value                                         = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateFlow"}
+dial_temp_value                                         = {"container": mainTreatmentScreen, "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateTemp"}
+dial_cond_value                                         = {"container": mainTreatmentScreen, "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateCond"}
+Treatment_Parameters_Text                               = {"container": mainTreatmentScreen, "text": "Treatment Parameters", "type": "Text", "unnamed": 1}
+pressure_arterial_marker_text                           = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "type": "RangeMarker", "unnamed": 1}
+blood_flow_title_Text                                   = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Blood Flow"}
+dialyste_flow_title_Text                                = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Flow"}
+dialyste_temp_title_Text                                = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Temp."}
+dialyste_cond_title_Text                                = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Cond."}
 
-blood_flow_value = {"container": mainTreatmentScreen, "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent", "id": "_bloodFlow"}
-dial_flow_value = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateFlow"}
-dial_temp_value = {"container": mainTreatmentScreen, "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateTemp"}
-dial_cond_value = {"container": mainTreatmentScreen, "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent", "id": "_dialysateCond"}
 
-Treatment_Parameters_Text = {"container": mainTreatmentScreen, "text": "Treatment Parameters", "type": "Text", "unnamed": 1}
 
-pressure_arterial_marker_text = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "type": "RangeMarker", "unnamed": 1}
-blood_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Blood Flow"}
-dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Flow"}
-dialyste_temp_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Temp."}
-dialyste_cond_title_Text = {"container": mainTreatmentScreen, "objectName": "title", "type": "Text", "text": "Dialysate Cond."}
 
-# o_treatmentHome_rangeMarkerValue_RangeMarker = {"container": mainTreatmentScreen, "id": "_rangeMarkerValue", "occurrence": 3, "type": "RangeMarker", "unnamed": 1, "visible": True}
-# o_treatmentHome_treatmentPressures_TreatmentPressures = {"container": mainTreatmentScreen, "objectName": "treatmentPressures", "type": "TreatmentPressures", "visible": True}
-
-
-
Index: suite_leahi/tst_main_treatment_pressure/test.py
===================================================================
diff -u -rdfe37deb9956b87df475c862cc80f0a94b4ed196 -r499efbd537dd868fdc0e3e55057faae002d7161a
--- suite_leahi/tst_main_treatment_pressure/test.py	(.../test.py)	(revision dfe37deb9956b87df475c862cc80f0a94b4ed196)
+++ suite_leahi/tst_main_treatment_pressure/test.py	(.../test.py)	(revision 499efbd537dd868fdc0e3e55057faae002d7161a)
@@ -13,10 +13,9 @@
 
 import names
 
+import names
+
 from builtins import int as pyInt
-from configuration.config import *
-from configuration.utility import *
-from configuration import application_init
 from leahi_dialin.ui import utils
 from leahi_dialin.ui.td_messaging import TD_Messaging
 from leahi_dialin.ui.dd_messaging import DD_Messaging
@@ -75,17 +74,17 @@
     """
     test.startSection("Verifying Arterial low and high and Venous low and high value on main treatment screen")
     if accepted == ACCEPTED:
-        arterial_low = waitForObject(pressure_text_obj(art_low))
+        arterial_low = waitForObject(utility.pressure_text_obj(art_low))
         arterial_low = arterial_low.text.toInt()
-        arterial_high = waitForObject(pressure_text_obj(art_high))
+        arterial_high = waitForObject(utility.pressure_text_obj(art_high))
         arterial_high = arterial_high.text.toInt()
-        venous_low = waitForObject(pressure_text_obj(ven_low))
+        venous_low = waitForObject(utility.pressure_text_obj(ven_low))
         venous_low = venous_low.text.toInt()
-        venous_high = waitForObject(pressure_text_obj(ven_high))
+        venous_high = waitForObject(utility.pressure_text_obj(ven_high))
         venous_high = venous_high.text.toInt()
-        temperature_low = waitForObject(pressure_text_obj(ven_low))
+        temperature_low = waitForObject(utility.pressure_text_obj(ven_low))
         temperature_low = temperature_low.text.toInt()
-        temperature_high = waitForObject(pressure_text_obj(ven_high))
+        temperature_high = waitForObject(utility.pressure_text_obj(ven_high))
         temperature_high = temperature_high.text.toInt()
         test.compare(arterial_low, art_low,
                      "Arterial low value should be '{}'".format(art_low))