Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3 -r849d55bf09a76e59424878b1ae4dac4b51ead3a9
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 849d55bf09a76e59424878b1ae4dac4b51ead3a9)
@@ -836,6 +836,10 @@
             handleDrainCmd( message );
             break;
 
+        case MSG_ID_HD_OP_MODE:
+            handleSetHDOperationMode( message );
+            break;
+
         case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleStartStopTreatmentMsg( message );
             break;
@@ -880,6 +884,10 @@
             handleDGScheduledRunsRequest( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1184,10 +1192,14 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
-            case MSG_ID_HD_OP_MODE:
-                handleSetHDOperationMode( message );
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
                 break;
 
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;