Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd37f31cff6c20085953ecb598558e4d91e42f0af -r43a84133216095b12529dbfcc957bb3738bbc3a2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d37f31cff6c20085953ecb598558e4d91e42f0af)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 43a84133216095b12529dbfcc957bb3738bbc3a2)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      18-Feb-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -6901,17 +6901,17 @@
  *************************************************************************/
 void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
 
         if ( FALSE == payload.reset )
         {
-            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32, payload.index );
+            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32 );
         }
         else
         {
@@ -6965,7 +6965,6 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-
 void handleTestCurrentTreamtmentParametersRequest( MESSAGE_T *message )
 {
     BOOL result = FALSE;
@@ -6974,7 +6973,7 @@
     {
         result = TRUE;
         // ACK request
-        result = testUpdateCurrentTreatmentParameters();
+        result = testSendCurrentTreatmentParameters();
     }
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
@@ -6988,7 +6987,6 @@
  * @param data response data record
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-
 BOOL sendTestCurrentTreatmentParametersResponse(CURRENT_TREATMENT_PARAMS_DATA_PAYLOAD_T current_params)
 {
     MESSAGE_T msg;