Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9826fc85bd1497ec617ae0e825f78b91972de2b3 -r8fc97ad09c8cbdf76dc19929c4751df3feacb40d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9826fc85bd1497ec617ae0e825f78b91972de2b3)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8fc97ad09c8cbdf76dc19929c4751df3feacb40d)
@@ -579,7 +579,7 @@
         }
 
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST ) == SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST ) )
         {
             isConductivityInRange = TRUE;
         }
@@ -650,7 +650,7 @@
         }
 
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST ) == SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST ) )
         {
             haveTestsPassed = TRUE;
         }