Update the CLI and test suite to use HTTP upgrade
More fixes