Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rc049177f4d18a4740a357941b48a833d7115b581 -rec17f9086547f77425601122ded579bbc0d785c5
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision c049177f4d18a4740a357941b48a833d7115b581)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision ec17f9086547f77425601122ded579bbc0d785c5)
@@ -26,6 +26,7 @@
 #include "Pressures.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TestSupport.h"
 #include "Timers.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -396,7 +397,11 @@
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
-
+    // Skip fill and lower level events when no tubing set is installed
+    else if ( TRUE == getTestConfigStatus( TEST_CONFIG_TESTING_WITHOUT_TUBING_SET ) )
+    {
+        result = AIR_TRAP_CLOSED_STATE;
+    }
     // Lower air trap level if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H16_LEVL ) )
     {
@@ -412,7 +417,6 @@
             result = AIR_TRAP_LOWER_LEVEL_STATE;
         }
     }
-
     // Raise air trap level once at start of treatment (blood priming) or when air detected at lower level
     else if ( ( airTrapWasFilledAtStartOfTreatement != TRUE ) ||
               ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H17_LEVL ) ) )