Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -radd123aa11ea027eb83b3d77ff8b4fc1b9a1cb16 -r58409c35cd1adbe53da9a03ec20aede99de84c0e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision add123aa11ea027eb83b3d77ff8b4fc1b9a1cb16)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 58409c35cd1adbe53da9a03ec20aede99de84c0e)
@@ -58,7 +58,7 @@
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0                                   ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0                                   ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5.0                                     ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              12.0                                    ///< Tolerance in the load cell readings of the displacement in grams (2%).
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              25.0                                    ///< 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.
 
@@ -324,7 +324,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -1161,8 +1161,10 @@
     if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
 #endif
     {
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
         zeroBloodLeak();
         state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+#endif
         *result = SELF_TEST_STATUS_PASSED;
     }
 
@@ -1187,7 +1189,9 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+#endif
     {
         settleStartTime = getMSTimerCount();
         state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r58409c35cd1adbe53da9a03ec20aede99de84c0e
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 58409c35cd1adbe53da9a03ec20aede99de84c0e)
@@ -92,9 +92,10 @@
         // Monitor fluid leak detector
         execFluidLeak();
 
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
         // Monitor blood leak detector
         execBloodLeak();
-
+#endif
         // Monitor air bubble detectors
         execBubbles();