Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -r2ef70ec14fb47bee35cb241a927582f7ccd1bb22
--- firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
+++ firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 2ef70ec14fb47bee35cb241a927582f7ccd1bb22)
@@ -82,13 +82,13 @@
 
 /*********************************************************************//**
  * @brief
- * The initPistonPumpControl function initializes the piston pump control
+ * The initPistonPump function initializes the piston pump control
  * ( Dosing and ultrafilteraion control) unit.
  * @details \b Inputs: none
  * @details \b Outputs: unit variables initialized.
  * @return none
  *************************************************************************/
-void initPistonPumpControl( void )
+void initPistonPump( void )
 {
     pistonPumpExecState[ PISTONPUMPS_ACID ]                 = PISTON_PUMP_OFF_STATE;
     pistonPumpExecState[ PISTONPUMPS_BICARB ]               = PISTON_PUMP_OFF_STATE;
@@ -116,13 +116,13 @@
 
 /*********************************************************************//**
  * @brief
- * The execPistonPumpControl function executes the piston pump control state machine.
+ * The execPistonPumpController function executes the piston pump control state machine.
  * @details \b Inputs: pistonPumpExecState
  * @details \b Outputs: pistonPumpExecState
  * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT when wrong piston pump control state invoked.
  * @return current state.
  *************************************************************************/
-void execPistonPumpControl( void )
+void execPistonPumpController( void )
 {
     PISTON_PUMPS_T pumpId;
 
Index: firmware/App/Controllers/PistonPumpControl.h
===================================================================
diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -r2ef70ec14fb47bee35cb241a927582f7ccd1bb22
--- firmware/App/Controllers/PistonPumpControl.h	(.../PistonPumpControl.h)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
+++ firmware/App/Controllers/PistonPumpControl.h	(.../PistonPumpControl.h)	(revision 2ef70ec14fb47bee35cb241a927582f7ccd1bb22)
@@ -59,8 +59,8 @@
 
 // ********** public function prototypes **********
 
-void initPistonPumpControl( void );                                     // Initialize piston pump control unit
-void execPistonPumpControl( void );                                      // Execute the piston pump control state machine
+void initPistonPump( void );                                                // Initialize piston pump control unit
+void execPistonPumpController( void );                                      // Execute the piston pump control state machine
 void startPistonPumpCycle( PISTON_PUMPS_T pumpId, U32 cycleCount, F32 targetVolume_ml, F32 speed ); // Set the piston pump parameters
 void stopPistonPumpCycle( PISTON_PUMPS_T pumpId );                      // Stop the piston pump
 
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rd5b87d7dab8613f3963fb66f8833d210f127fa1f -r2ef70ec14fb47bee35cb241a927582f7ccd1bb22
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 2ef70ec14fb47bee35cb241a927582f7ccd1bb22)
@@ -22,7 +22,10 @@
 #include "DialysatePumps.h"
 #include "Heaters.h"
 #include "Messaging.h"
-#include "OperationModes.h"
+#include "OperationModes.h"
+#ifdef __PUMPTEST__
+#include "PistonPumpControl.h"
+#endif
 #include "SystemCommDD.h"
 #include "TaskGeneral.h"
 #include "WatchdogMgmt.h"
@@ -85,6 +88,11 @@
     // manage concentrate pumps
     execConcentratePumpController();
 
+#ifdef __PUMPTEST__
+    // manage piston pumps
+    execPistonPumpController();
+#endif
+
     // Manage switches monitor
     //execSwitches();
 
Index: firmware/source/sys_main.c
===================================================================
diff -u -rd84f4cef21ceb1b61984e13ee5e6f51d5b69c162 -r2ef70ec14fb47bee35cb241a927582f7ccd1bb22
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision d84f4cef21ceb1b61984e13ee5e6f51d5b69c162)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 2ef70ec14fb47bee35cb241a927582f7ccd1bb22)
@@ -180,6 +180,9 @@
     initTestConfigs();
     initTDInterface();
     initROInterface();
+#ifdef __PUMPTEST__
+    initPistonPump();
+#endif
 }
 
 /*************************************************************************