Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r573a26b2a0273a4983b1de1cbff5bed63e01dce0 -r229341f9eb23fec730cdf9b1f8f3960de2daf384
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 573a26b2a0273a4983b1de1cbff5bed63e01dce0)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
@@ -44,9 +44,6 @@
 
 #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                     0.1F                                                ///< Volume output every revolution (mL).
 #endif
@@ -61,9 +58,6 @@
 #define CONCENTRATE_PUMP_VOLUME_TO_REVOLUTION               ( ( 1.0F / CONCENTRATE_PUMP_VOLUME_PER_REV ) * \
                                                               ( 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_STEP_PERIOD_RESOLUTION             ( 0.50F / ( US_PER_SECOND * SEC_PER_MIN ) )         ///< Convert step period resolution (0.50 us) to minute.
 
 /// Volume output per pulse.
@@ -534,7 +528,6 @@
         //Update target revolution count
         if ( targetVolume_ml > 0.0 )
         {
-#ifndef __PUMPTEST__
             if ( DOSING_CONT_VOLUME == targetVolume_ml )
             {
                 pumpTargetRevCnt[ pumpId ].data = DOSING_CONT_VOLUME;
@@ -543,9 +536,7 @@
             {
                 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 ) );
@@ -859,7 +850,7 @@
     {
         setFPGAD76PumpSetStepSpeed( CONCENTRATE_PUMP_ZERO_FLOW_RATE );
     }
-#ifndef __PUMPTEST__
+
     // Park concentrate pump too if requested
     if ( TRUE == parkPump )
     {
@@ -880,7 +871,6 @@
         }
         concentratePumps[ pumpId ].isConcPumpParkInProgress = TRUE;
     }
-#endif
 }
 
 /*********************************************************************//**
@@ -1403,9 +1393,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 );