@@ -24,31 +24,29 @@
 @implementation TestsAppDelegate (OFUDPSocketTests)
 - (void)UDPSocketTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFUDPSocket *sock;
-	uint16_t port1;
 	OFSocketAddress addr1, addr2, addr3;
 	char buf[6];
 
 	TEST(@"+[socket]", (sock = [OFUDPSocket socket]))
 
 	TEST(@"-[bindToHost:port:]",
-	    (port1 = [sock bindToHost: @"127.0.0.1" port: 0]))
-
-	addr1 = OFSocketAddressParseIP(@"127.0.0.1", port1);
+	    R(addr1 = [sock bindToHost: @"127.0.0.1" port: 0]))
 
 	TEST(@"-[sendBuffer:length:receiver:]",
 	    R([sock sendBuffer: "Hello" length: 6 receiver: &addr1]))
 
 	TEST(@"-[receiveIntoBuffer:length:sender:]",
 	    [sock receiveIntoBuffer: buf length: 6 sender: &addr2] == 6 &&
 	    !memcmp(buf, "Hello", 6) &&
 	    [OFSocketAddressString(&addr2) isEqual: @"127.0.0.1"] &&
-	    OFSocketAddressIPPort(&addr2) == port1)
+	    OFSocketAddressIPPort(&addr2) == OFSocketAddressIPPort(&addr1))
 
-	addr3 = OFSocketAddressParseIP(@"127.0.0.1", port1 + 1);
+	addr3 = OFSocketAddressParseIP(@"127.0.0.1",
+	    OFSocketAddressIPPort(&addr1) + 1);
 
 	TEST(@"OFSocketAddressEqual()",
 	    OFSocketAddressEqual(&addr1, &addr2) &&
 	    !OFSocketAddressEqual(&addr1, &addr3))