Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -rf47296145b6a0adb78df0e325587629171909fd6
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f47296145b6a0adb78df0e325587629171909fd6)
@@ -3,12 +3,13 @@
 
 #include "BoostPump.h"
 #include "Compatible.h"
+#include "Conductivity.h"
+#include "Flow.h"
 #include "Level.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressure.h"
-//#include "PressureSensor.h"
 #include "ROPump.h"
 #include "SystemCommRO.h"
 #include "Utilities.h"
@@ -71,7 +72,15 @@
     MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     MSG_ID_RO_DEBUG_EVENT,
     MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-    MSG_ID_RO_LEVEL_OVERRIDE_REQUEST
+    MSG_ID_RO_LEVEL_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST,
+    MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,
+    MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
@@ -93,7 +102,15 @@
     &testPressureSensorDataPublishIntervalOverride,
     &handleUnhandledMsg,
     &testLevelsDataPublishIntervalOverride,
-    &testLevelStateOverride
+    &testLevelStateOverride,
+    &testFlowSensorDataPublishIntervalOverride,
+    &testFlowSensorReadingsOverride,
+    &testFlowSensorTemperatureReadingsOverride,
+    &testConductivitySensorDataPublishIntervalOverride,
+    &testConductivitySensorReadingsOverride,
+    &testConductivitySensorTemperatureReadingsOverride,
+    &testConductivitySensorReadCounterOverride,
+    &testConductivitySensorErrorCounterOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -293,7 +310,8 @@
     COMM_BUFFER_T respBuffer = tdResponseBuffers[ message->in_buffer ];
 
     // if Dialin message, ensure Dialin is logged in before processing it
-    if ( ( message->hdr.msgID <= MSG_ID_FIRST_DD_TESTER_MESSAGE ) ||
+    if ( ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE ) ||
+         ( MSG_ID_RO_TESTER_LOGIN_REQUEST == message->hdr.msgID ) ||
          ( TRUE == isTestingActivated() ) )
     {
         MsgFuncPtr msgFuncPtr;