diff --git a/pkg/pubsub/node_event_tracker_test.go b/pkg/pubsub/node_event_tracker_test.go
new file mode 100644
index 00000000..0aaa6b3f
--- /dev/null
+++ b/pkg/pubsub/node_event_tracker_test.go
@@ -0,0 +1,218 @@
+package pubsub
+
+import (
+	"context"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/multiformats/go-multiaddr"
+	"testing"
+	"time"
+
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNodeEventTracker(t *testing.T) {
+	t.Run("Connected with nil network", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		tracker.Connected(nil, nil)
+		// Should not panic and return early
+	})
+
+	t.Run("Connected with non-existent node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+
+		// Should return early without adding to buffer since node doesn't exist
+		_, exists := tracker.ConnectBuffer[testPeerID.String()]
+		assert.False(t, exists)
+	})
+
+	t.Run("Connected with existing active node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+
+		// Add existing active node
+		nodeData := &NodeData{
+			PeerId:   testPeerID,
+			IsActive: true,
+		}
+		tracker.nodeData.Set(testPeerID.String(), nodeData)
+
+		// Call Connected
+		tracker.Connected(nil, &testConn{peerId: testPeerID})
+
+		// Should be added to buffer
+		buffered, exists := tracker.ConnectBuffer[testPeerID.String()]
+		assert.True(t, exists)
+		assert.Equal(t, nodeData, buffered.NodeData)
+		assert.False(t, buffered.ConnectTime.IsZero())
+	})
+
+	t.Run("Connected with existing inactive node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+
+		// Add existing inactive node
+		nodeData := &NodeData{
+			PeerId:   testPeerID,
+			IsActive: false,
+		}
+		tracker.nodeData.Set(testPeerID.String(), nodeData)
+
+		// Call Connected
+		tracker.Connected(nil, &testConn{peerId: testPeerID})
+
+		// Should be marked as active and updated
+		updated, exists := tracker.nodeData.Get(testPeerID.String())
+		assert.True(t, exists)
+		assert.True(t, updated.IsActive)
+		assert.Equal(t, "1.0.0", updated.Version)
+	})
+
+	t.Run("Disconnected with nil network", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		//tracker.Disconnected(nil, nil)
+
+		// Should not panic and return early
+		assert.Empty(t, tracker.ConnectBuffer)
+
+	})
+
+	t.Run("Disconnected with non-existent node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+		tracker.Disconnected(nil, &testConn{peerId: testPeerID})
+		// Should return early since node doesn't exist
+	})
+
+	t.Run("Disconnected with buffered node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+
+		// Add node data and buffer entry
+		nodeData := &NodeData{
+			PeerId:   testPeerID,
+			IsActive: true,
+		}
+		tracker.nodeData.Set(testPeerID.String(), nodeData)
+		tracker.ConnectBuffer[testPeerID.String()] = ConnectBufferEntry{
+			NodeData:    nodeData,
+			ConnectTime: time.Now(),
+		}
+
+		// Create channel to receive node data
+		received := make(chan *NodeData, 1)
+		go func() {
+			data := <-tracker.NodeDataChan
+			received <- data
+		}()
+
+		tracker.Disconnected(nil, &testConn{peerId: testPeerID})
+
+		// Buffer entry should be removed
+		_, exists := tracker.ConnectBuffer[testPeerID.String()]
+		assert.False(t, exists)
+
+		// Should receive updated node data
+		select {
+		case data := <-received:
+			assert.Equal(t, testPeerID, data.PeerId)
+			assert.True(t, data.IsActive) // Will be active because Joined is called after Left
+		case <-time.After(time.Second):
+			t.Fatal("Timeout waiting for node data")
+		}
+	})
+
+	t.Run("Disconnected with non-buffered node", func(t *testing.T) {
+		tracker := NewNodeEventTracker("1.0.0", "test", "host1")
+		testPeerID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC")
+
+		// Add node data without buffer entry
+		nodeData := &NodeData{
+			PeerId:   testPeerID,
+			IsActive: true,
+		}
+		tracker.nodeData.Set(testPeerID.String(), nodeData)
+
+		// Create channel to receive node data
+		received := make(chan *NodeData, 1)
+		go func() {
+			data := <-tracker.NodeDataChan
+			received <- data
+		}()
+
+		tracker.Disconnected(nil, &testConn{peerId: testPeerID})
+
+		// Should receive updated node data
+		select {
+		case data := <-received:
+			assert.Equal(t, testPeerID, data.PeerId)
+			assert.False(t, data.IsActive)
+			assert.Equal(t, ActivityLeft, data.Activity)
+		case <-time.After(time.Second):
+			t.Fatal("Timeout waiting for node data")
+		}
+	})
+}
+
+// Simple test connection that just returns a peer ID
+// Simple test connection that implements the network.Conn interface
+type testConn struct {
+	peerId peer.ID
+}
+
+func (c *testConn) Close() error {
+	return nil
+}
+
+func (c *testConn) LocalPeer() peer.ID {
+	testID, _ := peer.Decode("QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKD")
+	return testID
+}
+
+func (c *testConn) RemotePublicKey() crypto.PubKey {
+	return nil
+}
+
+func (c *testConn) ConnState() network.ConnectionState {
+	return network.ConnectionState{}
+}
+
+func (c *testConn) LocalMultiaddr() multiaddr.Multiaddr {
+	addr, _ := multiaddr.NewMultiaddr("/ip4/127.0.0.1/tcp/4001")
+	return addr
+}
+
+func (c *testConn) RemoteMultiaddr() multiaddr.Multiaddr {
+	addr, _ := multiaddr.NewMultiaddr("/ip4/127.0.0.1/tcp/4002")
+	return addr
+}
+
+func (c *testConn) Stat() network.ConnStats {
+	return network.ConnStats{}
+}
+
+func (c *testConn) Scope() network.ConnScope {
+	return nil
+}
+
+func (c *testConn) ID() string {
+	return "test-conn-id"
+}
+
+func (c *testConn) NewStream(ctx context.Context) (network.Stream, error) {
+	return nil, nil
+}
+
+func (c *testConn) GetStreams() []network.Stream {
+	return nil
+}
+
+func (c *testConn) IsClosed() bool {
+	return false
+}
+
+func (c *testConn) RemotePeer() peer.ID {
+	return c.peerId
+}