Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r7983907af837390c90979b1ac727f3f55f0b7ae2 -rbc7dad193df69c64cf213db463e5115b1ba8a5f0
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 7983907af837390c90979b1ac727f3f55f0b7ae2)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision bc7dad193df69c64cf213db463e5115b1ba8a5f0)
@@ -694,10 +694,6 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorConductivityReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -708,6 +704,10 @@
             result = testConductivitySensorReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
 
     return result;
 }
@@ -731,10 +731,6 @@
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorTemperatureReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -745,6 +741,10 @@
             result = testConductivitySensorTemperatureReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
 
     return result;
 }