Merge "Fix failure cases around test_ports"