Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r27e8758fa6199e72b914e1199786a4396ce74d06 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
@@ -7,7 +7,7 @@
 *
 * @file    BalancingChamber.c
 *
-* @author  (last)      Shyam Kumar Mathamala
+* @author  (last)      Vinayakam Mani
 * @date    (last)      03-Sep-2025
 *
 * @author  (original)  Vinayakam Mani
Index: firmware/App/Controllers/DialysatePumps.h
===================================================================
diff -u -r27e8758fa6199e72b914e1199786a4396ce74d06 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3
--- firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
+++ firmware/App/Controllers/DialysatePumps.h	(.../DialysatePumps.h)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
@@ -8,7 +8,7 @@
 * @file    DialysatePumps.h
 *
 * @author  (last)      Vinayakam Mani
-* @date    (last)      13-Nov-2025
+* @date    (last)      13-May-2025
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Oct-2024
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r27e8758fa6199e72b914e1199786a4396ce74d06 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
@@ -25,7 +25,7 @@
 #define DD_VERSION_MAJOR        0
 #define DD_VERSION_MINOR        0
 #define DD_VERSION_MICRO        0
-#define DD_VERSION_BUILD  24
+#define DD_VERSION_BUILD  36
 
 // ********** development build switches **********
 
@@ -60,7 +60,6 @@
 //Uncomment below to disable heaters debug message
 #define __HEATERS_DEBUG__         1
 
-
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r27e8758fa6199e72b914e1199786a4396ce74d06 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
@@ -176,6 +176,11 @@
     {
         execBalancingChamberControl();
     }
+    //Test request to handle only balancing chamber switching
+    else if ( TRUE == pendingBalanceChamberSwOnlyRequest )
+    {
+        execBalancingChamberControl();
+    }
 //    else if ( TRUE == pendingStartDDFlushRequest )
 //    {
 //        pendingStartDDFlushRequest = FALSE;
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r27e8758fa6199e72b914e1199786a4396ce74d06 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 27e8758fa6199e72b914e1199786a4396ce74d06)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
@@ -177,9 +177,6 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
-    { 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_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST,                     &testDDSpentChamberFillDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testBloodLeakDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST,                                 &testBloodLeakStatusOverride },