Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5a61bccd959265c00e5276ba23391198ca82b6dd -rc48a99d2d1c852adcc986253b6c420a90dab7bfe
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5a61bccd959265c00e5276ba23391198ca82b6dd)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
@@ -990,22 +990,26 @@
             handleFWVersionCmd( message );
             break;
 
-        case MSG_ID_DG_SWITCH_RESERVOIR:
+        case MSG_ID_DG_SWITCH_RESERVOIR_CMD:
             handleSwitchReservoirCmd( message );
             break;
 
-        case MSG_ID_DG_FILL:
+        case MSG_ID_DG_FILL_CMD:
             handleFillCmd( message );
             break;
 
-        case MSG_ID_DG_DRAIN:
+        case MSG_ID_DG_DRAIN_CMD:
             handleDrainCmd( message );
             break;
 
-        case MSG_ID_STARTING_STOPPING_TREATMENT:
+        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleStartStopTreatmentMsg( message );
             break;
 
+        case MSG_ID_DG_SAMPLE_WATER_CMD:
+            handleSampleWaterCmd( message );
+            break;
+
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
@@ -1040,6 +1044,34 @@
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
+            case MSG_ID_PRESSURE_OVERRIDE:
+                handleTestPressureSensorOverrideRequest( message );
+                break;
+
+            case MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
+                handleTestPressureDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
+                handleTestROPumpSetPointOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
+                handleTestROMeasuredFlowOverrideRequest( message );
+                break;
+
+            case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
+                handleTestDrainPumpSetPointOverrideRequest( message );
+                break;
+
+            case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
+                handleTestDrainPumpDataBroadcastIntervalOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;