Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -ref736ac366eb13b52b852c51309e7ae6b0942202 -r73d351b8b976805d73bdceb8c6c1860f9644b607
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision ef736ac366eb13b52b852c51309e7ae6b0942202)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 73d351b8b976805d73bdceb8c6c1860f9644b607)
@@ -561,8 +561,7 @@
         if ( TRUE == isTestingActivated() )
         {
             result = TRUE;
-            // 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.ovData   = value;
             loadcells[ loadCellID ].weight.override = OVERRIDE_KEY;
         }
     }
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -ref736ac366eb13b52b852c51309e7ae6b0942202 -r73d351b8b976805d73bdceb8c6c1860f9644b607
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision ef736ac366eb13b52b852c51309e7ae6b0942202)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 73d351b8b976805d73bdceb8c6c1860f9644b607)
@@ -137,7 +137,7 @@
     {
         if ( TRUE == didTimeout( hdLostCommStartTime_ms, HD_LOST_COMM_TIMEOUT_MS ) )
         {
-            //requestNewOperationMode( DG_MODE_STAN ); TODO uncomment there is no HD in unit 2
+            requestNewOperationMode( DG_MODE_STAN );
         }
     }
 
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -r73d351b8b976805d73bdceb8c6c1860f9644b607
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 73d351b8b976805d73bdceb8c6c1860f9644b607)
@@ -155,9 +155,9 @@
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_IDLE;
 
     // go to standby solo mode if HD is turned off or stops communicating.
-    //if ( FALSE == isHDCommunicating() )  //TODO uncomment
-    BOOL test = TRUE;
-    if( FALSE == test )
+    if ( FALSE == isHDCommunicating() )  //TODO uncomment when HD is available and no testing that HD and DG both are needed is happening
+    //BOOL test = TRUE;
+    //if( FALSE == test )
     {   // TODO if HD comm loss, should we wait an hour or so before going to solo standby?
         requestNewOperationMode( DG_MODE_SOLO );
     }