Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r50144ec3e96785cf76d5bfd22ee65029c82e732b -r5fd70f2b12c40b263b2fc58fe54c09b63d5cf0f4
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 50144ec3e96785cf76d5bfd22ee65029c82e732b)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 5fd70f2b12c40b263b2fc58fe54c09b63d5cf0f4)
@@ -597,15 +597,16 @@
         execBalancingChamberControl();
     }
 
-#ifdef __SPENT_CHAMBER_FILL__
     if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_F_FILL ) == TRUE )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -650,15 +651,16 @@
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
     }
-#ifdef __SPENT_CHAMBER_FILL__
     else if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_F_FILL ) == TRUE )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     else if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {