Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r387a763cd2ca85cc5245f8e8953485299047f096 -re4f34f880f31202d6adfe3adaf33f75adb1089d8
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 387a763cd2ca85cc5245f8e8953485299047f096)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e4f34f880f31202d6adfe3adaf33f75adb1089d8)
@@ -1701,13 +1701,11 @@
 
     if ( 0 == settleStartTime )
     {
-        // This is not a volume for now and it is a flow rate.
-        fmdIntegratedVolume += getMeasuredDialInFlowRate();
+        fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
 
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1844,12 +1842,11 @@
 
     if ( 0 == settleStartTime )
     {
-        fmdIntegratedVolume += getMeasuredDialInFlowRate();
+        fmdIntegratedVolume += ( getMeasuredDialInFlowRate() / (F32)( ( SEC_PER_MIN * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) );
 
         if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }