Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -r65824878503f019bf9db443c867e27df8de27c51
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 65824878503f019bf9db443c867e27df8de27c51)
@@ -115,10 +115,8 @@
     { MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testValvesStatesPublishIntervalOverride },
     { MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,                                       &testValveStateOverride },
     { MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testValveSensedStateOverride },
-    { MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST,                          &testPressureSensorReadingsOverride },
-    { MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                       &testPressureSensorTemperatureReadingsOverride },
-    { MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                      &testPressureSensorReadCounterOverride },
-    { MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                     &testPressureSensorErrorCounterOverride },
+    { MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST,                          &testDDPressureSensorReadingsOverride },
+    { MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                       &testDDPressureSensorTemperatureReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testPressureSensorFilteredTemperatureReadingsOverride },
@@ -206,6 +204,8 @@
     {  MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST,                          &testROPumpTargetPressureOverride },
     {  MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,                              &testROPumpTargetFlowOverride },
     {  MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST,                               &testROPumpTargetDutyCycleOverride },
+    {  MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST,                                         &testFPPressureSensorReadingsOverride },
+    {  MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST,                                    &testFPPressureSensorTemperatureReadingsOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))