Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8a42ba4060bf15e63d291fa23df6fcd5434beab4 -rd6b09c549d14f5f7fe08484bf0e882cadf2a892b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8a42ba4060bf15e63d291fa23df6fcd5434beab4)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d6b09c549d14f5f7fe08484bf0e882cadf2a892b)
@@ -54,9 +54,9 @@
 #define MAX_COMM_CRC_FAILURES           5                                   ///< maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
-#define MSG_NOT_ACKED_TIMEOUT_MS    ( MS_PER_SECOND * 1 )                   ///< maximum time for a Denali message that requires ACK to be ACK'd
-#define MSG_NOT_ACKED_MAX_RETRIES   3                                       ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
-#define PENDING_ACK_LIST_SIZE       25                                      ///< maximum number of Delanli messages that can be pending ACK at any given time
+#define MSG_NOT_ACKED_TIMEOUT_MS        150                                 ///< maximum time for a Denali message that requires ACK to be ACK'd
+#define MSG_NOT_ACKED_MAX_RETRIES       3                                   ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
+#define PENDING_ACK_LIST_SIZE           25                                  ///< maximum number of Delanli messages that can be pending ACK at any given time
 
 #pragma pack(push, 1)
 
@@ -1092,10 +1092,18 @@
                 handleTestROMeasuredFlowOverrideRequest( message );
                 break;
 
+            case MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
+                handleTestDialysateMeasuredFlowOverrideRequest( message );
+                break;
+
             case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
+            case MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
+                handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( message );
+                break;
+
             case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
                 handleTestDrainPumpRPMOverrideRequest( message );
                 break;
@@ -1273,11 +1281,11 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride( message );
+                handleFilterFlushTimePeriodOverride(message);
                 break;
 
-            case MSG_ID_DG_FANS_RPM_OVERRIDE:
-                handleFansRPMOverride( message );
+            case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
+                handleTestBlockMessagesRequest( message );
                 break;
 
             case MSG_ID_DG_STOP_RTC_CLOCK: