@@ -15,10 +15,11 @@
  */
 
 #include "config.h"
 
 #import "OFURL.h"
+#import "OFNumber.h"
 #import "OFString.h"
 #import "OFAutoreleasePool.h"
 
 #import "OFInvalidFormatException.h"
 
@@ -53,11 +54,11 @@
 	    [[[OFURL URLWithString: @"http://foo/?q"
 		     relativeToURL: u1] string] isEqual: @"http://foo/?q"])
 
 	TEST(@"-[string]",
 	    [[u1 string] isEqual: url_str] &&
-	    [[u2 string] isEqual: @"http://foo"] &&
+	    [[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"])
@@ -64,11 +65,11 @@
 
 	TEST(@"-[user]", [[u1 user] isEqual: @"us%3Aer"] && [u4 user] == nil)
 	TEST(@"-[password]",
 	    [[u1 password] isEqual: @"p%40w"] && [u4 password] == nil)
 	TEST(@"-[host]", [[u1 host] isEqual: @"ho%3Ast"] && [u4 port] == 0)
-	TEST(@"-[port]", [u1 port] == 1234)
+	TEST(@"-[port]", [[u1 port] isEqual: [OFNumber numberWithUInt16: 1234]])
 	TEST(@"-[path]",
 	    [[u1 path] isEqual: @"/pa%3Bth"] &&
 	    [[u4 path] isEqual: @"/etc/passwd"])
 	TEST(@"-[parameters]",
 	    [[u1 parameters] isEqual: @"pa%3Fram"] && [u4 parameters] == nil)