Fix AircraftTest
Fix other tests
@juventietis STOP CASTING TO AIRCRAFT