Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r5d13922ee2e8c851bc5db67ef4d0120b47de6f07
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 5d13922ee2e8c851bc5db67ef4d0120b47de6f07)
@@ -614,13 +614,11 @@
  * @brief
  * The execPresOcclTest function executes the PresOccl self-test.
  * @details Inputs: none
- * @details Outputs: none
- * @return the result of the PresOccl self-test.
+ * @details Outputs: Triggers fault when test case fails
+ * @return none
  *************************************************************************/
-SELF_TEST_STATUS_T execPresOcclTest( void )
+void execPresOcclTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
-
     U32 const bpPressure = getMeasuredBloodPumpOcclusion();
     U32 const dialysateInPressure = getMeasuredDialInPumpOcclusion();
     U32 const dialysateOutPressure = getMeasuredDialOutPumpOcclusion();
@@ -629,30 +627,28 @@
 
     if ( ( bpPressure <= OCCLUSION_NO_CARTRIDGE_PRESSURE_READING_MIN ) || ( bpPressure >= OCCLUSION_THRESHOLD ) )
     {
-        result = SELF_TEST_STATUS_FAILED;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, bpPressure );
     }
 
     if ( ( dialysateInPressure <= OCCLUSION_NO_CARTRIDGE_PRESSURE_READING_MIN ) || ( dialysateInPressure >= OCCLUSION_THRESHOLD ) )
     {
-        result = SELF_TEST_STATUS_FAILED;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE, dialysateInPressure );
     }
 
     if ( ( dialysateOutPressure <= OCCLUSION_NO_CARTRIDGE_PRESSURE_READING_MIN ) || ( dialysateOutPressure >= OCCLUSION_THRESHOLD ) )
     {
-        result = SELF_TEST_STATUS_FAILED;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE, dialysateOutPressure );
     }
 
     if ( ( arterialPressure <= ARTERIAL_PRESSURE_SELF_TEST_MIN ) || ( arterialPressure >= ARTERIAL_PRESSURE_SELF_TEST_MAX ) )
     {
-        result = SELF_TEST_STATUS_FAILED;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, arterialPressure );
     }
 
     if ( ( venousPressure <= VENOUS_PRESSURE_SELF_TEST_MIN ) || ( venousPressure >= VENOUS_PRESSURE_SELF_TEST_MAX ) )
     {
-        result = SELF_TEST_STATUS_FAILED;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, venousPressure );
     }
-
-    return result;
 }
 
 /*********************************************************************//**
@@ -666,6 +662,7 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
 
+#ifndef DISABLE_OCCLUSION_SELF_TEST
     U32 const bpPressure = getMeasuredBloodPumpOcclusion();
     U32 const dialysateInPressure = getMeasuredDialInPumpOcclusion();
     U32 const dialysateOutPressure = getMeasuredDialOutPumpOcclusion();
@@ -697,6 +694,7 @@
             activateAlarmNoData( ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY );
         }
     }
+#endif
 
     return result;
 }