Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf8feb10a7e19e17148e4ce8b247316c9772d1753 -r5e77f78c5dee9dfb441bd5d2053f7f4ac50dc619
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f8feb10a7e19e17148e4ce8b247316c9772d1753)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e77f78c5dee9dfb441bd5d2053f7f4ac50dc619)
@@ -3360,8 +3360,8 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetDialysateFlowCalibration function handles a request to set
- * dialysate flow calibration factors.
+ * The handleTestSetTreatmentParameter function handles a request to set
+ * a given treatment parameter.
  * @details
  * Inputs : none
  * Outputs : message handled
@@ -3384,4 +3384,54 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestSuperClearAlarmsRequest function handles a request to clear
+ * all active alarms.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        U32 key;
+
+        memcpy( &key, message->payload, sizeof(U32) );
+        result = testClearAllAlarms( key );
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestHDCalibrationDataRequest function handles a request for
+ * HD calibration data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestHDCalibrationDataRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // TODO - call TBD function in NVDataMgmt to send calibration data
+        result = FALSE;
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/