Merge "Refactor tests for Port external_ids"