Fixed conflicts in SceneFlightTesting