airport tests refactored