Merge "Add tests for HttpError"