Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r512065f0a0c9ba2c335e8856b790e8448852fc52 -r0c8ae7b952186d912c77d8c2cfb7dad809fa5225
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 512065f0a0c9ba2c335e8856b790e8448852fc52)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0c8ae7b952186d912c77d8c2cfb7dad809fa5225)
@@ -17,13 +17,15 @@
 
 #include <string.h>        // For memcpy()
 
-#include "BubbleDetector.h"
+#include "Bubbles.h"
 #include "Compatible.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
+#include "PressureSensor.h"
 #include "SystemCommTD.h"
 #include "Utilities.h"
+#include "Voltages.h"
 
 /**
  *  @addtogroup Messaging
@@ -70,14 +72,22 @@
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
     MSG_ID_TESTER_LOGIN_REQUEST,
     MSG_ID_TD_SOFTWARE_RESET_REQUEST,
-    MSG_ID_TD_VENOUS_BUBBLE_OVERRIDE_REQUEST
+    MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
+    MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST,
+    MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
+    MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
     &handleTesterLogInRequest,
     &handleTDSoftwareResetRequest,
-    &testBubbleDetectOverride
+    &testBubbleDetectOverride,
+    &testVoltageDataPublishIntervalOverride,
+    &testVoltageOverride,
+    &testBubblesDataPublishIntervalOverride,
+    &testPressureSensorOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -289,6 +299,7 @@
             break;
         }
     }
+
     return func;
 }
 
@@ -335,13 +346,8 @@
 }
 
 
-// ***********************************************************************
-// ***************** Message Handling Helper Functions ********************
-// ***********************************************************************
 
 
-
-
 // ***********************************************************************
 // ***************** Message Sending Helper Functions ********************
 // ***********************************************************************