diff --git a/statediff/indexer/database/file/indexer_shared_test.go b/statediff/indexer/database/file/indexer_shared_test.go
index f38ff0507..16e82a6cc 100644
--- a/statediff/indexer/database/file/indexer_shared_test.go
+++ b/statediff/indexer/database/file/indexer_shared_test.go
@@ -687,8 +687,12 @@ func testPublishAndIndexStorageIPLDs(t *testing.T) {
 		t.Fatal(err)
 	}
 	require.Equal(t, 3, len(storageNodes))
-	expectedStorageNodes := []models.StorageNodeWithStateKeyModel{
-		{
+	gotStorageNodes := make(map[string]models.StorageNodeWithStateKeyModel, 3)
+	for _, model := range storageNodes {
+		gotStorageNodes[model.StorageKey] = model
+	}
+	expectedStorageNodes := map[string]models.StorageNodeWithStateKeyModel{
+		common.BytesToHash(mocks.RemovedLeafKey).Hex(): {
 			BlockNumber: mocks.BlockNumber.String(),
 			CID:         shared.RemovedNodeStorageCID,
 			NodeType:    3,
@@ -696,7 +700,7 @@ func testPublishAndIndexStorageIPLDs(t *testing.T) {
 			StateKey:    common.BytesToHash(mocks.ContractLeafKey).Hex(),
 			Path:        []byte{'\x03'},
 		},
-		{
+		common.BytesToHash(mocks.Storage2LeafKey).Hex(): {
 			BlockNumber: mocks.BlockNumber.String(),
 			CID:         shared.RemovedNodeStorageCID,
 			NodeType:    3,
@@ -704,7 +708,7 @@ func testPublishAndIndexStorageIPLDs(t *testing.T) {
 			StateKey:    common.BytesToHash(mocks.Contract2LeafKey).Hex(),
 			Path:        []byte{'\x0e'},
 		},
-		{
+		common.BytesToHash(mocks.Storage3LeafKey).Hex(): {
 			BlockNumber: mocks.BlockNumber.String(),
 			CID:         shared.RemovedNodeStorageCID,
 			NodeType:    3,
@@ -713,15 +717,15 @@ func testPublishAndIndexStorageIPLDs(t *testing.T) {
 			Path:        []byte{'\x0f'},
 		},
 	}
-	for idx, storageNode := range storageNodes {
-		require.Equal(t, expectedStorageNodes[idx], storageNode)
+	for storageKey, storageNode := range gotStorageNodes {
+		require.Equal(t, expectedStorageNodes[storageKey], storageNode)
 		dc, err = cid.Decode(storageNode.CID)
 		if err != nil {
 			t.Fatal(err)
 		}
 		mhKey = dshelp.MultihashToDsKey(dc.Hash())
 		prefixedKey = blockstore.BlockPrefix.String() + mhKey.String()
-		require.Equal(t, shared.RemovedNodeMhKey, prefixedKey, mocks.BlockNumber.Uint64())
+		require.Equal(t, shared.RemovedNodeMhKey, prefixedKey)
 		err = sqlxdb.Get(&data, ipfsPgGet, prefixedKey, mocks.BlockNumber.Uint64())
 		if err != nil {
 			t.Fatal(err)
diff --git a/statediff/indexer/database/sql/pgx_indexer_test.go b/statediff/indexer/database/sql/pgx_indexer_test.go
index 79d3ae252..9087578e4 100644
--- a/statediff/indexer/database/sql/pgx_indexer_test.go
+++ b/statediff/indexer/database/sql/pgx_indexer_test.go
@@ -548,8 +548,12 @@ func TestPGXIndexer(t *testing.T) {
 			t.Fatal(err)
 		}
 		require.Equal(t, 3, len(storageNodes))
-		expectedStorageNodes := []models.StorageNodeWithStateKeyModel{
-			{
+		gotStorageNodes := make(map[string]models.StorageNodeWithStateKeyModel, 3)
+		for _, model := range storageNodes {
+			gotStorageNodes[model.StorageKey] = model
+		}
+		expectedStorageNodes := map[string]models.StorageNodeWithStateKeyModel{
+			common.BytesToHash(mocks.RemovedLeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -557,7 +561,7 @@ func TestPGXIndexer(t *testing.T) {
 				StateKey:    common.BytesToHash(mocks.ContractLeafKey).Hex(),
 				Path:        []byte{'\x03'},
 			},
-			{
+			common.BytesToHash(mocks.Storage2LeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -565,7 +569,7 @@ func TestPGXIndexer(t *testing.T) {
 				StateKey:    common.BytesToHash(mocks.Contract2LeafKey).Hex(),
 				Path:        []byte{'\x0e'},
 			},
-			{
+			common.BytesToHash(mocks.Storage3LeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -574,8 +578,8 @@ func TestPGXIndexer(t *testing.T) {
 				Path:        []byte{'\x0f'},
 			},
 		}
-		for idx, storageNode := range storageNodes {
-			require.Equal(t, expectedStorageNodes[idx], storageNode)
+		for storageKey, storageNode := range gotStorageNodes {
+			require.Equal(t, expectedStorageNodes[storageKey], storageNode)
 			dc, err = cid.Decode(storageNode.CID)
 			if err != nil {
 				t.Fatal(err)
diff --git a/statediff/indexer/database/sql/sqlx_indexer_test.go b/statediff/indexer/database/sql/sqlx_indexer_test.go
index a2bf0afd4..f894660a7 100644
--- a/statediff/indexer/database/sql/sqlx_indexer_test.go
+++ b/statediff/indexer/database/sql/sqlx_indexer_test.go
@@ -541,8 +541,12 @@ func TestSQLXIndexer(t *testing.T) {
 			t.Fatal(err)
 		}
 		require.Equal(t, 3, len(storageNodes))
-		expectedStorageNodes := []models.StorageNodeWithStateKeyModel{
-			{
+		gotStorageNodes := make(map[string]models.StorageNodeWithStateKeyModel, 3)
+		for _, model := range storageNodes {
+			gotStorageNodes[model.StorageKey] = model
+		}
+		expectedStorageNodes := map[string]models.StorageNodeWithStateKeyModel{
+			common.BytesToHash(mocks.RemovedLeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -550,7 +554,7 @@ func TestSQLXIndexer(t *testing.T) {
 				StateKey:    common.BytesToHash(mocks.ContractLeafKey).Hex(),
 				Path:        []byte{'\x03'},
 			},
-			{
+			common.BytesToHash(mocks.Storage2LeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -558,7 +562,7 @@ func TestSQLXIndexer(t *testing.T) {
 				StateKey:    common.BytesToHash(mocks.Contract2LeafKey).Hex(),
 				Path:        []byte{'\x0e'},
 			},
-			{
+			common.BytesToHash(mocks.Storage3LeafKey).Hex(): {
 				BlockNumber: mocks.BlockNumber.String(),
 				CID:         shared.RemovedNodeStorageCID,
 				NodeType:    3,
@@ -567,8 +571,8 @@ func TestSQLXIndexer(t *testing.T) {
 				Path:        []byte{'\x0f'},
 			},
 		}
-		for idx, storageNode := range storageNodes {
-			require.Equal(t, expectedStorageNodes[idx], storageNode)
+		for storageKey, storageNode := range gotStorageNodes {
+			require.Equal(t, expectedStorageNodes[storageKey], storageNode)
 			dc, err = cid.Decode(storageNode.CID)
 			if err != nil {
 				t.Fatal(err)