Updating host and port logic, unit tests pass