Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rb7764e26a3460652da29b1f957706dfaca413226 -r3d30c9829d316b8c5e632c0201a59c8d14b3486e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b7764e26a3460652da29b1f957706dfaca413226)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3d30c9829d316b8c5e632c0201a59c8d14b3486e)
@@ -814,8 +814,8 @@
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
 
     // TODO: Use appropriate sensor driver
-    BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
-    BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
+    BOOL const isADADetectedAir = noFPGABubbleDetected( ADA );
+    BOOL const isADVDetectedAir = noFPGABubbleDetected( ADV );
 
     if ( ( TRUE == isADADetectedAir ) && ( TRUE == isADVDetectedAir ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
@@ -1118,8 +1118,8 @@
     *result = SELF_TEST_STATUS_FAILED;
 
     // TODO: Use appropriate sensor driver
-    BOOL const isADADetectedAir = getFPGAArterialAirBubbleStatus();
-    BOOL const isADVDetectedAir = getFPGAVenousAirBubbleStatus();
+    BOOL const isADADetectedAir = noFPGABubbleDetected( ADA );
+    BOOL const isADVDetectedAir = noFPGABubbleDetected( ADV );
 
 #ifndef SKIP_AIR_BUBBLE_CHECK
     if ( ( FALSE == isADADetectedAir ) && ( FALSE == isADVDetectedAir ) )