Index: firmware/App/DDCommon.h
===================================================================
diff -u -re9e04e3ec946b2f688b5706c900640c1684b8747 -ra9432a08fba2911e7cf8bc62b0238aa0fd261445
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision e9e04e3ec946b2f688b5706c900640c1684b8747)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision a9432a08fba2911e7cf8bc62b0238aa0fd261445)
@@ -27,7 +27,6 @@
 #define DD_VERSION_MICRO    0
 #define DD_VERSION_BUILD    27
 
-
 // ********** development build switches **********
 
 #ifndef _RELEASE_
@@ -45,6 +44,7 @@
 
 //Uncomment below once characterization/study completed
 //#define ENABLE_ALARM_2
+
 //Uncomment below to disable heaters debug message
 #define __HEATERS_DEBUG__         1
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r5b7121b237be1970c0a040809503ff5786e6da0d -ra9432a08fba2911e7cf8bc62b0238aa0fd261445
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5b7121b237be1970c0a040809503ff5786e6da0d)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision a9432a08fba2911e7cf8bc62b0238aa0fd261445)
@@ -171,15 +171,10 @@
     { MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST,                     &testBloodLeakEmbeddedModeInfoOverride },
     { 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 },
-#ifdef __PUMPTEST__
-    { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
-    { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },
-    { MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST,                   &testDDPistonPumpFillAfterDispenseOverride },
-#endif
     { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
     { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
     { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
+    { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest }
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))