Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -rf7f6305f054732569330f6001568777857e20442 -r1da16242c18221f8d368b9b024bf3628a3ed782c
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f7f6305f054732569330f6001568777857e20442)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 1da16242c18221f8d368b9b024bf3628a3ed782c)
@@ -249,7 +249,12 @@
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_INITIAL_FILL;
 
-    setBicartFillRequested();
+    // TODO: testing drybicart fill in pre-gen
+    if ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
+    {
+        setBicartFillRequested();
+    }
+
     //execWetSelfTest();
 
     return state;
@@ -267,6 +272,7 @@
     //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 ( getTestConfigStatus( TEST_CONFIG_DD_DRY_BICART_TEST ) == TRUE )
     {
         // stay in this state till bicart fill complete.