Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0d45291a1e7fb3fbc67c9159766b99cf0ca6d57d -r89f18a07a6d5837bf9b4559a69046e2b06f32c35
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0d45291a1e7fb3fbc67c9159766b99cf0ca6d57d)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35)
@@ -122,11 +122,11 @@
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDDPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testDDPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testDDPressureSensorFilteredTemperatureReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testConductivitySensorReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testConductivitySensorReadCounterOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testConductivitySensorErrorCounterOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testDDConductivitySensorErrorCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testConcentratePumpDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                     &testConcentratePumpTargetSpeedOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST,                   &testConcentratePumpMeasuredSpeedOverride },
@@ -188,6 +188,8 @@
     { MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,               &testBloodLeakIntensityMovingAverageOverride },
     { MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST,                 &testBloodLeakZeroingIntervalInMillisecondsOverride },
     { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest },
+    { MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST,                     &testDDConductivitySensorFilteredReadingsOverride },
+    { MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                  &testDDConductivitySensorFilteredTemperatureReadingsOverride },
     { MSG_ID_FP_TESTER_LOGIN_REQUEST,                                               &handleTesterFPLogInRequest },
     { MSG_ID_FP_SET_OPERATION_MODE_REQUEST,                                         &testSetFPOperationMode },
     { MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                   &testSetFPOpModePublishIntervalOverride },
@@ -221,7 +223,14 @@
     { MSG_ID_FP_FILTERED_FLOW_RATE_OVERRIDE_REQUEST,                                &testFlowSensorFilteredReadingsOverride },
     { MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST,                                &testFlowSensorFilteredTemperatureReadingsOverride },
     { MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST,                                       &testAlarmStateOverride },
-    { MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST,                                     &testFPClearAllAlarms }
+    { MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST,                                     &testFPClearAllAlarms },
+    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testFPConductivitySensorReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
+    { MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST,                     &testFPConductivitySensorFilteredReadingsOverride },
+    { MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                  &testFPConductivitySensorFilteredTemperatureReadingsOverride },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.