diff --git a/runtime/nb_runtime.h b/runtime/nb_runtime.h
index 1098652..44fa07e 100644
--- a/runtime/nb_runtime.h
+++ b/runtime/nb_runtime.h
@@ -66,12 +66,10 @@ void nb__ipc_deinit();
 void nb__mlx5_init(const char* name);
 
 
-/*
 char* nb__request_send_buffer(void);
 void* nb__return_send_buffer(char*);
 void nb__linux_runtime_init(const char* iface);
 void nb__linux_runtime_deinit(void);
-*/
 
 // Generated protocol API
 void nb__run_ingress_step (void*, int);
diff --git a/test/test_simple_linux/client.c b/test/test_simple_linux/client.c
index 4e20b0a..7c66856 100644
--- a/test/test_simple_linux/client.c
+++ b/test/test_simple_linux/client.c
@@ -25,8 +25,6 @@ int main(int argc, char* argv[]) {
 	nb__linux_runtime_init("dummy0");
 	printf("Linux Runtime initialized\n");
 
-	nb__net_init();
-
 	unsigned long long server_id_i = 0;
 	unsigned long long client_id_i = 0;
 	memcpy(&server_id_i, server_id, sizeof(server_id));
@@ -34,6 +32,8 @@ int main(int argc, char* argv[]) {
 
 	nb__my_host_id = client_id_i;
 
+	nb__net_init();
+
 	nb__connection_t * conn = nb__establish(server_id_i, 8080, 8081, callback);
 	
 	nb__send(conn, CLIENT_MSG, sizeof(CLIENT_MSG));
diff --git a/test/test_simple_linux/server.c b/test/test_simple_linux/server.c
index 1dfaf25..6af636f 100644
--- a/test/test_simple_linux/server.c
+++ b/test/test_simple_linux/server.c
@@ -23,7 +23,6 @@ static void callback(int event, nb__connection_t * c) {
 int main(int argc, char* argv[]) {
 	nb__linux_runtime_init("dummy0");
 	printf("Linux Runtime initialized\n");
-	nb__net_init();
 
 	unsigned long long server_id_i = 0;
 	unsigned long long client_id_i = 0;
@@ -32,6 +31,8 @@ int main(int argc, char* argv[]) {
 
 	nb__my_host_id = server_id_i;
 
+	nb__net_init();
+
 	nb__connection_t * conn = nb__establish(client_id_i, 8081, 8080, callback);
 
 	while (running) {