Change the way we lookup the request port
Modify tests to include ports differently, add tests for unrecognised ports