Refactored flight tests