Splitting up flight class and flight_test for readability