Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8638b207699a3a48e3657e838e24ae838369c867 -r49ac2ce8748ea2e0c6ff0124dac97a81deb4aa9d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8638b207699a3a48e3657e838e24ae838369c867)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 49ac2ce8748ea2e0c6ff0124dac97a81deb4aa9d)
@@ -992,10 +992,6 @@
     {
         switch ( msgID )
         {
-            case MSG_ID_DG_MESSAGE:
-                handleTestDGMessageRequest( message );
-                break;
-
             case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
                 handleTestWatchdogCheckInStateOverrideRequest( message );
                 break;
@@ -1012,10 +1008,17 @@
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
+            case MSG_ID_VALVE_STATE_OVERRIDE:
+                handleTestValveStateOverrideRequest( message );
+                break;
+
+            case MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestValvesStatesPublishIntervalOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;
         }
     }
 }
-