Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbc1ec8e71e5e5e7aef6d84775e07f5935653593f -r5aa0b08cb09b06af807687fe03db5137e388da82
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bc1ec8e71e5e5e7aef6d84775e07f5935653593f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
@@ -31,6 +31,9 @@
 #include "ModeGenDialysate.h"
 #include "OperationModes.h"
 #include "PAL.h"
+#ifdef __PUMPTEST__
+#include "PistonPumpControl.h"
+#endif
 #include "Pressure.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
@@ -137,7 +140,11 @@
     MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST,
     MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST,
     MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST,                            //55
-    MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST
+    MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST,
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST
+#endif
 };
 
 /// Message handling function table
@@ -197,7 +204,11 @@
     &testDialDeliveryInProgressOverride,
     &testDialGoodToDeliverStatusOverride,
     &testHeaterTargetTemperatureOverride,                                              //55
-    &testBCValveStatesOverride
+    &testBCValveStatesOverride,
+#ifdef __PUMPTEST__
+    &testDDPistonPumpControlDataPublishIntervalOverride,
+    &testDDPistonPumpStartStopOverride,
+#endif
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))