Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17 -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 8348015aa77e1ee2c4c20e9f8e2c45b59bcf3f17)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
@@ -275,15 +275,15 @@
 
     rinsePumpTargetSpeedRPM = 0;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
-        // Set PWM count zero to stop the logical rinse pump
-        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+        // Current Beta 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
     }
     else
     {
-        // Current Beta 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
+        // Set PWM count zero to stop the logical rinse pump
+        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
     }
 
     return state;
@@ -300,8 +300,13 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
+        // Current Beat 1.9 system uses on/off bit
+        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
+    }
+    else
+    {
         F32 pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );     // TODO should this conversion happen in setPWMCount function?
         U32 pwmInCount   = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
 
@@ -310,11 +315,6 @@
         // Turn on logical rinse pump with given PWM value
         setRinsePumpPwmCount( D79_RINSE_PUMP, (U32)pwmInCount );
     }
-    else
-    {
-        // Current Beat 1.9 system uses on/off bit
-        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
-    }
 
     return state;
 }