Fix some test failures in new HTTP server code