Misc Changes [test] Move off of as much url.parse as possible: #87286 Credits Huge thanks to @eps1lon for helping!