Added another test case, and refactored Url.cs.