@@ -15,10 +15,12 @@
  */
 
 #include "config.h"
 
 #import "OFHTTPCookieManager.h"
+#import "OFArray.h"
+#import "OFDate.h"
 #import "OFHTTPCookie.h"
 #import "OFURL.h"
 #import "OFAutoreleasePool.h"
 
 #import "TestsAppDelegate.h"
@@ -37,31 +39,33 @@
 	URL[1] = [OFURL URLWithString: @"https://heap.zone/foo/bar"];
 	URL[2] = [OFURL URLWithString: @"https://test.heap.zone/foo/bar"];
 	URL[3] = [OFURL URLWithString: @"http://webkeks.org/foo/bar"];
 
 	cookie[0] = [OFHTTPCookie cookieWithName: @"test"
-					   value: @"1"];
+					   value: @"1"
+					  domain: @"heap.zone"];
 	TEST(@"-[addCookie:forURL:] #1", R([manager addCookie: cookie[0]
 						       forURL: URL[0]]))
 
 	TEST(@"-[cookiesForURL:] #1",
 	    [[manager cookiesForURL: URL[0]] isEqual:
 	    [OFArray arrayWithObject: cookie[0]]])
 
 	cookie[1] = [OFHTTPCookie cookieWithName: @"test"
-					   value: @"2"];
-	[cookie[1] setDomain: @"webkeks.org"];
+					   value: @"2"
+					  domain: @"webkeks.org"];
 	TEST(@"-[addCookie:forURL:] #2", R([manager addCookie: cookie[1]
 						       forURL: URL[0]]))
 
 	TEST(@"-[cookiesForURL:] #2",
 	    [[manager cookiesForURL: URL[0]] isEqual:
 	    [OFArray arrayWithObject: cookie[0]]] &&
 	    [[manager cookiesForURL: URL[3]] isEqual: [OFArray array]])
 
 	cookie[2] = [OFHTTPCookie cookieWithName: @"test"
-					   value: @"3"];
+					   value: @"3"
+					  domain: @"heap.zone"];
 	[cookie[2] setSecure: true];
 	TEST(@"-[addCookie:forURL:] #3", R([manager addCookie: cookie[2]
 						       forURL: URL[1]]))
 
 	TEST(@"-[cookiesForURL:] #3",
@@ -69,11 +73,12 @@
 	    [OFArray arrayWithObject: cookie[2]]] &&
 	    [[manager cookiesForURL: URL[0]] isEqual: [OFArray array]])
 
 	[cookie[2] setExpires: [OFDate dateWithTimeIntervalSinceNow: -1]];
 	cookie[3] = [OFHTTPCookie cookieWithName: @"test"
-					   value: @"4"];
+					   value: @"4"
+					  domain: @"heap.zone"];
 	[cookie[3] setDomain: @".heap.zone"];
 	TEST(@"-[addCookie:forURL:] #4", R([manager addCookie: cookie[3]
 						       forURL: URL[1]]))
 
 	TEST(@"-[cookiesForURL:] #4",
@@ -81,12 +86,12 @@
 	    [OFArray arrayWithObject: cookie[3]]] &&
 	    [[manager cookiesForURL: URL[2]] isEqual:
 	    [OFArray arrayWithObject: cookie[3]]])
 
 	cookie[4] = [OFHTTPCookie cookieWithName: @"bar"
-					   value: @"5"];
-	[cookie[4] setDomain: @"test.heap.zone"];
+					   value: @"5"
+					  domain: @"test.heap.zone"];
 	TEST(@"-[addCookie:forURL:] #5", R([manager addCookie: cookie[4]
 						       forURL: URL[0]]))
 
 	TEST(@"-[cookiesForURL:] #5",
 	    [[manager cookiesForURL: URL[0]] isEqual: