refactored tests in airport and grand finale files