Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -rda0deea71ed5770d98a00943369b9c17321e139f -ra888f0f268896151a649da228f5a5119bbe2aa33
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision da0deea71ed5770d98a00943369b9c17321e139f)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision a888f0f268896151a649da228f5a5119bbe2aa33)
@@ -46,8 +46,6 @@
     F32 averageAcidConductivity;                ///< The average acid conductivity calculated in one fill.
     U32 isThisTheFirstFill;                     ///< Indicate if this is the first fill.
     F32 pctDiffInConductivity;                  ///< The percent difference between CD1 and CD2.
-    F32 usedAcidVolumeML;                       ///< The used acid volume in ML.
-    F32 usedBicarbVolumeML;                     ///< The used bicarb volume in ML.
     F32 integratedVolumeML;                     ///< Integrated volume in milliliters.
     U32 roOnlyModeStatus;                       ///< RO only mode status.
     U32 badFillSignal;                          ///< bad fill signal.
@@ -71,26 +69,21 @@
 
 BOOL isThisTheFirstFill( void );
 
-F32  getChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle );
-void resetChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle );
-
 void setROMode( BOOL enableROOnlyMode );
 BOOL isROOnlyModeEnabled( void );
 
 void setAcidAndBicarbType( U32 acid, U32 bicarb );
 
-BOOL testSetUsedAcidVolumeMLOverride( F32 value );
-BOOL testResetUsedAcidVolumeMLOverride( void );
+void setMinRORejectionRatioPCT( U32 roRejectionRatio );
 
-BOOL testSetUsedBicarbVolumeMLOverride( F32 value );
-BOOL testResetUsedBicarbVolumeMLOverride( void );
-
 BOOL testSetFillModeDataPublishIntervalOverride( U32 value );
 BOOL testResetFillModeDataPublishIntervalOverride( void );
 
 BOOL testSetIntegratedVolumeOverride( F32 value );
 BOOL testResetIntegratedVolumeOverride( void );
 
+BOOL testSetEnableTestChemsCondValuesStatus( void );
+
 BOOL testSetModeFillForCal( U32 calForCheck );
 
 /**@}*/