Merge "Refactor ConvertORTopoToTapiTopoTest"