Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -re6e0e56ed9769723d5e4a561a9dfe4b16ad058e6 -r7d373c4a2798542bc39a139a10b3d59c4a355807
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e6e0e56ed9769723d5e4a561a9dfe4b16ad058e6)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7d373c4a2798542bc39a139a10b3d59c4a355807)
@@ -486,7 +486,7 @@
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) == SW_CONFIG_ENABLE_VALUE )
     {
-        heparinDeliveryState = HEPARIN_STATE_OFF;
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
 #endif
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -r7d373c4a2798542bc39a139a10b3d59c4a355807
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 7d373c4a2798542bc39a139a10b3d59c4a355807)
@@ -588,6 +588,8 @@
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
             {
+                signalDialOutPumpHardStop();
+                signalDialInPumpHardStop();
                 state = HD_PRIME_WET_SELF_TESTS_STATE;
             }
             else
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -r7d373c4a2798542bc39a139a10b3d59c4a355807
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7d373c4a2798542bc39a139a10b3d59c4a355807)
@@ -58,8 +58,8 @@
 #define WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML         1200.0F                                 ///< Setup volume for reservoir one before wet self-test in ml.
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0F                                  ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0F                                  ///< Target of second displacement volume in ml.
-#define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5.0F                                    ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              12.0F                                   ///< Tolerance in the load cell readings of the displacement in grams (2%).
+#define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           15.0F                                   ///< Tolerance on integrated volume in percentage.
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              60.0F                                   ///< Tolerance in the load cell readings of the displacement in grams (2%).
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.