Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r94c4f859bf5a6844089972b41fb60a8d6ebd0463 -r5216f3b45f98fe69d09a66b6fef53b86b60e57e9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 94c4f859bf5a6844089972b41fb60a8d6ebd0463)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 5216f3b45f98fe69d09a66b6fef53b86b60e57e9)
@@ -25,7 +25,7 @@
 #include "ModeInitPOST.h"
 #include "ModeTreatment.h"
 #include "ModeTreatmentParams.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -58,12 +58,12 @@
 
 // ********** private data **********
 
-// DG status
-static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
+// DG status
+static DG_OP_MODE_T dgCurrentOpMode;                                        ///< Current DG operation mode.
 static U32 dgSubMode;                                                       ///< Current state (sub-mode) of current DG operation mode.
-static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
-static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
-static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
+static BOOL dgStartCommandSent;                                             ///< Flag indicates command to start DG has been sent.
+static BOOL dgStarted;                                                      ///< Flag indicates whether we have commanded the DG to start or stop.
+static BOOL dgTrimmerHeaterOn;                                              ///< Flag indicates whether we have commanded the DG to start or stop the trimmer heater.
 
 // DG sensor data
 static F32 dgDialysateTemp;                                                 ///< Dialysate temperature reported by the DG.
@@ -125,12 +125,12 @@
     U32 i, j;
 
     // NOTE: the active reservoir is set to reservoir 1 since DG will send active reservoir 1 as active on power up
-    dgStarted                       = FALSE;
-    dgTrimmerHeaterOn               = FALSE;
+    dgStarted                       = FALSE;
+    dgTrimmerHeaterOn               = FALSE;
     dgTrimmerTempSet                = 0.0F;
-    dgTrimmerTempCheckTimerCtr      = 0;
-    dgActiveReservoirSet            = DG_RESERVOIR_2;
-    dgActiveReservoir               = DG_RESERVOIR_2;
+    dgTrimmerTempCheckTimerCtr      = 0;
+    dgActiveReservoirSet            = DG_RESERVOIR_1;
+    dgActiveReservoir               = DG_RESERVOIR_1;
     dgDialysateTemp                 = 0.0F;
     dgCurrentOpMode                 = DG_MODE_INIT;
     dgSubMode                       = 0;
@@ -459,14 +459,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDialysateTemperature function gets the latest dialysate temperature.
- * @details Inputs: dgDialysateTemp
+ * The getDGDisinfectsStates function returns the DG disinfects readings.
+ * @details Inputs: none
  * @details Outputs: none
- * @return the latest dialysate temperature
+ * @return the current DG disinfects readings
  *************************************************************************/
-F32 getDialysateTemperature( void )
+DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
 {
-    return dgDialysateTemp;
+    return disinfectsStatus;
 }
 
 /*********************************************************************//**
@@ -510,14 +510,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGDisinfectsStates function returns the DG disinfects readings.
- * @details Inputs: disinfectsStatus
+ * The getDialysateTemperature function returns the DG dialysate temperature.
+ * @details Inputs: dgDialysateTemp
  * @details Outputs: none
- * @return the current DG disinfects readings
+ * @return the latest dialysate temperature
  *************************************************************************/
-DG_DISINFECT_UI_STATES_T getDGDisinfectsStates( void )
+F32 getDialysateTemperature( void )
 {
-    return disinfectsStatus;
+    return dgDialysateTemp;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd106a0eefd1e2ffe5873cd862ebbd53c1002de27 -r5216f3b45f98fe69d09a66b6fef53b86b60e57e9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d106a0eefd1e2ffe5873cd862ebbd53c1002de27)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5216f3b45f98fe69d09a66b6fef53b86b60e57e9)
@@ -5527,6 +5527,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd106a0eefd1e2ffe5873cd862ebbd53c1002de27 -r5216f3b45f98fe69d09a66b6fef53b86b60e57e9
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d106a0eefd1e2ffe5873cd862ebbd53c1002de27)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5216f3b45f98fe69d09a66b6fef53b86b60e57e9)
@@ -947,9 +947,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );