@@ -28,11 +28,11 @@
 #import "OFInvalidFormatException.h"
 
 #import "TestsAppDelegate.h"
 
 static OFString *module = @"OFURL";
-static OFString *url_str = @"ht%3atp://us%3Aer:p%40w@ho%3Ast:1234/"
+static OFString *url_str = @"ht%3Atp://us%3Aer:p%40w@ho%3Ast:1234/"
     @"pa%3Bth;pa%3Fram?que%23ry#frag%23ment";
 
 @implementation TestsAppDelegate (OFURLTests)
 - (void)URLTests
 {
@@ -46,11 +46,11 @@
 	    R(u4 = [OFURL URLWithString: @"file:///etc/passwd"]))
 
 	TEST(@"+[URLWithString:relativeToURL:]",
 	    [[[OFURL URLWithString: @"/foo"
 		     relativeToURL: u1] string] isEqual:
-	    @"ht%3atp://us%3Aer:p%40w@ho%3Ast:1234/foo"] &&
+	    @"ht%3Atp://us%3Aer:p%40w@ho%3Ast:1234/foo"] &&
 	    [[[OFURL URLWithString: @"foo/bar?q"
 		     relativeToURL: [OFURL URLWithString: @"http://h/qux/quux"]]
 	    string] isEqual: @"http://h/qux/foo/bar?q"] &&
 	    [[[OFURL URLWithString: @"foo/bar"
 		     relativeToURL: [OFURL URLWithString: @"http://h/qux/?x"]]
@@ -70,23 +70,23 @@
 	    [[u2 string] isEqual: @"http://foo:80"] &&
 	    [[u3 string] isEqual: @"http://bar/"] &&
 	    [[u4 string] isEqual: @"file:///etc/passwd"])
 
 	TEST(@"-[scheme]",
-	    [[u1 scheme] isEqual: @"ht%3atp"] && [[u4 scheme] isEqual: @"file"])
+	    [[u1 scheme] isEqual: @"ht:tp"] && [[u4 scheme] isEqual: @"file"])
 
-	TEST(@"-[user]", [[u1 user] isEqual: @"us%3Aer"] && [u4 user] == nil)
+	TEST(@"-[user]", [[u1 user] isEqual: @"us:er"] && [u4 user] == nil)
 	TEST(@"-[password]",
-	    [[u1 password] isEqual: @"p%40w"] && [u4 password] == nil)
-	TEST(@"-[host]", [[u1 host] isEqual: @"ho%3Ast"] && [u4 port] == 0)
+	    [[u1 password] isEqual: @"p@w"] && [u4 password] == nil)
+	TEST(@"-[host]", [[u1 host] isEqual: @"ho:st"] && [u4 port] == 0)
 	TEST(@"-[port]", [[u1 port] isEqual: [OFNumber numberWithUInt16: 1234]])
 	TEST(@"-[path]",
-	    [[u1 path] isEqual: @"/pa%3Bth"] &&
+	    [[u1 path] isEqual: @"/pa;th"] &&
 	    [[u4 path] isEqual: @"/etc/passwd"])
 	TEST(@"-[pathComponents]",
 	    [[u1 pathComponents] isEqual:
-	    [OFArray arrayWithObjects: @"", @"pa%3Bth", nil]] &&
+	    [OFArray arrayWithObjects: @"", @"pa;th", nil]] &&
 	    [[u4 pathComponents] isEqual:
 	    [OFArray arrayWithObjects: @"", @"etc", @"passwd", nil]])
 	TEST(@"-[lastPathComponent",
 	    [[[OFURL URLWithString: @"http://host/foo//bar/baz"]
 	    lastPathComponent] isEqual: @"baz"] &&
@@ -95,15 +95,15 @@
 	    [[[OFURL URLWithString: @"http://host/foo/"]
 	    lastPathComponent] isEqual: @"foo"] &&
 	    [[[OFURL URLWithString: @"http://host/"]
 	    lastPathComponent] isEqual: @""])
 	TEST(@"-[parameters]",
-	    [[u1 parameters] isEqual: @"pa%3Fram"] && [u4 parameters] == nil)
+	    [[u1 parameters] isEqual: @"pa?ram"] && [u4 parameters] == nil)
 	TEST(@"-[query]",
-	    [[u1 query] isEqual: @"que%23ry"] && [u4 query] == nil)
+	    [[u1 query] isEqual: @"que#ry"] && [u4 query] == nil)
 	TEST(@"-[fragment]",
-	    [[u1 fragment] isEqual: @"frag%23ment"] && [u4 fragment] == nil)
+	    [[u1 fragment] isEqual: @"frag#ment"] && [u4 fragment] == nil)
 
 	TEST(@"-[copy]", R(u4 = [[u1 copy] autorelease]))
 
 	TEST(@"-[isEqual:]", [u1 isEqual: u4] && ![u2 isEqual: u3] &&
 	    [[OFURL URLWithString: @"HTTP://bar/"] isEqual: u3])