Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -ref736ac366eb13b52b852c51309e7ae6b0942202
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision ef736ac366eb13b52b852c51309e7ae6b0942202)
@@ -93,7 +93,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
@@ -561,7 +561,8 @@
         if ( TRUE == isTestingActivated() )
         {
             result = TRUE;
-            loadcells[ loadCellID ].weight.ovData   = value;
+            // Add tare to given value so reported load will be what is requested when tare is subtracted later
+            loadcells[ loadCellID ].weight.ovData   = value + loadcells[ loadCellID ].autoCalOffset;
             loadcells[ loadCellID ].weight.override = OVERRIDE_KEY;
         }
     }
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -ref736ac366eb13b52b852c51309e7ae6b0942202
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision ef736ac366eb13b52b852c51309e7ae6b0942202)
@@ -108,11 +108,8 @@
     // NOTE: The target flow rate should be set prior to setting the start primary heater
     // because the initial guess in the heaters driver needs the target flow to calculate
     // the new PWMs for the main and small primary heaters
-    //setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+    setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 
-    //testSetTargetDutyCycle( 0.55 );
-
-    setHeaterTargetTemperature( DG_PRIMARY_HEATER, 39.0 );  // TODO remove this line. It comes form HD
     startHeater( DG_PRIMARY_HEATER );
 }
 
@@ -217,8 +214,7 @@
     // When enough water volume has flowed to flush the lines, transition to flush water state
     if ( flushLinesVolumeL >=  getFlushLineVolume() )
     {
-        //setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC ); TODO remove
-        //setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+        setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
         result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER;
     }
 
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -ref736ac366eb13b52b852c51309e7ae6b0942202
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ef736ac366eb13b52b852c51309e7ae6b0942202)
@@ -1273,11 +1273,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;
 
             default: