Add port to address test.
Rearrange path test data.