Index: .gitignore
===================================================================
diff -u -r5e50c9793e8200292af43dec8657e659a16deca4 -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- .gitignore	(.../.gitignore)	(revision 5e50c9793e8200292af43dec8657e659a16deca4)
+++ .gitignore	(.../.gitignore)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -1 +1,4 @@
+__pycache__
 *.pyc
+shared/scripts/squishapi
+
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/crc.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/denaliMessages.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/globals.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/messageBuilder.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: shared/scripts/names.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- shared/scripts/names.py	(.../names.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ shared/scripts/names.py	(.../names.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -96,3 +96,5 @@
 o_TimeText_second_Text = {"container": o_Overlay, "objectName": "_TimeText_second", "type": "Text", "visible": True}
 o_TimeText_hour_Text_2 = {"container": o_Overlay, "objectName": "_TimeText_hour", "occurrence": 2, "type": "Text", "visible": True}
 o_TimeText_minute_Text_2 = {"container": o_Overlay, "objectName": "_TimeText_minute", "occurrence": 2, "type": "Text", "visible": True}
+o_treatmentHome_START_TREATMENT_Text = {"container": o_treatmentHome, "text": "START TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_treatmentStart_START_BOLUS_100_mL_Text = {"container": o_treatmentStart_TreatmentStart, "text": "START BOLUS (100 mL)", "type": "Text", "unnamed": 1, "visible": True}
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/unittests.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 20f2c70f789de08ea7f19df58de2362c5df240a9 refers to a dead (removed) revision in file `shared/scripts/utils.py'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: tst_Alarm/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Alarm/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Alarm/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -12,9 +12,9 @@
 # author  Behrouz NematiPour
 #
 
-import utils
 import names
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def main():
     utils.tstStart()
Index: tst_HomeScreen/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_HomeScreen/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_HomeScreen/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,7 +13,7 @@
 #
 
 import names
-import utils
+import squishapi.utils          as utils
 
 def main():
     utils.tstStart()
Index: tst_Internals/test.py
===================================================================
diff -u -ra1bf6e9dc0dacf5aee003365d3472e43075d00a7 -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Internals/test.py	(.../test.py)	(revision a1bf6e9dc0dacf5aee003365d3472e43075d00a7)
+++ tst_Internals/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -12,8 +12,8 @@
 # author  Behrouz NematiPour
 #
 
-import unittests
-import utils
+import squishapi.utils          as utils
+import squishapi.unittests      as unittests
 
 def main():
     utils.tstStart()
Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -11,10 +11,11 @@
 # date    2019/11/20
 # author  Behrouz NematiPour
 #
-import utils
+
 import names
-import globals
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.globals        as globals
+import squishapi.denaliMessages as denaliMessages 
 
 ################################################################################
 # This test need to be changed when the Service screen has been implemented    #
Index: tst_TreatmentScreen/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_TreatmentScreen/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_TreatmentScreen/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,7 +13,7 @@
 #
 
 import names
-import utils
+import squishapi.utils          as utils
 
 def main():
     utils.tstStart()
Index: tst_Treatment_Adjustment_BloodDialysate/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages
 
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_Adjustment_Duration/test.py
===================================================================
diff -u -re46e6d38f84be51966f96ce6c76c00b36b4f2654 -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_Adjustment_Duration/test.py	(.../test.py)	(revision e46e6d38f84be51966f96ce6c76c00b36b4f2654)
+++ tst_Treatment_Adjustment_Duration/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_DurationSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
@@ -58,9 +58,9 @@
     test.compare(waitForObjectExists(names.o_durationSlider_Slider).maximum, durationMax)
     
     # the duration dialog should use the same value as the Treatment time
-    test.compare(str(waitForObjectExists(names.o_TimeText_TimeText   ).time), "02:50:00")
-    test.compare(str(waitForObjectExists(names.o_TimeText_hour_Text  ).text), "02")
-    test.compare(str(waitForObjectExists(names.o_TimeText_minute_Text).text), "50")
+    test.compare(str(waitForObjectExists(names.o_TimeText_TimeText   ).time), "00:10:00")
+    test.compare(str(waitForObjectExists(names.o_TimeText_hour_Text  ).text), "00")
+    test.compare(str(waitForObjectExists(names.o_TimeText_minute_Text).text), "10")
     test.compare(str(waitForObjectExists(names.o_TimeText_second_Text).text), "00")
 
     # touch on the middle of the slider
Index: tst_Treatment_BloodFlowRate/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_BloodFlowRate/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_BloodFlowRate/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_DialysateFlowRate/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_DialysateFlowRate/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_DialysateFlowRate/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_ParametersRange/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_ParametersRange/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_ParametersRange/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_PressureOcclusion/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_PressureOcclusion/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_PressureOcclusion/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_PressureOcclusion():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_Section_BloodDialysate/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_Section_BloodDialysate/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_Section_BloodDialysate/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,7 +13,7 @@
 #
 
 import names
-import utils
+import squishapi.utils          as utils
 
 def main():
     utils.tstStart()
Index: tst_Treatment_Time/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_Time/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_Time/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_TimeSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_Ultrafiltration/test.py
===================================================================
diff -u -r7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f -r20f2c70f789de08ea7f19df58de2362c5df240a9
--- tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 7b3e5d5ca42caaf50fc24bc9ea6710d99681ea3f)
+++ tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 20f2c70f789de08ea7f19df58de2362c5df240a9)
@@ -13,21 +13,21 @@
 #
 
 import names
-import utils
-import denaliMessages
+import squishapi.utils          as utils
+import squishapi.denaliMessages as denaliMessages 
 
 def gotoScreenNtest_Contains_Ultrafiltration():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True)
 
 def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF):
-    for i in range(vMinUF, vMaxUF+1):
+    for i in range(vMinUF, vMaxUF+1, 100):
         denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1)
-        test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, i)
+        test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i)
 
 def resetNTestTreatmentUltrafiltration():
     denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0)
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), 0)
      
 def main():
     utils.tstStart()
@@ -38,23 +38,23 @@
     gotoScreenNtest_Contains_Ultrafiltration()
     utils.waitForGUI(1)
 
-    minUF = 10
-    maxUF = 20
+    minUF = 1000
+    maxUF = 2000
     denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0)
     denaliMessages.send_acknowledge_UI()
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF)
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF)
     
     resetNTestTreatmentUltrafiltration()   
     startNTestTreatmentUltrafiltration(minUF, maxUF)
     resetNTestTreatmentUltrafiltration()
 
     minUF = 0
-    maxUF = 10
+    maxUF = 1000
     denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0)
     denaliMessages.send_acknowledge_UI()
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF)
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF)
  
     resetNTestTreatmentUltrafiltration()   
     startNTestTreatmentUltrafiltration(minUF, maxUF)