Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r05e516dc17597cee29c89e5eee25caed055f1151 -r7965487decd9984a22f4d9ec56d1fb2590d1583b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 05e516dc17597cee29c89e5eee25caed055f1151)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7965487decd9984a22f4d9ec56d1fb2590d1583b)
@@ -16,7 +16,8 @@
 ***************************************************************************/
 
 #include <string.h>     // for memcpy()
-
+
+#include "ConductivitySensors.h"
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "LoadCell.h"
@@ -1315,6 +1316,31 @@
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDGSafetyShutdownOverrideRequest, testSetSafetyShutdownOverride, testResetSafetyShutdownOverride )
+
+/*************************************************************************
+ * @brief
+ * The handleTestSetConductivityOverrideRequest function handles a
+ * request to override a conductivity sensor's value
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestSetConductivityOverrideRequest, testSetConductivityOverride, testResetConductivityOverride )
+
+/*************************************************************************
+* @brief
+* The handleTestSetConductivityDataPublishIntervalOverride function handles \n
+* a request to override the publish interval of conductivity sensors data
+* @details
+* Inputs : none
+* Outputs : message handled
+* @param message : a pointer to the message to handle
+* @return none
+*************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestSetConductivityDataPublishIntervalOverrideRequest, \
+                                testSetConductivityDataPublishIntervalOverride, testResetConductivityDataPublishIntervalOverride )
 
 #ifdef CAN_TEST
 void broadcastCANTest1LargeFrequentMessage()