Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r145fd716a856f864f39fb0f9884865f6e45b9256 -r8be347eb6f2bf0bc7ce8be64dd72fe0ce35e9eff
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 145fd716a856f864f39fb0f9884865f6e45b9256)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8be347eb6f2bf0bc7ce8be64dd72fe0ce35e9eff)
@@ -252,13 +252,10 @@
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
-    // TODO: testing drybicart fill in pre-gen
-#if 0
-    if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
+    if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) )
     {
         setBicartFillRequested();
     }
-#endif
     //execWetSelfTest();
 
     return state;
@@ -275,9 +272,8 @@
 {
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
-#if 0
-    // TODO: testing drybicart fill in pre-gen
-    if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
+
+    if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) )
     {
         // stay in this state till bicart fill complete.
         if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
@@ -287,7 +283,6 @@
         // TODO: Alarm if it is not completed within 1.5 minutes
     }
     else
-#endif
     {
         // not bicart fill, move to next state
         state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;