Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r1943944469d5a9f841f366ef9d8969c3072bd7ab -rfbc0a281b094ff309dcbf83db1878818a9b384f1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1943944469d5a9f841f366ef9d8969c3072bd7ab)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
@@ -1084,10 +1084,6 @@
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
-                handleTestDrainPumpSetPointOverrideRequest( message );
-                break;
-
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1161,15 +1157,15 @@
                 break;
 
             case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
-                handleROPumpDutyCycleOverride( message );
+                handleTestROPumpDutyCycleOverride( message );
                 break;
 
             case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleROFlowRateOverride( message );
+                handleTestMeasuredROFlowRateOverride( message );
                 break;
 
             case MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE:
-                handleROPumpTargetFlowOverride( message );
+                handleTestROPumpTargetFlowOverride( message );
                 break;
 
             case MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE: