Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8afac005a36a62d8d36e58a4c46d0225b3367204 -rda1cfaa4f4b3ecedf2d1c70acfb48c1669275e9d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8afac005a36a62d8d36e58a4c46d0225b3367204)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision da1cfaa4f4b3ecedf2d1c70acfb48c1669275e9d)
@@ -5272,11 +5272,11 @@
 
         if ( FALSE == payload.reset )
         {
-            result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
+            result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
         }
         else
         {
-            result = testResetSetBatteryRemainingPercentOverride();
+            result = testResetBatteryRemainingCapacityOverride();
         }
     }
 
@@ -7844,4 +7844,100 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryStatusOverrideRequest function handles a
+ * request to override battery status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryChargerStatusOverrideRequest function handles a
+ * request to override battery charger status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryChargerStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryChargerStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryChargerStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBatteryStatusOverrideRequest function handles a
+ * request to override battery status.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBatteryI2CStatusOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBatteryI2CStatusOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetBatteryI2CStatusOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/