Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -rff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision ff90c5d3a21b9b4eecc4f85a4cfeb15bff28d371)
@@ -38,6 +38,7 @@
 #include "PistonPumpControl.h"
 #endif
 #include "Pressure.h"
+#include "SafetyShutdown.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
 #include "TDInterface.h"
@@ -142,7 +143,7 @@
     { MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST,                                &testHeaterStartStopOverride },
     { MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,                           &testValveOpenCloseStateOverride },
     { MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,                                         &handleDialysateDeliveryRequestMsg },
-    { MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
+    { MSD_ID_DD_FP_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
     { MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDBalChamberDataPublishIntervalOverride },
     { MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST,                           &testBalChamberSwFreqOverride },
     { MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST,                         &testDialDeliveryInProgressOverride },
@@ -159,6 +160,7 @@
     { MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                       &testDDPostGenDialysateDataPublishIntervalOverride },
     { MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,                                     &handlePreGenDialysateRequestMsg },
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
+    { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
 #ifdef __PUMPTEST__
     { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
     { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },