Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -rf031f37d3f9985c1224472f2827cd180287c5621 -rf7f6305f054732569330f6001568777857e20442
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f031f37d3f9985c1224472f2827cd180287c5621)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f7f6305f054732569330f6001568777857e20442)
@@ -58,7 +58,7 @@
 static void publishPreGenDialysateState( void );
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenDialysateFillCompleteCheckState( void );
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenWetSelfTestState( void );
-static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartFillCheckState( void );
+static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartInitialFillState( void );
 
 //Wet Self test
 static void setModePreGenWetSelfStateTransition( DD_WET_SELF_TEST_STATE_T state );
@@ -146,8 +146,8 @@
                 preGenDialysateState = handlePreGenWetSelfTestState();
                 break;
 
-            case DD_PRE_GEN_DRY_BICART_FILL_CHECK:
-                preGenDialysateState = handleDryBicartFillCheckState();
+            case DD_PRE_GEN_DRY_BICART_INITIAL_FILL:
+                preGenDialysateState = handleDryBicartInitialFillState();
                 break;
 
             case DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND:
@@ -247,34 +247,34 @@
 static DD_PRE_GEN_DIALYSATE_STATE_T handlePreGenWetSelfTestState( void )
 {
     //TODO: Change to wet self test state later
-    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
+    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
+    setBicartFillRequested();
     //execWetSelfTest();
 
     return state;
 }
 
 /*********************************************************************//**
  * @brief
- * The handleDryBicartFillCheckState function executes intial dry bicart fill request
+ * The handleDryBicartInitialFillState function executes intial dry bicart fill request
  * @details \b Inputs: none
  * @details \b Outputs: none
  * @return current state of PreGenDialysate mode
  *************************************************************************/
-static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartFillCheckState( void )
+static DD_PRE_GEN_DIALYSATE_STATE_T handleDryBicartInitialFillState( void )
 {
     //TODO: Change to wet self test state later
-    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
+    DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
     {
-        setBicartFillRequested();
-
         // stay in this state till bicart fill complete.
         if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
         {
              state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
         }
+        // alarm if not completed within 1 minutes
     }
     else
     {