Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -rc07917caced76b53a0ed8f35167fac6f9d8310a4 -rb4040c87876465ffac138d9259ba8a40ea840aa9
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision c07917caced76b53a0ed8f35167fac6f9d8310a4)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision b4040c87876465ffac138d9259ba8a40ea840aa9)
@@ -237,17 +237,6 @@
     }
 #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/Drivers/TemperatureSensors.c
===================================================================
diff -u -rb83b525617ddffecc06b81c97e2534cdd3446c47 -rb4040c87876465ffac138d9259ba8a40ea840aa9
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b83b525617ddffecc06b81c97e2534cdd3446c47)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b4040c87876465ffac138d9259ba8a40ea840aa9)
@@ -34,8 +34,6 @@
 
 // ********** 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 -r43332b2877c6afa12a9da903dea6cf0cfb71aec3 -rb4040c87876465ffac138d9259ba8a40ea840aa9
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b4040c87876465ffac138d9259ba8a40ea840aa9)
@@ -176,11 +176,6 @@
     {
         execBalancingChamberControl();
     }
-    //Test request to handle only balancing chamber switching
-    else if ( TRUE == pendingBalanceChamberSwOnlyRequest )
-    {
-        execBalancingChamberControl();
-    }
 //    else if ( TRUE == pendingStartDDFlushRequest )
 //    {
 //        pendingStartDDFlushRequest = FALSE;
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r43332b2877c6afa12a9da903dea6cf0cfb71aec3 -rb4040c87876465ffac138d9259ba8a40ea840aa9
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 43332b2877c6afa12a9da903dea6cf0cfb71aec3)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision b4040c87876465ffac138d9259ba8a40ea840aa9)
@@ -177,6 +177,9 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
+    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
+    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
+    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
     { MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST,                     &testDDSpentChamberFillDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testBloodLeakDataPublishIntervalOverride },
     { MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST,                                 &testBloodLeakStatusOverride },