refactored airport tests and code