Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -ra721c4feab8c89880314070d56224e28d502ac5e -r228bdc53e9e88533429cd514d1d509a6fcd361d0
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision a721c4feab8c89880314070d56224e28d502ac5e)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 228bdc53e9e88533429cd514d1d509a6fcd361d0)
@@ -190,11 +190,14 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( loadCellID < NUM_OF_LOAD_CELLS )
     {
-        result = TRUE;
-        filteredLoadCellWeights[ loadCellID ].ovData = value;
-        filteredLoadCellWeights[ loadCellID ].override = OVERRIDE_KEY;
+        if ( TRUE == isTestingActivated() )
+        {
+            result = TRUE;
+            filteredLoadCellWeights[ loadCellID ].ovData = value;
+            filteredLoadCellWeights[ loadCellID ].override = OVERRIDE_KEY;
+        }
     }
 
     return result;
@@ -214,11 +217,14 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( loadCellID < NUM_OF_LOAD_CELLS )
     {
-        result = TRUE;
-        filteredLoadCellWeights[ loadCellID ].override = OVERRIDE_RESET;
-        filteredLoadCellWeights[ loadCellID ].ovData = filteredLoadCellWeights[ loadCellID ].ovInitData;
+        if ( TRUE == isTestingActivated() )
+        {
+            result = TRUE;
+            filteredLoadCellWeights[ loadCellID ].override = OVERRIDE_RESET;
+            filteredLoadCellWeights[ loadCellID ].ovData = filteredLoadCellWeights[ loadCellID ].ovInitData;
+        }
     }
 
     return result;
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 -r228bdc53e9e88533429cd514d1d509a6fcd361d0
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 228bdc53e9e88533429cd514d1d509a6fcd361d0)
@@ -86,7 +86,10 @@
  *************************************************************************/
 void initPressures( void )
 {
-    // TODO - anything to initialize?
+    pressuresState = PRESSURE_INIT_STATE;
+    pressuresSelfTestState = PRESSURE_SELF_TEST_STATE_START;
+    pressuresDataPublicationTimerCounter = 0;
+    pressuresSelfTestTimerCount = 0;
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -ra721c4feab8c89880314070d56224e28d502ac5e -r228bdc53e9e88533429cd514d1d509a6fcd361d0
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a721c4feab8c89880314070d56224e28d502ac5e)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 228bdc53e9e88533429cd514d1d509a6fcd361d0)
@@ -186,17 +186,9 @@
     measuredROFlowRateLPM.data = (F32)(roFlow) * RO_FLOW_ADC_TO_LPM_FACTOR;
     measuredROPumpPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
 
-    // check RO flow
-    // TODO - check flow
+    // TODO - check pressure?
 
-    // check pressure while RO pump is on
-    if ( TRUE == isROPumpOn )
-    {
-        if ( measuredROPumpPressure < MIN_RO_PRESSURE || measuredROPumpPressure > MAX_RO_PRESSURE )
-        {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE, measuredROPumpPressure )  // TODO - add persistence
-        }
-    }
+    // TODO - check flow?
 
     // publish RO pump data on interval
     publishROPumpData();
@@ -224,6 +216,7 @@
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 0, roPumpState )  // TODO - replace 1st param with s/w fault enum
+            roPumpState = RO_PUMP_OFF_STATE;
             break;
     }
 }