Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -341,19 +341,21 @@
 
     if ( TRUE == FPGABloodLeakZeroDetected() )
     {
-        state = BLOOD_LEAK_SELF_TEST_STATE;
         bloodLeakSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
         clearFPGABloodLeakZero();
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
         setFPGABloodLeakSelfTest();
+        state = BLOOD_LEAK_SELF_TEST_STATE;
+#else
+        state = BLOOD_LEAK_NORMAL_STATE;
+#endif
         bloodLeakSelfTestStartTime = getMSTimerCount();
     }
     else
     {
         if ( TRUE == didTimeout( bloodLeakZeroStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
-#ifndef IGNORE_BLOOD_LEAK_ALARM
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_FAULT );
-#endif
         }
     }
 
@@ -372,7 +374,7 @@
 {
     BLOOD_LEAK_STATES_T state = BLOOD_LEAK_SELF_TEST_STATE;
 
-#ifndef IGNORE_BLOOD_LEAK_ALARM
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_IN_PROGRESS == bloodLeakSelfTestStatus )
     {
         if ( FALSE == noFPGABloodLeakDetected() ) // Faked blood leak caused by independent MCU board
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -7,8 +7,8 @@
 *
 * @file    Fans.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      15-Sep-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  04-Aug-2021
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0ddfb88172db9b6c0b41b1dc5c0cc3e0296068be)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      12-Nov-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      07-Dec-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -56,7 +56,7 @@
 
 #pragma pack(push, 1)
 
-/// Record for transmitted message that is pending acknowledgement from receiver.
+/// Record for transmitted message that is pending acknowledgment from receiver.
 typedef struct
 {
     BOOL used;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2a6ac80309cb52922f856b3eb4ff2c876b44c0d6 -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2a6ac80309cb52922f856b3eb4ff2c876b44c0d6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -819,8 +819,8 @@
     msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( TREATMENT_LOG_DATA_PAYLOAD_T );
 
-    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
     memcpy( payloadPtr, &reason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, logDataPtr, sizeof( TREATMENT_LOG_DATA_PAYLOAD_T ) );
@@ -2307,7 +2307,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?
@@ -5123,6 +5123,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.u32 );