Revert "Test cases were failing on bind"

This reverts commit 8ba097f3da8d1a752755a52b1d3ec967c23f0643.
Revert "Old change to move ports off 5555 (was conflicting with other stuff)"

This reverts commit da0efaa81771aba497a961d70f2166f500a52afd.