Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671 -ra53ec9a732b139e0c6650bd14093d8100301357c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a53ec9a732b139e0c6650bd14093d8100301357c)
@@ -1122,11 +1122,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:
@@ -1137,10 +1137,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;
@@ -1149,10 +1145,14 @@
                 handleTestAlarmInfoSendIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE:
-                handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( message );
+            case MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET:
+                handleTestFansRPMAlarmStartTimeOffsetRequest( 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 -r33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671 -ra53ec9a732b139e0c6650bd14093d8100301357c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 33bcd0fcd7a3bba5f85a7e35ac63aadbe4e91671)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a53ec9a732b139e0c6650bd14093d8100301357c)
@@ -23,7 +23,6 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
@@ -364,7 +363,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3049,37 +3047,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
@@ -3253,33 +3220,58 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
- * request to override the fan RPM alarm start time.
+ * 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 handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
+void handleFansRPMOverride( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
-
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
         }
         else
         {
-            result = testResetFanRPMAlarmStartTimeOffsetOverride();
+            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
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message )
+{
+    U32 rpmTimeOffset;
+
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
+    {
+        memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
+
+        result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset );
+    }
+
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }