Add tests for hostnames with ports
Fix issues normalizing hosts with ports