Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6b6b337c1c0e7dd7c1b7311a39596473d7214ee4 -r6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6b6b337c1c0e7dd7c1b7311a39596473d7214ee4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6c801cb0b32cba0e754cb6b1b57c1a8bd4e2bcf7)
@@ -20,6 +20,7 @@
 
 #include "Common.h"
 #include "AlarmLamp.h"
+#include "AlarmMgmt.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "MsgQueues.h"
@@ -227,7 +228,7 @@
     msgSize = serializeMessage( msg, data );
 
     // add serialized message data to appropriate comm buffer
-    result = addToCommBuffer( COMM_BUFFER_OUT_UART_PC, data, msgSize );
+    result = addToCommBuffer( COMM_BUFFER_OUT_CAN_PC, data, msgSize );
 
     return result;
 }
@@ -342,9 +343,21 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-//DATA_ARRAY_OVERRIDE_HANDLER_FUNC( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
+ * @brief handleTestAlarmStartOverrideRequest
+ * The handleTestAlarmStartOverrideRequest function handles a request to \n
+ * override the start time of a given alarm.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC( U32, handleTestAlarmStartOverrideRequest, testSetAlarmStartOverride, testResetAlarmStartOverride )
+
+/*************************************************************************
  * @brief handleTestBloodFlowSetPointOverrideRequest
  * The handleTestBloodFlowSetPointOverrideRequest function handles a request to \n
  * override the set point for the blood flow rate (mL/min).