Add flight models and passing tests