Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r1781335a8c1833fad17b275bf44c7f6675e68423 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 1781335a8c1833fad17b275bf44c7f6675e68423)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -417,8 +417,10 @@
     }
     else
     {
+#ifdef ENABLE_ALARM_2
         //Alarm when pressure is not in range
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
     }
 
     return state;
@@ -511,13 +513,17 @@
         {
             if ( TRUE != isPressureDroppedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else if ( TRUE != isPressureStalbilizedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // Alarm when switching time expired, but still pressure not in range which indicates fill is not yet completed.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else
             {
@@ -588,8 +594,10 @@
     }
     else
     {
+#ifdef ENABLE_ALARM_2
         //Alarm when pressure is not in range
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
     }
     return state;
 }
@@ -642,13 +650,17 @@
         {
             if ( TRUE != isPressureDroppedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else if ( TRUE != isPressureStalbilizedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // Alarm when switching time expired, but still pressure not in range which indicates fill is not completed.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else
             {
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r387ea33c2e45705550905bc1a97e13db1cc95bf8 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 387ea33c2e45705550905bc1a97e13db1cc95bf8)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -43,14 +43,20 @@
 //#define __PITEST__              1
 
 //Uncomment below if diener concentrate pump used
-#define __DIENER_CONC_PUMP__      1
+//#define __DIENER_CONC_PUMP__      1
 
 //Uncomment below if beta hardware is used
 //#define __BETA_HW_VER__           1
 
 //Uncomment below if barometric pressure sensor reading available
 //#define __BARO_PRES_SENSOR__      1
 
+//Uncomment below if required hardware available ( baro and cond sensor) for testing
+//#define ENABLE_ALARM_1
+
+//Uncomment below once characterization/study completed
+//#define ENABLE_ALARM_2
+
 //Uncomment below to disable heaters debug message
 #define __HEATERS_DEBUG__         1
 
Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -rac4caa05957f8ff84a5e4c2b1ef8fcf92500411b -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision ac4caa05957f8ff84a5e4c2b1ef8fcf92500411b)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -188,8 +188,10 @@
     lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount();
     lastConductivityErrorCounter[ D74_COND ].data = (U32)getFPGAD74CondErrorCount();
 
+#ifdef ENABLE_ALARM_1
     // Monitor conductivity sensor health
     checkConductivitySensors();
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -r2e89a75592087ba15cae7070a92173e9f1efa8fe -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2e89a75592087ba15cae7070a92173e9f1efa8fe)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -262,9 +262,10 @@
     //Read Baro temperature sensor
     if ( getCurrentOperationMode() != DD_MODE_INIT )
     {
+#ifdef ENABLE_ALARM_1
         // Make sure the baro sensor coefficients are not corrupted
         checkBaroSensorCRC();
-
+#endif
         baroConvConsts.refTemperature   = getFPGABaroReferenceTemperature();
         baroConvConsts.temperatureCoeff = getFPGABaroTempCoeffOfTemperature();
         lastBaroTempReadCounter.data    = (U32)getFPGABaroReadCount();
@@ -328,7 +329,9 @@
 static void checkTemperatureSensors( void )
 {
     checkFPGAPersistentAlarms( FPGA_PERS_ERROR_RTD_ADC_TEMP_SENSORS, getTemperatureSensorsReadCount() );
+#ifdef ENABLE_ALARM_1
     checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, getBaroTempSensorsReadCount() );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rab9df65fbbb4f8387a5f2c0e7aa26bd234843150 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ab9df65fbbb4f8387a5f2c0e7aa26bd234843150)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -278,8 +278,10 @@
     // Update any dynamic treatment parameter changes
     updateTreatmentSettings();
 
+#ifdef ENABLE_ALARM_2
     //Check dialysate temperature high/low alarms
     checkDialysateTemperature();
+#endif
 
     //Check temperature drift between D30 and D28
     checkDialysateTemperatureSensors();
Index: firmware/App/Services/AlarmMgmtDD.c
===================================================================
diff -u -ra9983d3e6b07e7c927fab3d16e80b715594fe221 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision a9983d3e6b07e7c927fab3d16e80b715594fe221)
+++ firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -115,7 +115,7 @@
                 {
                     // If alarm is a DD fault and the alarm manager can transition to fault immediately, go to fault mode
                     //TODO : Testing - remove the comment later
-                    // requestNewOperationMode( DD_MODE_FAUL );
+                    requestNewOperationMode( DD_MODE_FAUL );
                 }
             }
         }