* Parse and reconstruct URI, instead of using string concatenation * Rename parse error, add test Co-authored-by: Mattermod <mattermod@users.noreply.github.com>