Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -r57007cd9fc64466a979f6613763a243d77743117
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8b56b0c617ac49536b8d53852b9621be873bade6)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 57007cd9fc64466a979f6613763a243d77743117)
@@ -790,10 +790,8 @@
                     {
                         sendACKMsg( &message.msg );
                     }
-                    else
-                    {   // otherwise, process the received message
-                        processReceivedMessage( &message.msg );
-                    }
+                    // otherwise, process the received message
+                    processReceivedMessage( &message.msg );
                 }
             }
             else // CRC failed
@@ -994,10 +992,6 @@
     {
         switch ( msgID )
         {
-            case MSG_ID_DG_MESSAGE:
-                handleTestDGMessageRequest( message );
-                break;
-
             case MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE:
                 handleTestWatchdogCheckInStateOverrideRequest( message );
                 break;
@@ -1010,10 +1004,22 @@
                 handleSetRTCTimestamp( message );
                 break;
 
+            case MSG_ID_START_STOP_PRIMARY_HEATER:
+                handleStartStopPrimaryHeater ( message );
+                break;
+
             case MSG_ID_LOAD_CELL_OVERRIDE:
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
+            case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
+                handleTestTemperatureSensorsOverrideRequest ( message );
+                break;
+
+            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
+                handleTestHeatersDataPublishOverrideRequest ( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;