Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r41b10a6abfff3c6e2cbef765ed5ddc762a19899c -rca8a4a4cf6d2c59d9296c3abdf314765550a2624
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 41b10a6abfff3c6e2cbef765ed5ddc762a19899c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ca8a4a4cf6d2c59d9296c3abdf314765550a2624)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      27-Aug-2024
+* @date    (last)      02-Nov-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -96,7 +96,11 @@
 
 // ********** private data **********
 
+#ifndef CARTRIDGE_TEST_BUILD
 static BOOL testerLoggedIn = FALSE;                         ///< Flag indicates whether an external tester (connected PC) has sent a valid login message.
+#else
+static BOOL testerLoggedIn = TRUE;                          ///< Flag indicates whether an external tester (connected PC) has sent a valid login message.
+#endif
 static volatile U16 nextSeqNo = 1;                          ///< Value of sequence number to use for next transmitted message.
 
 /// List of message IDs that are requested not to be transmitted.
@@ -3448,10 +3452,14 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID      = MSG_ID_HD_USAGE_DATA;
-    msg.hdr.payloadLen = sizeof( HD_USAGE_INFO_RECORD_T );
+    msg.hdr.payloadLen = sizeof( F32 ) + sizeof( F32 ) + sizeof( U32 );
 
     // Fill message payload
-    memcpy( payloadPtr, &usageRecord, sizeof( HD_USAGE_INFO_RECORD_T ) );
+    memcpy( payloadPtr, &usageRecord.txTimeTotalHrs, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &usageRecord.txTimeSinceLastSrvcHrs, sizeof( F32 ) );
+    payloadPtr += sizeof( F32 );
+    memcpy( payloadPtr, &usageRecord.txLastStartTimeEpoch, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
@@ -8891,4 +8899,100 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleBloodLeakEmbModeInfoValuesOverride function handles the blood
+* leak embedded mode info commands override.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleBloodLeakEmbModeInfoValuesOverride( 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 = testSetBloodLeakEmbeddedModeInfoOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBloodLeakEmbeddedModeInfoOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBloodLeakIntensityMovingAverageOverride function handles a
+ * request to override the blood leak intensity moving average.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBloodLeakIntensityMovingAverageOverride( 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 = testSetBloodLeakIntensityMovingAverageOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetBloodLeakIntensityMovingAverageOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBloodLeakZeroingIntervalInMinutesOverride function handles a
+ * request to override the blood leak zeroing interval in minutes.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBloodLeakZeroingIntervalInMinutesOverride( 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 = testSetBloodLeakZeroingIntervalInMinsOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBloodLeakZeroingIntervalInMinsOverride( payload.index );
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/