@@ -128,30 +128,30 @@
 	URL = [OFURL URLWithString:
 	    [OFString stringWithFormat: @"http://127.0.0.1:%" @PRIu16 "/foo",
 					server->_port]];
 
 	TEST(@"-[asyncPerformRequest:]",
-	    (client = [OFHTTPClient client]) && R([client setDelegate: self]) &&
+	    (client = [OFHTTPClient client]) && (client.delegate = self) &&
 	    (request = [OFHTTPRequest requestWithURL: URL]) &&
-	    R([request setHeaders:
+	    (request.headers =
 	    [OFDictionary dictionaryWithObject: @"5"
-					forKey: @"Content-Length"]]) &&
+					forKey: @"Content-Length"]) &&
 	    R([client asyncPerformRequest: request]))
 
 	[[OFRunLoop mainRunLoop] runUntilDate:
 	    [OFDate dateWithTimeIntervalSinceNow: 2]];
 	[response autorelease];
 
 	TEST(@"Asynchronous handling of requests", response != nil)
 
 	TEST(@"Normalization of server header keys",
-	    [[response headers] objectForKey: @"Content-Length"] != nil)
+	    [response.headers objectForKey: @"Content-Length"] != nil)
 
 	TEST(@"Correct parsing of data",
 	    (data = [response readDataUntilEndOfStream]) &&
-	    [data count] == 7 && memcmp([data items], "foo\nbar", 7) == 0)
+	    data.count == 7 && memcmp(data.items, "foo\nbar", 7) == 0)
 
 	[server join];
 
 	[pool drain];
 }
 @end