Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4638fd77792d0c7ecbeca3c84369cbed6c2ecee1 -r88f28230d288947ba84840b967e95b32e3deffaa
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4638fd77792d0c7ecbeca3c84369cbed6c2ecee1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 88f28230d288947ba84840b967e95b32e3deffaa)
@@ -21,6 +21,7 @@
 #include "sci.h"
 #include "sys_dma.h"
 
+#include "DrainPump.h"
 #include "SystemComm.h"
 #include "Comm.h"
 #include "Interrupts.h"
@@ -1084,6 +1085,10 @@
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
+                handleTestDrainPumpRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1136,6 +1141,10 @@
                 handleSetAccelCalibration( message );
                 break;
 
+            case MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE:
+                handleSetDrainPumpDeltaPressureOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_SOFTWARE_RESET_REQUEST:
                 handleDGSoftwareResetRequest( message );
                 break;
@@ -1156,6 +1165,33 @@
                 handleConcentratePumpPublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestThermistorsDataPublishIntervalOverride( message );
+                break;
+
+            case MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE:
+                handleTestThermistorsValueOverride( message );
+                break;
+
+            case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestFansDataPublishIntervalOverride( message );
+
+            case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
+                handleTestROPumpDutyCycleOverride( message );
+                break;
+
+            case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
+                handleTestMeasuredROFlowRateOverride( message );
+                break;
+
+            case MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE:
+                handleTestROPumpTargetFlowOverride( message );
+                break;
+
+            case MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE:
+                handleROPumpTargetPressureOverride( message );
+                break;
+
             case MSG_ID_DG_START_STOP_UV_REACTORS:
                 handleStartStopUVReactors( message );
                 break;