diff --git a/src/pkt_normalizer.c b/src/pkt_normalizer.c
index 239209d..12e3358 100644
--- a/src/pkt_normalizer.c
+++ b/src/pkt_normalizer.c
@@ -48,10 +48,7 @@ struct PKTNORM* pn_init(struct ETCP_CONN* etcp) {
     }
 
     queue_set_callback(pn->input, packer_cb, pn);
-    
-    // Setup etcp_recv callback for output queue - handles all received packets
-    // according to etcp_api protocol (routes by first byte ID)
-    queue_set_callback(pn->output, etcp_recv, etcp);
+    queue_set_callback(etcp->output_queue, pn_unpacker_cb, pn);
 
     pn->data = NULL;
     pn->recvpart = NULL;
diff --git a/tests/test_etcp_100_packets b/tests/test_etcp_100_packets
index 97e0509..d0c7dcf 100755
Binary files a/tests/test_etcp_100_packets and b/tests/test_etcp_100_packets differ
diff --git a/tests/test_etcp_minimal b/tests/test_etcp_minimal
index f906134..668330a 100755
Binary files a/tests/test_etcp_minimal and b/tests/test_etcp_minimal differ
diff --git a/tests/test_etcp_simple_traffic b/tests/test_etcp_simple_traffic
index de83a0a..2c3ce11 100755
Binary files a/tests/test_etcp_simple_traffic and b/tests/test_etcp_simple_traffic differ
diff --git a/tests/test_etcp_two_instances b/tests/test_etcp_two_instances
index 96175c6..fef0290 100755
Binary files a/tests/test_etcp_two_instances and b/tests/test_etcp_two_instances differ
diff --git a/tests/test_pkt_normalizer_etcp b/tests/test_pkt_normalizer_etcp
index a8c06aa..334282c 100755
Binary files a/tests/test_pkt_normalizer_etcp and b/tests/test_pkt_normalizer_etcp differ
diff --git a/tests/test_pkt_normalizer_standalone b/tests/test_pkt_normalizer_standalone
index f09ac33..2dd2767 100755
Binary files a/tests/test_pkt_normalizer_standalone and b/tests/test_pkt_normalizer_standalone differ