Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rcc8b9ddb9905161ddb0dc2af6bfbf863408669c8 -r8e9deb5939d1a174f1c1afdfeac16569739e0357
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cc8b9ddb9905161ddb0dc2af6bfbf863408669c8)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8e9deb5939d1a174f1c1afdfeac16569739e0357)
@@ -1117,11 +1117,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:
@@ -1132,10 +1132,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;
@@ -1148,6 +1144,10 @@
                 handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
             case MSG_ID_DG_GET_SW_CONFIG_RECORD:
                 handleGetDGSoftwareConfigRecord( message );
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rcc8b9ddb9905161ddb0dc2af6bfbf863408669c8 -r8e9deb5939d1a174f1c1afdfeac16569739e0357
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cc8b9ddb9905161ddb0dc2af6bfbf863408669c8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8e9deb5939d1a174f1c1afdfeac16569739e0357)
@@ -22,7 +22,6 @@
 #include "Accel.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
@@ -363,7 +362,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3016,37 +3014,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3220,6 +3187,37 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
  * request to override the fan RPM alarm start time.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rcc8b9ddb9905161ddb0dc2af6bfbf863408669c8 -r8e9deb5939d1a174f1c1afdfeac16569739e0357
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision cc8b9ddb9905161ddb0dc2af6bfbf863408669c8)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 8e9deb5939d1a174f1c1afdfeac16569739e0357)
@@ -353,6 +353,12 @@
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE
 void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message );