Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -re3ea1f5251b7a7af6e47b9e013c3cfc11466e255 -r7d24ef2e6a4130b3a049e6106a0371fc6503271f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision e3ea1f5251b7a7af6e47b9e013c3cfc11466e255)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
@@ -43,14 +43,8 @@
 #define CONCENTRATE_PUMP_LOW_SPEED_THRESHOLD_MLPM           10.0F                                               ///< Concentrate pump low speed threshold in mL/min.
 #define CONCENTRATE_PUMP_ZERO_FLOW_RATE                     0xFFFF                                              ///< Pulse width value when zero flow rate or pump is off.
 
-#ifdef __DIENER_CONC_PUMP__
-#define CONCENTRATE_PUMP_VOLUME_PER_REV                     0.4F                                                ///< Volume output every revolution (mL).
-#elif  __PUMPTEST__
-#define PISTON_PUMP_STEPS_PER_ML                            342.0F                                              ///< Revolution count for 1ml volume delivery.
-#define CONCENTRATE_PUMP_VOLUME_PER_REV                     ( CONCENTRATE_PUMP_STEP_PER_REV / PISTON_PUMP_STEPS_PER_ML )  ///< Volume output every revolution (mL).
-#else
+#define CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER              0.4F                                                ///< Volume output every revolution (mL).
 #define CONCENTRATE_PUMP_VOLUME_PER_REV                     0.1F                                                ///< Volume output every revolution (mL).
-#endif
 
 #define CONCENTRATE_PUMP_PULSE_PER_REV                      2.0F                                                ///< Number of pulses generate for every revolution.
 #define CONCENTRATE_PUMP_STEP_PER_REV                       200.0F                                              ///< Number of steps for every revolution.
@@ -59,16 +53,17 @@
 #define CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS  ( 5 * MS_PER_SECOND )                               ///< Hall sensors out of range time in milliseconds.
 
 #define CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP               8.0F                                                ///< Number of micro-steps ( fractions of step) per step.
-#define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION               ( ( 1.0F / CONCENTRATE_PUMP_VOLUME_PER_REV ) * \
+#define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION_DIENER        ( ( 1.0F / CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER ) * \
                                                               ( CONCENTRATE_PUMP_STEP_PER_REV * \
                                                                 CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP ) )       ///< Convert volume in to number of revolutions needed.
-#ifdef __PUMPTEST__
-#define PISTON_PUMP_VOLUME_TO_REVOLUTION                    ( PISTON_PUMP_STEPS_PER_ML * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP )  ///< Convert volume in to number of revolutions needed.
-#endif
+#define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION               ( ( 1.0F / CONCENTRATE_PUMP_VOLUME_PER_REV ) * \
+                                                              ( CONCENTRATE_PUMP_VOLUME_PER_REV * \
+                                                                CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP ) )       ///< Convert volume in to number of revolutions needed.
 #define CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION             ( 0.50F / ( US_PER_SECOND * SEC_PER_MIN ) )         ///< Convert step period resolution (0.50 us) to minute.
 
 /// Volume output per pulse.
-#define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
+#define CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER            ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER )
+#define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_VOLUME_PER_REV )
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 1000 / TASK_GENERAL_INTERVAL )                    ///< Interval (ms/task time) at which the concentrate pump is monitored.
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 100 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is controlled.
@@ -560,18 +555,22 @@
         //Update target revolution count
         if ( targetVolume_ml > 0.0 )
         {
-#ifndef __PUMPTEST__
             if ( DOSING_CONT_VOLUME == targetVolume_ml )
             {
                 pumpTargetRevCnt[ pumpId ].data = DOSING_CONT_VOLUME;
             }
             else
             {
-                pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION );
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DIENER_CONC_PUMP ) )
+                {
+                    pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION_DIENER );
+                }
+                else
+                {
+                    pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION );
+                }
             }
-#else
-            pumpTargetRevCnt[ pumpId ].data = (U32)( targetVolume_ml * PISTON_PUMP_VOLUME_TO_REVOLUTION );
-#endif
+
             if ( D11_PUMP == pumpId )
             {
                 setFPGAD11PumpRevolutionCount( getConcPumpTargetRevolutionCount( pumpId ) );
@@ -885,7 +884,7 @@
     {
         setFPGAD76PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE );
     }
-#ifndef __PUMPTEST__
+
     // Park concentrate pump too if requested
     if ( TRUE == parkPump )
     {
@@ -906,7 +905,6 @@
         }
         concentratePumps[ pumpId ].isConcPumpParkInProgress = TRUE;
     }
-#endif
 }
 
 /*********************************************************************//**
@@ -1066,9 +1064,18 @@
 
     if ( concentratePumps[ pumpId ].currentPumpSpeed > NEARLY_ZERO )
     {
-        F32 timePerStep      = CONCENTRATE_PUMP_VOLUME_PER_REV / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
-        F32 stepPeriodCounts = timePerStep / ( CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP );
+        F32 timePerStep;
+        F32 stepPeriodCounts;
 
+        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DIENER_CONC_PUMP ) )
+        {
+            timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV_DIENER / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
+        }
+        else
+        {
+            timePerStep = CONCENTRATE_PUMP_VOLUME_PER_REV / ( concentratePumps[ pumpId ].currentPumpSpeed * CONCENTRATE_PUMP_STEP_PER_REV );
+        }
+        stepPeriodCounts = timePerStep / ( CONCENTRATE_PUMP_STEP_PERIOD_RESOLUTION * CONCENTRATE_PUMP_MICRO_STEPS_PER_STEP );
         concentratePumps[ pumpId ].togglePeriodCount = (U16)( stepPeriodCounts + FLOAT_TO_INT_ROUNDUP_OFFSET );
     }
     else
@@ -1142,7 +1149,14 @@
         }
         else if ( FALSE == isPumpPulseWidthOut )
         {
-            measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DIENER_CONC_PUMP ) )
+            {
+                measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER * SEC_PER_MIN;
+            }
+            else
+            {
+                measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
+            }
         }
 
         // If pulse width is out of range capture pump out of range, pumpId and pulse width
@@ -1439,9 +1453,7 @@
             {
                 // Handle start command
                 if ( ( TRUE == payload.startStop ) &&
-#ifndef __PUMPTEST__
                       ( ( payload.speed >= CONCENTRATE_PUMP_MIN_SPEED ) && ( payload.speed <= CONCENTRATE_PUMP_MAX_SPEED ) ) &&
-#endif
                       ( payload.volume > 0.0 ) )
                 {
                     setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)payload.pumpID, payload.speed, payload.volume );