Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rd2fb916f924e8d988cb62b1e3a16aad2d923f7e7 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d2fb916f924e8d988cb62b1e3a16aad2d923f7e7)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -896,6 +896,7 @@
 static CONCENTRATE_PUMP_STATE_T handleConcentratePumpRampToTargetSpeedState( CONCENTRATE_PUMPS_T pumpId )
 {
     CONCENTRATE_PUMP_STATE_T state = CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE;
+    //U16 currentMeasuredRev         = getConcPumpCurrentMeasuredRevolutionCount( pumpId );
 
     if ( TRUE == stepConcentratePumpToTargetSpeed( pumpId ) )
     {
@@ -926,6 +927,7 @@
 static CONCENTRATE_PUMP_STATE_T handleConcentratePumpControlTargetSpeedState( CONCENTRATE_PUMPS_T pumpId )
 {
     CONCENTRATE_PUMP_STATE_T state = CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE;
+    //U16 currentMeasuredRev         = getConcPumpCurrentMeasuredRevolutionCount( pumpId );
     F32 targetToCurreSpeedDiffMLPM = fabs( getPumpTargetSpeed( pumpId ) - concentratePumps[ pumpId ].currentPumpSpeed );
 
     if ( ++concentratePumps[ pumpId ].controlTimerCounter >= CONCENTRATE_PUMP_CONTROL_INTERVAL )
Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r724b64673b719eaac10b0c9dd839ad9675274911 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 724b64673b719eaac10b0c9dd839ad9675274911)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -127,7 +127,6 @@
 static OVERRIDE_U32_T dialysatePumpDataPublishInterval = { DIALYSATE_PUMP_DATA_PUB_INTERVAL,
                                                            DIALYSATE_PUMP_DATA_PUB_INTERVAL,
                                                            0, 0 };                                                  ///< Interval (in ms) at which to publish dialysate pump data to CAN bus.
-
 //static DD_DIALYSATE_PUMP_CAL_RECORD_T dialysatePumpCalRecord;                                                     ///< Dialysate pump calibration record.
 static DIALYSATE_PUMP_DATA_T dialysatePumps[ NUM_OF_DIALYSATE_PUMPS ];                                              ///< Array of dialysate pumps data structure.
 static OVERRIDE_F32_T pumpTargetSpeed[ NUM_OF_DIALYSATE_PUMPS ];                                                    ///< Target dialysate pumps' speed (mL/min).forward direction only, hence positive speed.
@@ -232,6 +231,17 @@
     }
 #endif
 
+    // Init the dialysate pump with valid PWM while motor is disabled.
+    // when enable triggers, we dont want invlid RPM set that triggers alarm in motor controller.
+    setFPGAD12PumpSpeed( MIN_DIALYSATE_PUMP_RPM );
+    setFPGAD48PumpSpeed( MIN_DIALYSATE_PUMP_RPM );
+
+#ifdef __PITEST__
+    for ( i = 0;  i < NUM_OF_CONTROLLER_SIGNAL; i++ )
+    {
+        pIControlSignal[ i ] = 0.0F;
+    }
+#endif
     // Initialize the persistent alarms for fresh dialysate pump
     initPersistentAlarm( ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE, RPM_OUT_OF_RANGE_TIME_OUT, RPM_OUT_OF_RANGE_TIME_OUT );
     initPersistentAlarm( ALARM_ID_DD_D12_PUMP_OFF_FAULT, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT );
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r0d0febfa1b9e9e8d72f9db47f21b8c7882d91740 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0d0febfa1b9e9e8d72f9db47f21b8c7882d91740)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -40,6 +40,7 @@
  */
 
 // ********** private definitions **********
+
 #define AC_HEATER_TX_MAX_DUTY_CYCLE                                0.50F                                                           ///< AC Heater Treatement mode max duty cycle (50% of 1400W : 700W ) or ON state
 #define AC_HEATER_HEAT_MAX_DUTY_CYCLE                              0.70F                                                           ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W ) or ON state
 #define AC_HEATER_MAX_DUTY_CYCLE                                   1.0F                                                            ///< AC Heater max duty cycle (100.0%) or ON state
Index: firmware/App/Controllers/PistonPumpControl.h
===================================================================
diff -u -re0fc678329b0cb25dd76fa5e23cc1f487851f0ec -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Controllers/PistonPumpControl.h	(.../PistonPumpControl.h)	(revision e0fc678329b0cb25dd76fa5e23cc1f487851f0ec)
+++ firmware/App/Controllers/PistonPumpControl.h	(.../PistonPumpControl.h)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -22,7 +22,6 @@
 #include "DDCommon.h"
 #include "DDDefs.h"
 
-
 /**
  *  @defgroup PistonPumpControl PistonPumpControl
  *  @brief PistonPumpControl unit. Performs Dosing and ultrafilteration functions via a state machine.
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r7171e3353f2f07934e61f1b94e9f1ab9b506561f -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 7171e3353f2f07934e61f1b94e9f1ab9b506561f)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -27,6 +27,12 @@
 #define DD_VERSION_MICRO    0
 #define DD_VERSION_BUILD    1
 
+//Uncomment the below line for new dosing pump testing
+//#define __PUMPTEST__            1
+
+//Uncomment below for PI testing
+#define __PITEST__       1
+
 // ********** development build switches **********
 
 #ifndef _RELEASE_
Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -rf14371c9c14b461a50d7b08336e2e5fbed16f360 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f14371c9c14b461a50d7b08336e2e5fbed16f360)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -34,6 +34,8 @@
 
 // ********** private definitions **********
 
+#define USE_PT_100                                              1                                               ///< flag to check PT100 use in calculations
+
 #define PRIMARY_HEATER_TEMP_SENSORS_GAIN                        8U                                              ///< Primary heater temperature sensors gain.
 #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE              20000                                           ///< Primary heater temperature sensors reference resistance.
 #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE         1000U                                           ///< Primary heater temperature sensors zero degree resistance.
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6408d79e3a9a543e90b2fa7ab823be348befd391 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6408d79e3a9a543e90b2fa7ab823be348befd391)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -202,6 +202,11 @@
     {
         execBalancingChamberControl();
     }
+    //Test request to handle only balancing chamber switching
+    else if ( TRUE == pendingBalanceChamberSwOnlyRequest )
+    {
+        execBalancingChamberControl();
+    }
 //    else if ( TRUE == pendingStartDDFlushRequest )
 //    {
 //        pendingStartDDFlushRequest = FALSE;
Index: firmware/source/sys_main.c
===================================================================
diff -u -rf8bb43e62a4d10b64d8b197e372a56adfcfb88b9 -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision f8bb43e62a4d10b64d8b197e372a56adfcfb88b9)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
@@ -46,6 +46,7 @@
 /* USER CODE END */
 
 /* Include Files */
+
 #include "sys_common.h"
 
 /* USER CODE BEGIN (1) */