refactored tests and code of airport files