Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5652568f680408e60fe5fb84eee926e8804c07d7 -rb6416214042da75dfa311b726e401442b34315d7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5652568f680408e60fe5fb84eee926e8804c07d7)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b6416214042da75dfa311b726e401442b34315d7)
@@ -1153,11 +1153,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK:
@@ -1168,10 +1168,6 @@
                 handleSetDrainPumpMeasuredRPMOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
-                handleTestBlockMessagesRequest( message );
-                break;
-
             case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD:
                 handleTestSuperClearAlarmsRequest( message );
                 break;
@@ -1184,6 +1180,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE:
                 handleTestUsedAcidVolumeMLOverrideRequest( message );
                 break;
@@ -1228,14 +1228,14 @@
                 handleTestTareReservoirRequest( message );
                 break;
 
-            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDrainPumpMeasuredCurrentOverride( message );
-                break;
-
             case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
+                handleTestDGDrainPumpCurrentOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;