@@ -50,11 +50,11 @@
 	return false;
 }
 
 -	 (void)socket: (OFSPXSocket *)sock
   didConnectToNetwork: (uint32_t)network
-		 node: (unsigned char [IPX_NODE_LEN])node
+		 node: (const unsigned char [IPX_NODE_LEN])node
 		 port: (uint16_t)port
 	    exception: (id)exception
 {
 	OFEnsure(!_connected);
 
@@ -69,10 +69,11 @@
 @end
 
 @implementation TestsAppDelegate (OFSPXSocketTests)
 - (void)SPXSocketTests
 {
+	const unsigned char zeroNode[IPX_NODE_LEN] = { 0 };
 	void *pool = objc_autoreleasePoolPush();
 	OFSPXSocket *sockClient, *sockServer = nil, *sockAccepted;
 	OFSocketAddress address1;
 	const OFSocketAddress *address2;
 	uint32_t network;
@@ -83,30 +84,32 @@
 
 	TEST(@"+[socket]", (sockClient = [OFSPXSocket socket]) &&
 	    (sockServer = [OFSPXSocket socket]))
 
 	@try {
-		TEST(@"-[bindToPort:]",
-		    R(address1 = [sockServer bindToPort: 0]))
-	} @catch (OFBindFailedException *e) {
+		TEST(@"-[bindToNetwork:node:port:]",
+		    R(address1 = [sockServer bindToNetwork: 0
+						      node: zeroNode
+						      port: 0]))
+	} @catch (OFBindSocketFailedException *e) {
 		switch (e.errNo) {
 		case EAFNOSUPPORT:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
-			    @"\r[OFSPXSocket] -[bindToPort:]: "
+			    @"\r[OFSPXSocket] -[bindToNetwork:node:port:]: "
 			    @"IPX unsupported, skipping tests"];
 			break;
 		case ESOCKTNOSUPPORT:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
-			    @"\r[OFSPXSocket] -[bindToPort:]: "
+			    @"\r[OFSPXSocket] -[bindToNetwork:node:port:]: "
 			    @"SPX unsupported, skipping tests"];
 			break;
 		case EADDRNOTAVAIL:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
-			    @"\r[OFSPXSocket] -[bindToPort:]: "
+			    @"\r[OFSPXSocket] -[bindToNetwork:node:port:]: "
 			    @"IPX not configured, skipping tests"];
 			break;
 		default:
 			@throw e;
 		}
@@ -114,12 +117,12 @@
 		objc_autoreleasePoolPop(pool);
 		return;
 	}
 
 	network = OFSocketAddressIPXNetwork(&address1);
-	OFSocketAddressIPXNode(&address1, node);
-	port = OFSocketAddressPort(&address1);
+	OFSocketAddressGetIPXNode(&address1, node);
+	port = OFSocketAddressIPXPort(&address1);
 
 	TEST(@"-[listen]", R([sockServer listen]))
 
 	TEST(@"-[connectToNetwork:node:port:]",
 	    R([sockClient connectToNetwork: network node: node port: port]))
@@ -134,11 +137,11 @@
 	    memcmp(buffer, "Hello", 5) == 0)
 
 	TEST(@"-[remoteAddress]",
 	    (address2 = sockAccepted.remoteAddress) &&
 	    OFSocketAddressIPXNetwork(address2) == network &&
-	    R(OFSocketAddressIPXNode(address2, node2)) &&
+	    R(OFSocketAddressGetIPXNode(address2, node2)) &&
 	    memcmp(node, node2, IPX_NODE_LEN) == 0)
 
 	delegate = [[[SPXSocketDelegate alloc] init] autorelease];
 
 	sockServer = [OFSPXSocket socket];
@@ -147,19 +150,19 @@
 
 	sockClient = [OFSPXSocket socket];
 	delegate->_expectedClientSocket = sockClient;
 	sockClient.delegate = delegate;
 
-	address1 = [sockServer bindToPort: 0];
+	address1 = [sockServer bindToNetwork: 0 node: zeroNode port: 0];
 	[sockServer listen];
 	[sockServer asyncAccept];
 
 	delegate->_expectedNetwork = network =
 	    OFSocketAddressIPXNetwork(&address1);
-	OFSocketAddressIPXNode(&address1, node);
+	OFSocketAddressGetIPXNode(&address1, node);
 	memcpy(delegate->_expectedNode, node, IPX_NODE_LEN);
-	delegate->_expectedPort = port = OFSocketAddressPort(&address1);
+	delegate->_expectedPort = port = OFSocketAddressIPXPort(&address1);
 
 	@try {
 		[sockClient asyncConnectToNetwork: network
 					     node: node
 					     port: port];
@@ -167,11 +170,11 @@
 		[[OFRunLoop mainRunLoop] runUntilDate:
 		    [OFDate dateWithTimeIntervalSinceNow: 2]];
 
 		TEST(@"-[asyncAccept] & -[asyncConnectToNetwork:node:port:]",
 		    delegate->_accepted && delegate->_connected)
-	} @catch (OFObserveFailedException *e) {
+	} @catch (OFObserveKernelEventsFailedException *e) {
 		switch (e.errNo) {
 		case ENOTSOCK:
 			[OFStdOut setForegroundColor: [OFColor lime]];
 			[OFStdOut writeLine:
 			    @"\r[OFSPXSocket] -[asyncAccept] & "