Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r9e14f8c931ea3f2afdedc92de71bd497868a4176 -rbbc62d810da9b094ea4f0fc765e1586ed37f0b34
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9e14f8c931ea3f2afdedc92de71bd497868a4176)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bbc62d810da9b094ea4f0fc765e1586ed37f0b34)
@@ -184,9 +184,7 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
-    { MSG_ID_TD_BATTERY_REMAINING_CAPACITY_OVERRIDE_REQUEST,            &testBatteryRemainingCapacityOverride },
-    { MSG_ID_TD_BATTERY_STATUS_OVERRIDE_REQUEST,                        &testBatteryStatusOverride },
-    { MSG_ID_TD_BATTERY_CHARGER_STATUS_OVERRIDE_REQUEST,                &testBatteryChargerStatusOverride },
+    { MSG_ID_TD_BATTERY_REGISTERS_OVERRIDE_REQUEST,                     &testBatteryRegisterOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))