Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb8a36ae9692adf58ae92ff1093f7be2eda9397d8 -rbcc50c1bef73f433f3697542a9d5ed14bc5f8d73
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b8a36ae9692adf58ae92ff1093f7be2eda9397d8)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bcc50c1bef73f433f3697542a9d5ed14bc5f8d73)
@@ -837,6 +837,10 @@
             handleDrainCmd( message );
             break;
 
+        case MSG_ID_HD_OP_MODE:
+            handleSetHDOperationMode( message );
+            break;
+
         case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
             handleStartStopTreatmentMsg( message );
             break;
@@ -1185,8 +1189,8 @@
                 handleSetDGUsageInfoRecord( message );
                 break;
 
-            case MSG_ID_HD_OP_MODE:
-                handleSetHDOperationMode( message );
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
                 break;
 
             default: