Make tests resilient to other ports

Missed some places that'll bite us with non-standard ports.