Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rf10b94b7dc8c2b340c7e807f1e6850d237cee3a6 -r3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f10b94b7dc8c2b340c7e807f1e6850d237cee3a6)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece)
@@ -1164,17 +1164,17 @@
     // Verify calibration
     DACDeltaV = fabs( forceSensorCalRecord.hdHeparinForceSensorDACVoltage - getSyringePumpForceV() );
 
-    /*if ( ( TRUE == calStatus ) && ( DACDeltaV > SYRINGE_PUMP_DAC_VOLTAGE_MAX_ERROR ) )
+    if ( ( TRUE == calStatus ) && ( DACDeltaV > SYRINGE_PUMP_DAC_VOLTAGE_MAX_ERROR ) )
     {
         result = SELF_TEST_STATUS_PASSED;
     }
     else
     {
         result = SELF_TEST_STATUS_FAILED;
         activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SELF_TEST_FAILURE );
-    }*/
+    }
 
-    return TRUE; //result;
+    return result;
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rf10b94b7dc8c2b340c7e807f1e6850d237cee3a6 -r3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision f10b94b7dc8c2b340c7e807f1e6850d237cee3a6)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 3c5b521fcaa489eef9df0e2d657c7e0b23dd8ece)
@@ -87,7 +87,7 @@
 #define HOMING_STEP_CHANGE_IN_COUNTS            1000                                                    ///< Step change in counts during homing
 #define TRANSITION_STEP_CHANGE_IN_COUNTS        15000                                                   ///< Step change in counts during normal operations
 
-#define MAX_DEVIATION_FROM_TARGET_IN_COUNTS     350 //150 // TODO remove this                                                     ///< Maximum deviation from target in counts
+#define MAX_DEVIATION_FROM_TARGET_IN_COUNTS     150                                                     ///< Maximum deviation from target in counts
 #define MAX_DEVIATION_FROM_TRAGET_IN_POS_B      1000                                                    ///< Maximum allowed deviation from position B in counts
 #define MAX_ALLOWED_FAILED_HOMINGS              3U                                                      ///< Maximum allowed failed homings
 /// The time that the valve must be at the edge to be considered for edge detection
@@ -306,16 +306,8 @@
     BOOL result = FALSE;
 
     if ( valve < NUM_OF_VALVES )
-    {   // If haven't already homed the valves, home the valves
-        if ( valvesStatus[ valve ].hasValveBeenHomed != TRUE )
-        {
-            valvesStatus[ valve ].hasHomingBeenRequested = TRUE;
-        }
-        // Otherwise, go to position A (home position)
-        else
-        {
-            setValvePosition( valve, VALVE_POSITION_A_INSERT_EJECT );
-        }
+    {
+        valvesStatus[ valve ].hasHomingBeenRequested = TRUE;
         result = TRUE;
     }
     else