Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b -rfc3ad8a7cdeed09ed70feaeb3517c885e313dfcc
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision fc3ad8a7cdeed09ed70feaeb3517c885e313dfcc)
@@ -107,7 +107,7 @@
 static U32 bcSwitchingBasedOnClosedPeriodCounter;                                               ///< Valve-close segments remaining before first-cycle relaxations clear after Qd timing apply.
 
 //TODO: remove later once level sensor working
-static U32 bicarbChamberPeriodicFillCounter;  
+static U32 bicarbChamberPeriodicFillCounter;
 
 // ********** private function prototypes **********
 
@@ -631,7 +631,7 @@
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
@@ -954,10 +954,11 @@
         acidVolume        = getF32OverrideValue( &acidDoseVolume );
         bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
     }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
@@ -1236,7 +1237,7 @@
     // Check if a request made was to activate the balancing chamber switching.
     if ( TRUE == isBalChamberSwitchingOnRequested )
     {
-        //Clear the request flag to indicate that the request was processed.
+        //Clear request was processed.
         isBalChamberSwitchingOnRequested = FALSE;
 
         // Set flag to indicate that balancing chamber switching is active
Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -r0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b -rfc3ad8a7cdeed09ed70feaeb3517c885e313dfcc
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 0e2bb0e29903be865ff96ba88b5f165bf0e2ff3b)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision fc3ad8a7cdeed09ed70feaeb3517c885e313dfcc)
@@ -113,7 +113,13 @@
 BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message );
 BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message );
 
-BOOL testDryBiCartMixControlIntervalOverride( MESSAGE_T *message );
+BOOL testDryBiCartBicarbMixControlIntervalOverride( MESSAGE_T *message );
+BOOL testDryBiCartAcidMixControlIntervalOverride( MESSAGE_T *message );
+
+BOOL testDryBiCartStdMixingBCVolumeOverride( MESSAGE_T *message );
+BOOL testDryBiCartTargetAdjNASettingOverride( MESSAGE_T *message );
+BOOL testDryBiCartTargetAdjBicarbSettingOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r20aba5b5bb7c758e8f565458e7a74faa8ba12ddd -rfc3ad8a7cdeed09ed70feaeb3517c885e313dfcc
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 20aba5b5bb7c758e8f565458e7a74faa8ba12ddd)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision fc3ad8a7cdeed09ed70feaeb3517c885e313dfcc)
@@ -134,35 +134,35 @@
                 break;
 
             case D63_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D98_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D46_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
                 }
                 break;
 
@@ -446,44 +446,42 @@
     {
        levelStatus = getFPGAD6LevelStatus();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
-           // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
+           // Beta 1.0 behavior
+           currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
        else
        {
-           // Beta 1.0 behavior
-           currentLevelStatus = getLevelStateBeta10( levelStatus );
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
        }
     }
 
     else if ( P25_LEVL == levelId )
     {
        levelStatus = getFPGAP25FloaterState();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
-      {
-          // Beta 2.0 behavior
-          currentLevelStatus = getLevelState( levelStatus );
-      }
-       else
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
            // Beta 1.0 behavior
            currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
+       else
+       {
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
+       }
     }
 
     else
@@ -526,6 +524,7 @@
         // upperlevel == TRUE while lowerlevel == FALSE - illegal
         status = LVL_STATE_ILLEGAL;
     }
+
     return status;
 }