Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -reb40fb713ed387f87aa4d9ed9b9f42f91881064e -r30ac8856f79936377931994f5d136a3277d35485
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision eb40fb713ed387f87aa4d9ed9b9f42f91881064e)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 30ac8856f79936377931994f5d136a3277d35485)
@@ -237,6 +237,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/Services/Messaging.c
===================================================================
diff -u -rc554353ba10c84377f0b9f7218f911543a293598 -r30ac8856f79936377931994f5d136a3277d35485
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c554353ba10c84377f0b9f7218f911543a293598)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 30ac8856f79936377931994f5d136a3277d35485)
@@ -176,9 +176,6 @@
     { 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 },