Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3db5538afb80bc12822304d698343e0325fa708e -r36923cf573ee2ae49ddaaf001068934c6bf88c6c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c)
@@ -6798,39 +6798,6 @@
 
 /*********************************************************************//**
  * @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 handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
-
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetFanRPMAlarmStartTimeOffsetOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSetFansDutyCycleOverrideRequest function handles a
  * request to override the fans duty cycle.
  * @details Inputs: none
@@ -6908,6 +6875,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
+ * request to set the fans RPM alarm start time offset.
+ * @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 );
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendHDSWConfigRecord function sends out the HD software configuration record.
  * @details Inputs: none
  * @details Outputs: HD software configuration record msg constructed and queued