Change default test port, and un-hard-code