Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rc4f3105da2ed8a7c40950588b54b79067185a3ad -rfe738f3cd0fb9a3ab1ea52e202543ab7bde56825
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision c4f3105da2ed8a7c40950588b54b79067185a3ad)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision fe738f3cd0fb9a3ab1ea52e202543ab7bde56825)
@@ -835,9 +835,9 @@
 {
     BOOL result = FALSE;
 
-    if ( isTestingActivated() )
+    if ( TRUE == isTestingActivated() )
     {
-        result = TRUE;
+        result                                   = TRUE;
         conductivityDataPublishInterval.ovData   = interval_ms / TASK_PRIORITY_INTERVAL;
         conductivityDataPublishInterval.override = OVERRIDE_KEY;
     }
@@ -857,14 +857,78 @@
 {
     BOOL result = FALSE;
 
-    if ( isTestingActivated() )
+    if ( TRUE == isTestingActivated() )
     {
-        result = TRUE;
+        result                                   = TRUE;
         conductivityDataPublishInterval.ovData   = conductivityDataPublishInterval.ovInitData;
         conductivityDataPublishInterval.override = OVERRIDE_RESET;
     }
 
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetConductivitySensorCalibrationTable function sets the conductivity
+ * sensor's calibration table
+ * @details Inputs: none
+ * @details Outputs: none
+ * @param data pointer to the conductivity sensor calibration table data
+ * structure
+ * @return TRUE if set was successful otherwise, FALSE
+ *************************************************************************/
+BOOL testSetConductivitySensorCalibrationTable( CONDUCTIVITY_SENSOR_CAL_TABLE_T* data )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        CAL_DATA_DG_COND_SENSORS_T calTableId = (CAL_DATA_DG_COND_SENSORS_T)data->calTableId;
+        CONDUCTIVITY_SENSORS_T sensorId       = (CONDUCTIVITY_SENSORS_T)data->sensorId;
+
+        switch( sensorId )
+        {
+            case CONDUCTIVITYSENSORS_CPI_SENSOR:
+                if ( CAL_DATA_CPI_COND_SENSOR == calTableId )
+                {
+                    setCondcutivitySensorCalTable( sensorId, calTableId );
+                    result = TRUE;
+                }
+                break;
+
+            case CONDUCTIVITYSENSORS_CPO_SENSOR:
+                if ( CAL_DATA_CPO_COND_SENSOR == calTableId )
+                {
+                    setCondcutivitySensorCalTable( sensorId, calTableId );
+                    result = TRUE;
+                }
+                break;
+
+            case CONDUCTIVITYSENSORS_CD1_SENSOR:
+                if ( CAL_DATA_CD1_COND_SENSOR == calTableId )
+                {
+                    setCondcutivitySensorCalTable( sensorId, calTableId );
+                    result = TRUE;
+                }
+                break;
+
+            case CONDUCTIVITYSENSORS_CD2_SENSOR:
+                if ( ( CAL_DATA_CD2_COND_SENSOR == calTableId ) ||
+                     ( CAL_DATA_CD2_COND_SENSOR_CHEM_DISINFECT == calTableId ) ||
+                     ( CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST == calTableId ) )
+                {
+                    setCondcutivitySensorCalTable( sensorId, calTableId );
+                    result = TRUE;
+                }
+                break;
+
+            default:
+                // Sensor ID out of range just reject with a FALSE
+                break;
+        }
+    }
+
+    return result;
+}
+
 /**@}*/