Update AirspaceTest.java to add testCycleAircraft test.
Resolve conflict.