Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r4fb1e15d35f6b968bab5620909c30baec98bfd4e -re2e51b0219db0132cebb6f65f3dbd803e1f01e30
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4fb1e15d35f6b968bab5620909c30baec98bfd4e)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
@@ -18,13 +18,18 @@
 #include <string.h>        // for memcpy()
 
 #include "reg_system.h"
+
+#include "Conductivity.h"
 #include "Compatible.h"
 #include "Messaging.h"
 #include "OperationModes.h"
-#include "Utilities.h"
-#include "SystemCommDD.h"
 #include "PAL.h"
+#include "Pressure.h"
+#include "SystemCommDD.h"
+#include "Utilities.h"
+#include "Valves.h"
 
+
 /**
  *  @addtogroup Messaging
  *  @{
@@ -70,14 +75,44 @@
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
     MSG_ID_TESTER_LOGIN_REQUEST,
     MSG_ID_DD_SOFTWARE_RESET_REQUEST,
-    MSG_ID_TD_OP_MODE_DATA
+    MSG_ID_TD_OP_MODE_DATA,
+    MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,
+    MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,
+    MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
     &handleTesterLogInRequest,
     &handleDDSoftwareResetRequest,
-    &handleSetTDOperationMode
+    &handleSetTDOperationMode,
+    &testValvesStatesPublishIntervalOverride,
+    &testValveStateOverride,
+    &testValveSensedStateOverride,
+    &testPressureSensorReadingsOverride,
+    &testPressureSensorTemperatureReadingsOverride,
+    &testPressureSensorReadCounterOverride,
+    &testPressureSensorErrorCounterOverride,
+    &testPressureSensorDataPublishIntervalOverride,
+    &testPressureSensorFilteredReadingsOverride,
+    &testPressureSensorFilteredTemperatureReadingsOverride,
+    &testConductivitySensorReadingsOverride,
+    &testConductivitySensorTemperatureReadingsOverride,
+    &testConductivitySensorReadCounterOverride,
+    &testConductivitySensorErrorCounterOverride,
+    &testConductivitySensorDataPublishIntervalOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))