Index: tests/unit_tests/test_ui_proxy.py
===================================================================
diff -u -re193e10da7d6c16158592c1aae7ebe1221dd0cde -r664049d0f1980ddb5775786ccc5a5e7f46f5ee0a
--- tests/unit_tests/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision e193e10da7d6c16158592c1aae7ebe1221dd0cde)
+++ tests/unit_tests/test_ui_proxy.py	(.../test_ui_proxy.py)	(revision 664049d0f1980ddb5775786ccc5a5e7f46f5ee0a)
@@ -23,7 +23,7 @@
 from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 from dialin.protocols.CAN import (DenaliMessage,
                                   DenaliChannels)
-from dialin.common import MsgIds
+from dialin.common import MsgIds, TreatmentParameters
 from dialin.utils import is_interface_up, is_interface_present
 
 
@@ -62,23 +62,23 @@
 
         self.hd.ui.cmd_set_treatment_parameters(**self.params)
 
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value]             ,  self.params.get("bld_flow", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value]         ,  self.params.get("dia_flow", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value]             ,  self.params.get("duration", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value]        ,  self.params.get("hep_rate", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value]            ,  self.params.get("hep_bol" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value]                ,  self.params.get("hep_stop", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value]             ,  self.params.get("sal_bol" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value]                   ,  self.params.get("acid"    , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value]                 ,  self.params.get("bicarb"  , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value]                      ,  self.params.get("dialyzer", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value]            ,  self.params.get("dia_temp", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value]   ,  self.params.get("art_low" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value]  ,  self.params.get("art_high", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value]     ,  self.params.get("ven_low" , None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value]    ,  self.params.get("ven_high", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value]   ,  self.params.get("bp_intvl", None))
-        self.assertEqual(self.hd.ui.treatment_parameters[self.hd.ui.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value]         ,  self.params.get("rb_flow" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value]             ,  self.params.get("bld_flow", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value]         ,  self.params.get("dia_flow", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value]             ,  self.params.get("duration", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value]        ,  self.params.get("hep_rate", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value]            ,  self.params.get("hep_bol" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value]                ,  self.params.get("hep_stop", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value]             ,  self.params.get("sal_bol" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value]                   ,  self.params.get("acid"    , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value]                 ,  self.params.get("bicarb"  , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value]                      ,  self.params.get("dialyzer", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value]            ,  self.params.get("dia_temp", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value]   ,  self.params.get("art_low" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value]  ,  self.params.get("art_high", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value]     ,  self.params.get("ven_low" , None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value]    ,  self.params.get("ven_high", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value]   ,  self.params.get("bp_intvl", None))
+        self.assertEqual(self.hd.ui.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value]         ,  self.params.get("rb_flow" , None))
 
 
     def test_treatment_parameters_settings_normal(self):