Index: dialin/hd/alarms.py
===================================================================
diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r39cffcc77c7c0ce645325cf50cad65874b2bb096
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 39cffcc77c7c0ce645325cf50cad65874b2bb096)
@@ -67,68 +67,6 @@
     START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_ALARM_ID = START_POS_ALARM_ID + 2
 
-    # See AlarmDefs.h
-    ALARM_ID_NO_ALARM = 0
-    ALARM_ID_SOFTWARE_FAULT = 1
-    ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2
-    ALARM_ID_FPGA_POST_TEST_FAILED = 3
-    ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4
-    ALARM_ID_UI_COMM_POST_FAILED = 5
-    ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6
-    ALARM_ID_BLOOD_PUMP_OFF_CHECK = 7
-    ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8
-    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9
-    ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = 10
-    ALARM_ID_DIAL_IN_PUMP_OFF_CHECK = 11
-    ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12
-    ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13
-    ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = 14
-    ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 15
-    ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16
-    ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17
-    ALARM_ID_WATCHDOG_EXPIRED = 18
-    ALARM_ID_RTC_COMM_ERROR = 19
-    ALARM_ID_RTC_CONFIG_ERROR = 20
-    ALARM_ID_DG_COMM_TIMEOUT = 21
-    ALARM_ID_UI_COMM_TIMEOUT = 22
-    ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 23
-    ALARM_ID_TREATMENT_STOPPED_BY_USER = 24
-    ALARM_ID_BLOOD_SITTING_WARNING = 25
-    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME = 26
-    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK = 27
-    ALARM_ID_CAN_MESSAGE_NOT_ACKED = 28
-    ALARM_ID_OCCLUSION_BLOOD_PUMP = 29
-    ALARM_ID_OCCLUSION_DIAL_IN_PUMP = 30
-    ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = 31
-    ALARM_ID_ARTERIAL_PRESSURE_LOW = 32
-    ALARM_ID_ARTERIAL_PRESSURE_HIGH = 33
-    ALARM_ID_VENOUS_PRESSURE_LOW = 34
-    ALARM_ID_VENOUS_PRESSURE_HIGH = 35
-    ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 36
-    ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 37
-    ALARM_ID_RTC_BATTERY_LOW = 38
-    ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 39
-    ALARM_ID_RTC_RAM_OPS_ERROR = 40
-    ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 41
-    ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = 42
-    ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = 43
-    ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 44
-    ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45
-    AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46
-    ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47
-    ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE = 48
-    ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = 49
-    ALARM_ID_HD_COMM_TIMEOUT = 50
-    ALARM_ID_VALVE_CONTROL_FAILURE = 51
-    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52
-    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53
-    ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 54
-    ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55
-    ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56
-    ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57
-    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 58
-    ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 59
-
     def __init__(self, can_interface, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
@@ -271,6 +209,7 @@
         @param message:  published HD alarm activation message
         @return: none
         """
+        self.logger.debug("Alarm activated!")
 
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_states[alarm_id[0]] = True
Index: dialin/protocols/CAN.py
===================================================================
diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r39cffcc77c7c0ce645325cf50cad65874b2bb096
--- dialin/protocols/CAN.py	(.../CAN.py)	(revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3)
+++ dialin/protocols/CAN.py	(.../CAN.py)	(revision 39cffcc77c7c0ce645325cf50cad65874b2bb096)
@@ -476,7 +476,9 @@
                             elif dialin_ch_id in self.sync_response_dictionary.keys() and \
                                     dialin_msg_id in self.sync_response_dictionary[channel_id].keys():
 
-                                self.sync_response_dictionary[dialin_ch_id][dialin_msg_id](complete_dialin_message)
+                                # send the message to all the callback functions
+                                for func in self.sync_response_dictionary[dialin_ch_id][dialin_msg_id]:
+                                    func(complete_dialin_message)
 
                         # Done with this message, let's get the next one
                         self.messages = None
@@ -497,11 +499,16 @@
 
         # if the channel_id exist, we just update the dictionary for the channel_id
         if channel_id in self.sync_response_dictionary.keys():
-            self.sync_response_dictionary[channel_id].update({message_id: function})
+            if message_id in self.sync_response_dictionary[channel_id]:
+                self.sync_response_dictionary[channel_id][message_id] += [function]
+            else:
+                self.sync_response_dictionary[channel_id][message_id] = {}
+                self.sync_response_dictionary[channel_id][message_id] = [function]
 
         # otherwise, we need to create the dictionary for the channel_id
         else:
-            self.sync_response_dictionary[channel_id] = {message_id: function}
+            self.sync_response_dictionary[channel_id] = {}
+            self.sync_response_dictionary[channel_id][message_id] = [function]
 
     def send(self, built_message, time_out=DIALIN_MSG_RESP_TO):
         """
Index: tests/test_alarms.py
===================================================================
diff -u -r4bdb012848d1b59be5edc31d677b77b9d95f6190 -r39cffcc77c7c0ce645325cf50cad65874b2bb096
--- tests/test_alarms.py	(.../test_alarms.py)	(revision 4bdb012848d1b59be5edc31d677b77b9d95f6190)
+++ tests/test_alarms.py	(.../test_alarms.py)	(revision 39cffcc77c7c0ce645325cf50cad65874b2bb096)
@@ -26,7 +26,7 @@
         pass
 
     def update(self, result):
-        print(result)
+        pass
 
         # Store the state
 
@@ -72,7 +72,7 @@
         'ALARM_ID_UF_VOLUME_ACCURACY_ERROR',
         'ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE',
         'ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR',
-        'AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR',
+        'ALARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR',
         'ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR',
         'ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE',
         'ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE',
@@ -92,12 +92,12 @@
             if desc in alarm_faults:
                 print("Skipping {0}".format(desc))
                 continue
-            print("Testing {0} = {1}".format(desc, val))
-            success = hd.alarms.cmd_alarm_state_override(1, val)
-            time.sleep(10)
+            print("Testing {0} = {1}".format(val.name, val.value))
+            success = hd.alarms.cmd_alarm_state_override(1, val.value)
+            time.sleep(3)
             if not success:
                 raise ValueError("Failed to activate alarm {0} = {1}".format(desc, val))
-            success = hd.alarms.cmd_alarm_state_override(0, val)
+            success = hd.alarms.cmd_alarm_state_override(0, val.value)
             if not success:
                 raise ValueError("Failed to deactivate alarm {0} = {1}".format(desc, val))
             time.sleep(2)
Index: tests/test_can.py
===================================================================
diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r39cffcc77c7c0ce645325cf50cad65874b2bb096
--- tests/test_can.py	(.../test_can.py)	(revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3)
+++ tests/test_can.py	(.../test_can.py)	(revision 39cffcc77c7c0ce645325cf50cad65874b2bb096)
@@ -17,6 +17,11 @@
 sys.path.append("..")
 from dialin.utils.base import setup_virtual_can_interface, setup_real_can_interface
 
+resp = input("Setup virtual can interface? (y/n): ")
+if resp.lower() == "y":
+    setup_virtual_can_interface()
+else:
+    resp = input("Setup real can interface? (y,n): ")
+    if resp.lower() == "y":
+        setup_real_can_interface()
 
-setup_virtual_can_interface()
-