Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r3997f314c77abe15abe58a8116f64dc593a9d6f2
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3997f314c77abe15abe58a8116f64dc593a9d6f2)
@@ -419,7 +419,7 @@
     // Check fresh and spent dialysate pressure in range or BC switch only flag set
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         //Valve control for state 1 fill
         valveControlForBCState1FillStart();
@@ -441,7 +441,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -517,7 +517,7 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
              ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
@@ -573,7 +573,7 @@
 
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {
@@ -633,7 +633,7 @@
     // Check fresh and spent dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         // Valve control for state 2 fill
         valveControlForBCState2FillStart();
@@ -655,7 +655,7 @@
     }
     else
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
         {
             //Alarm when pressure is not in range
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -680,7 +680,7 @@
     spentDialPressure = getFilteredPressure( D51_PRES );
 
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
-    if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
     {
         if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
              ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) )
@@ -737,7 +737,7 @@
         // Pressure alarm check
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
-            if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
+            if ( getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
             {
                 if ( ( TRUE != isPressureDroppedDuringFill ) && ( TRUE == isFirstCycleBCSwitchingCompleted ) )
                 {
Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r3997f314c77abe15abe58a8116f64dc593a9d6f2
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 3997f314c77abe15abe58a8116f64dc593a9d6f2)
@@ -189,7 +189,7 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_OFF;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_4WIRE_RINSE_PUMP ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_4WIRE_RINSE_PUMP ) )
     {
         // Set PWM count zero to stop the pump
         setFPGAD79RinsePumpPWMControl( RINSE_PUMP_OFF_COUNT );
@@ -214,7 +214,7 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_4WIRE_RINSE_PUMP ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_4WIRE_RINSE_PUMP ) )
     {
         F32 pwmPercent  = getF32OverrideValue( &rinsePumpPwmPercentage );
         U32 pwmInCount  = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r4348899913077883fdcc00cc2b55e3e1fa9299fd -r3997f314c77abe15abe58a8116f64dc593a9d6f2
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 4348899913077883fdcc00cc2b55e3e1fa9299fd)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 3997f314c77abe15abe58a8116f64dc593a9d6f2)
@@ -270,7 +270,7 @@
     if ( D6_LEVL == levelId )
     {
        levelStatus = getFPGAD6LevelStatus();
-       if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_0_HW ) != TRUE )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE )
        {
            // Beta 1.9 behavior
            if ( FPGA_LEVEL_EMPTY == levelStatus )
@@ -322,7 +322,7 @@
     {
        levelStatus = getFPGAP25FloaterState();
 
-       if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_0_HW ) != TRUE )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE )
        {
            // Beta 1.9 behavior
            if ( FPGA_LEVEL_EMPTY == levelStatus )