Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -re3839e10decfadf12a8fb2b9f8c049d8a30e945b -r9e5e0295b749e0cfb6017338fea63e6e4086e57b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e3839e10decfadf12a8fb2b9f8c049d8a30e945b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9e5e0295b749e0cfb6017338fea63e6e4086e57b)
@@ -1008,9 +1008,9 @@
                 handleTestLoadCellOverrideRequest( message );
                 break;
 
-            case MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE:
+/*            case MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE:
                 handleTestLoadCellDataBroadcastIntervalOverrideRequest( message );
-                break;
+                break;*/
 
             case MSG_ID_PRESSURE_OVERRIDE:
                 handleTestPressureSensorOverrideRequest( message );
@@ -1057,12 +1057,15 @@
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestTemperatureSensorsDataPublishOverrideRequest( message );
+            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
+            case MSG_ID_LOAD_CELL_SEND_INTERVAL_OVERRIDE:
+                //handleTestTemperatureSensorsDataPublishOverrideRequest( message );
+                handleTestOverrideCommand( message );
                 break;
 
-            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
+/*            case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
                 handleTestHeatersDataPublishOverrideRequest( message );
-                break;
+                break;*/
 
             case MSG_ID_CONDUCTIVITY_OVERRIDE:
                 handleTestSetConductivityOverrideRequest( message );