Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r60165f6d155831cfce06560fb45abaaaadea9798 -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 60165f6d155831cfce06560fb45abaaaadea9798)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec)
@@ -39,8 +39,6 @@
 
 #define BAL_CHAMBER_FILL_VOLUME_ML                  30.0F                                       ///< Balancing chamber fill/drain volume per batch operation.
 #define BAL_CHAMBER_DATA_PUBLISH_INTERVAL           ( 250 / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the balancing chamber data published.
-#define TEST_ACID_VOLUME_ML                         0.67F                                       ///< Acid concentrate volume in ml.
-#define TEST_BICARB_VOLUME_ML                       1.15F                                       ///< Bicarb concentrate volume in ml.
 
 /// Payload record structure for balancing chamber switch only request
 typedef struct
@@ -411,7 +409,8 @@
     BAL_CHAMBER_EXEC_STATE_T state;
 
     // On dosing completion, transition to next state based on the current switching state
-    if ( TRUE == IsConcentratePumpDosingCompleted() )
+    if ( ( TRUE == getConcentratePumpDosingStatus( D11_PUMP ) ) &&
+         ( TRUE == getConcentratePumpDosingStatus( D10_PUMP ) ) )
     {
         if ( BAL_CHAMBER_SW_STATE1 == balChamberSWState )
         {