Index: tst_Alarm/test.py
===================================================================
diff -u -rb89fd9ccb593a203a8f019e670dcfc46fbd439d4 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Alarm/test.py	(.../test.py)	(revision b89fd9ccb593a203a8f019e670dcfc46fbd439d4)
+++ tst_Alarm/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,8 +13,7 @@
 #
 
 import names
-import denaliMessages 
-import utils
+from dialin.squish import utils, denaliMessages
 from time import sleep
 import os
 
Index: tst_CANBusFaultCount/test.py
===================================================================
diff -u -rb11714354c2bdc8df3cfd03bb9c46f688a8b7c0b -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_CANBusFaultCount/test.py	(.../test.py)	(revision b11714354c2bdc8df3cfd03bb9c46f688a8b7c0b)
+++ tst_CANBusFaultCount/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,8 +13,8 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
+ 
 
 def gotoScreenNtest_Contains_CANBusFaultCount():
     mouseClick(waitForObject(names.o_mainMenu_settings))
Index: tst_HomeScreen/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_HomeScreen/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_HomeScreen/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,7 +13,7 @@
 #
 
 import names
-import utils
+from dialin.squish import utils 
 
 def main():
     utils.tstStart()
Index: tst_Internals/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Internals/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Internals/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -12,14 +12,14 @@
 # author  Behrouz NematiPour
 #
 
-import utils
-import unittests
+from dialin.squish.utils import tstStart, tstDone
+from dialin.squish import unittests
  
 
 def main():
-    utils.tstStart()
+    tstStart()
     
-    unittests.testPythonVersion()
-    unittests.testcrc8()
+    unittests.test_python_version()
+    unittests.test_crc8()
     
-    utils.tstDone()
\ No newline at end of file
+    tstDone()
\ No newline at end of file
Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r53da790343ac7d1554b51465dbf1483d84772050 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 53da790343ac7d1554b51465dbf1483d84772050)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,7 @@
 #
 
 import names
-import utils
-import globals
-import denaliMessages 
+from dialin.squish import utils, globals, denaliMessages
 
 ################################################################################
 # This test need to be changed when the Service screen has been implemented    #
Index: tst_TreatmentScreen/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_TreatmentScreen/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_TreatmentScreen/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,8 +13,9 @@
 #
 
 import names
-import utils
+from dialin.squish import utils 
 
+
 def main():
     utils.tstStart()
     
Index: tst_Treatment_Adjustment_BloodDialysate/test.py
===================================================================
diff -u -r84797bef0eb4a0898718fde40d11e5f69d568c09 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision 84797bef0eb4a0898718fde40d11e5f69d568c09)
+++ tst_Treatment_Adjustment_BloodDialysate/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True)
Index: tst_Treatment_Adjustment_Duration/test.py
===================================================================
diff -u -rd53166805a654f22111b6af975018b61520dfdba -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Adjustment_Duration/test.py	(.../test.py)	(revision d53166805a654f22111b6af975018b61520dfdba)
+++ tst_Treatment_Adjustment_Duration/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_DurationSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True)
Index: tst_Treatment_Adjustment_Ultrafiltration/test.py
===================================================================
diff -u -r84797bef0eb4a0898718fde40d11e5f69d568c09 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Adjustment_Ultrafiltration/test.py	(.../test.py)	(revision 84797bef0eb4a0898718fde40d11e5f69d568c09)
+++ tst_Treatment_Adjustment_Ultrafiltration/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -12,9 +12,9 @@
 # author  Behrouz NematiPour
 #
 
-import utils
-import denaliMessages
+from dialin.squish import utils, denaliMessages
 
+
 from names import *
 
 eInvalid        = 0
Index: tst_Treatment_BloodFlowRate/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_BloodFlowRate/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_BloodFlowRate/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,8 +13,7 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
Index: tst_Treatment_DialysateFlowRate/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_DialysateFlowRate/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_DialysateFlowRate/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True)
Index: tst_Treatment_LoadCellReadings/test.py
===================================================================
diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_LoadCellReadings/test.py	(.../test.py)	(revision b465db1ba597c4ec337caf73e1a862e82b19f8a8)
+++ tst_Treatment_LoadCellReadings/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_LoadCellReadings():
     mouseClick(waitForObject(names.o_mainMenu_settings))
     test_values(0, 0, 0, 0)
Index: tst_Treatment_ParametersRange/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_ParametersRange/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_ParametersRange/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_FlowsSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_flowsTouchArea_TreatmentFlows).visible, True)
Index: tst_Treatment_PressureOcclusion/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_PressureOcclusion/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_PressureOcclusion/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_PressureOcclusion():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_pressureTouchArea_TreatmentPressure).visible, True)
Index: tst_Treatment_Section_BloodDialysate/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Section_BloodDialysate/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_Section_BloodDialysate/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,7 +13,7 @@
 #
 
 import names
-import utils
+from dialin.squish import utils 
 
 def main():
     utils.tstStart()
Index: tst_Treatment_TemperatureSensors/test.py
===================================================================
diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_TemperatureSensors/test.py	(.../test.py)	(revision b465db1ba597c4ec337caf73e1a862e82b19f8a8)
+++ tst_Treatment_TemperatureSensors/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_TemperatureSensors():
     mouseClick(waitForObject(names.o_mainMenu_settings))
     
Index: tst_Treatment_Time/test.py
===================================================================
diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Time/test.py	(.../test.py)	(revision b795e6250294344ef7b0396bae4648fb2aa306b3)
+++ tst_Treatment_Time/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names
-import utils
-import denaliMessages 
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_TimeSection():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_shape_Shape).visible, True)
Index: tst_Treatment_Ultrafiltration/test.py
===================================================================
diff -u -r53da790343ac7d1554b51465dbf1483d84772050 -r3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27
--- tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 53da790343ac7d1554b51465dbf1483d84772050)
+++ tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 3aed17dfb3ac5265e8ba5635c7ec43fa8c3c0d27)
@@ -13,9 +13,9 @@
 #
 
 import names 
-import utils
-import denaliMessages
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_Ultrafiltration():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True)