Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rfbb66032e095655b8857834bb4537539928ffadd -r96b5e7c27d8cd76544216a4d56ddbd58fd519bd1
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision fbb66032e095655b8857834bb4537539928ffadd)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 96b5e7c27d8cd76544216a4d56ddbd58fd519bd1)
@@ -465,7 +465,7 @@
             if ( ++dialysateFlowDataFreshStatusCounter > DIP_DIALYSATE_FLOW_DATA_ALARM_THRESHOLD )
             {
                 filterDialInFlowReadings( 0.0 );
- /*               activateAlarmNoData( ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE );   */ // TODO: Uncomment when testing is done. DN-29SEPT2022
+                activateAlarmNoData( ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE );
             }
         }
         else
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -re9e80b33a004bdc3eaa83e4a916b4cf225e3d201 -r96b5e7c27d8cd76544216a4d56ddbd58fd519bd1
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision e9e80b33a004bdc3eaa83e4a916b4cf225e3d201)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 96b5e7c27d8cd76544216a4d56ddbd58fd519bd1)
@@ -39,8 +39,7 @@
 #define BATTERY_PACK_MIN_CHARGE_PCT                 50                      ///< Minimum battery pack state of charge in percentage.
 
 #define BATTERY_COMM_TIME_OUT_MS                    2                       ///< Battery communication time out in ms.
-#define BATTERY_MONITOR_INTERVAL_MS                 /* 250  */ 1000        ///< Battery monitor interval in ms.    - DN-10OCT2022 TODO Restore 250
-
+#define BATTERY_MONITOR_INTERVAL_MS                 420                     ///< Battery monitor interval in ms.
 #define AC_POWER_LOST_PERSISTENT_COUNT              3                       ///< AC power lost persistent count before alarming.
 #define BATTERY_COMM_FAULT_PERSISTENTCE_COUNT       5                       ///< Battery communication fault persistent count before alarming.
 
@@ -390,9 +389,9 @@
                 generateStopCondition();
                 if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
                 {
-//#ifndef DISABLE_BATT_COMM - DN-10OCT2022 TODO: Uncomment this
+#ifndef DISABLE_BATT_COMM
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
-//#endif
+#endif
                 }
             }
         }
@@ -446,19 +445,17 @@
             }
         }
     }
-    // Test code for battery "bus collision" issue - DN-10OCT2022: TODO: Keep or remove this test code?
-    // BEGIN
+
     if ( FALSE == result )
     {
         if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
         {
-//#ifndef DISABLE_BATT_COMM - DN-10OCT2022 TODO: Uncomment this
+#ifndef DISABLE_BATT_COMM
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, dataPtr );
-//#endif
+#endif
             commFaultPersistentCount = 0;
         }
     }
-    // END
 
     return result;
 }