Minor cleanup of HTTP server: tests pass