Merge pull request #2606 from akoeplinger/fix-hardcoded-testports