Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -receb190a5d66fdbee779478ac8bb50a846ed9241
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      28-Oct-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -25,9 +25,6 @@
 #include "FluidLeak.h"
 #include "LoadCell.h"
 #include "MessageSupport.h"
-#include "ModeChemicalDisinfect.h"
-#include "ModeFlush.h"
-#include "ModeHeatDisinfect.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
@@ -163,6 +160,15 @@
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_DG_SET_SERVICE_TIME
+void handleSetDGServiceTime( MESSAGE_T *message );
+
+// MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL
+void handleStartStopDGHeatDisinfectActiveCool( MESSAGE_T* message );
+
+// MSG_ID_REQUEST_CPLD_STATUS
+void handleCpldStatusRequest( MESSAGE_T *message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -337,6 +343,9 @@
 // MSG_ID_DG_START_STOP_CHEM_DSINFECT
 BOOL handleStartStopDGChemicalDisinfect( MESSAGE_T *message );
 
+// MSG_ID_DG_START_STOP_CHEM_DISINFECT_FLUSH
+BOOL handleStartStopDGChemicalDisinfectFlush( MESSAGE_T *message );
+
 // MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE
 void handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
@@ -404,6 +413,12 @@
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
 // MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE
+void handleTestDrainPumpMeasuredCurrentOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE
+void handleTestGenIdlePublishIntervalOverride( MESSAGE_T * message );
+
+// MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE
 void handleTestDGDrainPumpCurrentOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE
@@ -412,6 +427,27 @@
 // MSG_ID_DG_VALVES_SENSED_STATE_OVERRIDE
 void handleTestDGValvesSensedStateOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_NV_RECORD_CRC_OVERRIDE
+void handleTestDGNVRecordCRCOverride( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_STATUS_OVERRIDE
+void handleTestDGConcPumpParkStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_FAULT_STATUS_OVERRIDE
+void handleTestDGConcPumpParkFaultStatusOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_CONC_PUMP_PARK_COMMAND
+void handleTestDGConcPumpParkCommandRequest( MESSAGE_T *message );
+
+// MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE
+void handleTestDGFillModeBroadcastOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE
+void handleTestDGROPumpFeedbackVoltageOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_DIALYSATE_FILL_INTEGRATED_VOLUME_OVERRIDE
+void handleTestDGFillIntegratedVolumeOverrideRequest( MESSAGE_T *message );
+
 /**@}*/
 
 #endif