Index: tests/test_hd_simulator.py
===================================================================
diff -u -rf3171e14b9cbfabe015e6aa093234d8dd8b55b45 -r80501868a8f9a2c145945bbebb486fb3a32edfb2
--- tests/test_hd_simulator.py	(.../test_hd_simulator.py)	(revision f3171e14b9cbfabe015e6aa093234d8dd8b55b45)
+++ tests/test_hd_simulator.py	(.../test_hd_simulator.py)	(revision 80501868a8f9a2c145945bbebb486fb3a32edfb2)
@@ -17,7 +17,8 @@
 import sys
 sys.path.append("..")
 
-from dialin.ui.hd_simulator import HDSimulator, MsgDefs, Alarms
+from dialin.ui.hd_proxy import HDSimulator, RequestRejectReasons
+from dialin.ui.hd_proxy_alarms import Alarms
 from dialin.hd.hemodialysis_device import HD
 from dialin.utils.base import AbstractObserver
 from time import sleep
@@ -27,24 +28,24 @@
     hd_simulator = HDSimulator(log_level="DEBUG")
 
     rejections = [
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # overall response
-        MsgDefs.REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE,  # blood flow
-        MsgDefs.REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE,  # dialysate flow
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # duration
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin dispensing rate
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin bolus volume
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin stop time
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # saline bolus
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # acid concentrate
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # bicarbonate concentrate
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # dialyzer type
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # dialysate temperature
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # arterial pressure limit low
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # arterial pressure limit high
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # venous pressure limit low
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # venous pressure limit high
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # blood pressure measurement interval
-        MsgDefs.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE  # rinseback flow rate
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # overall response
+        RequestRejectReasons.REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE,  # blood flow
+        RequestRejectReasons.REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE,  # dialysate flow
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # duration
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin dispensing rate
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin bolus volume
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # heparin stop time
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # saline bolus
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # acid concentrate
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # bicarbonate concentrate
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # dialyzer type
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # dialysate temperature
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # arterial pressure limit low
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # arterial pressure limit high
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # venous pressure limit low
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # venous pressure limit high
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE,  # blood pressure measurement interval
+        RequestRejectReasons.REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE  # rinseback flow rate
         ]
     hd_simulator.cmd_send_treatment_parameter_validation_response(rejections)
 
@@ -78,9 +79,9 @@
 def test_clear_alarms():
     hd_simulator = HDSimulator()
 
-    hd_simulator.cmd_activate_alarm(Alarms.ALARM_ID_TREATMENT_STOPPED_BY_USER)
+    hd_simulator.alarms.cmd_activate_alarm(Alarms.ALARM_ID_TREATMENT_STOPPED_BY_USER)
     sleep(1)
-    hd_simulator.cmd_send_clear_alarms()
+    hd_simulator.alarms.cmd_send_clear_alarms()
 
 
 if __name__ == '__main__':