Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb57941bb4258fd7fb44fc1ea5057de80b322f867 -r410083fef5d5db6157666e3c92263cb4eb64c30c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b57941bb4258fd7fb44fc1ea5057de80b322f867)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 410083fef5d5db6157666e3c92263cb4eb64c30c)
@@ -1073,6 +1073,10 @@
                 handleTestROPumpDutyCycleOverride( message );
                 break;
 
+            case MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE:
+                handleTestDGValvesSensedStateOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
                 handleTestROPumpTargetFlowOverride( message );
                 break;
@@ -1210,12 +1214,16 @@
                 handleResendAllAlarmsCommand( message );
                 break;
 
+            case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestGenIdlePublishIntervalOverride( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
+                handleTestDGDrainPumpCurrentOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestGenIdlePublishIntervalOverride( message );
+            case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
+                handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;
 
             default: