Add test that requests on unrecognised ports are routed to the expected site if no ambiguity
Refactor port/site tests into new test case and individual tests