Update network and tests to handle AircraftObjectFactory changes