Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -r7cd1a0f1b82cde58d1d67bf722deac5c004e1b94
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b1a0571d530426aefd393d07dbaf7675cd0e4c02)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 7cd1a0f1b82cde58d1d67bf722deac5c004e1b94)
@@ -213,7 +213,6 @@
         monitorLoadCellsWeightOutOfRange( (LOAD_CELL_ID_T)ii );
 
         // Apply the tare offset. NOTE: tare must be applied after checking the weight out of range.
-        //loadcells[ ii ].weight.data = loadcells[ ii ].weight.data - loadcells[ ii ].autoCalOffset; TODO remove this
         loadcells[ ii ].smallFilteredWeight -= loadcells[ ii ].autoCalOffset;
     }
 
@@ -377,12 +376,6 @@
     if ( loadCellID < NUM_OF_LOAD_CELLS )
     {
         result = loadcells[ loadCellID ].smallFilteredWeight;
-
-        // If the load cell is in override mode, return the override weight
-        if ( OVERRIDE_KEY == loadcells[ loadCellID ].weight.override )
-        {
-            result = loadcells[ loadCellID ].weight.ovData;
-        }
     }
     else
     {
@@ -561,7 +554,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;
         }
     }