Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8 -r35c07199fda6ba28c7ee417105a16ea3d14a2ad6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 51e60f3e3a7c95c910c24dd5f3b58e0c6b2691b8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 35c07199fda6ba28c7ee417105a16ea3d14a2ad6)
@@ -3255,27 +3255,21 @@
  * 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
+ * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
+void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    U32 rpmTimeOffset;
+
     BOOL result = FALSE;
 
-    // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    // Verify payload length
+    if ( sizeof(U32) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
 
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetFanRPMAlarmStartTimeOffsetOverride();
-        }
+        result = testSetFanRPMAlarmStartTimestamp( rpmTimeOffset );
     }
 
     // Respond to request