Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rbc8403b288e167f51c9e991c2a07bb455c77c19a -r934a19c673175bc12c5634326f4f1af821c1916c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bc8403b288e167f51c9e991c2a07bb455c77c19a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 934a19c673175bc12c5634326f4f1af821c1916c)
@@ -968,13 +968,13 @@
         {
             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-            cmdChangeDGValveSetting( VALVE_SETTING_R1_TO_R2 );
+            cmdChangeDGValveSetting( DG_VALVE_SETTING_R1_TO_R2 );
         }
         else
         {
             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-            cmdChangeDGValveSetting( VALVE_SETTING_R2_TO_R1 );
+            cmdChangeDGValveSetting( DG_VALVE_SETTING_R2_TO_R1 );
         }
 
         isValvesSettingSent = TRUE;
@@ -1072,7 +1072,7 @@
 
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-        cmdChangeDGValveSetting( VALVE_SETTING_R1_TO_R2 );
+        cmdChangeDGValveSetting( DG_VALVE_SETTING_R1_TO_R2 );
         isValvesSettingSent = TRUE;
     }
 
@@ -1135,7 +1135,7 @@
     {
         F32 const resOneDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) - reservoirVolume[ DG_RESERVOIR_1 ] );
         F32 const resTwoDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ] );
-        F32 const integratedVolumeToTargetPercent = fabs( fmdIntegratedVolume - WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML ) / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML;
+        F32 const integratedVolumeToTargetPercent = 1 - ( fmdIntegratedVolume / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML );
 
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )
@@ -1171,7 +1171,7 @@
 
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-        cmdChangeDGValveSetting( VALVE_SETTING_R1_TO_R2 );
+        cmdChangeDGValveSetting( DG_VALVE_SETTING_R1_TO_R2 );
         isValvesSettingSent = TRUE;
     }
 
@@ -1235,7 +1235,7 @@
     {
         F32 const resOneDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_1 ) - reservoirVolume[ DG_RESERVOIR_1 ] );
         F32 const resTwoDiffAfterDisplacement = fabs( getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ] );
-        F32 const integratedVolumeToTargetPercent = fabs( fmdIntegratedVolume - WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML ) / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML;
+        F32 const integratedVolumeToTargetPercent = 1 - ( fmdIntegratedVolume / WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML );
 
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
              ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )