diff --git a/src/test_data.py b/src/test_data.py
index 4a8befe5..1ce2cf89 100644
--- a/src/test_data.py
+++ b/src/test_data.py
@@ -22,12 +22,12 @@ SAMPLE_INPUTS = [
     {"description": "Email format", "value": "user@example.com"},
     {"description": "URL format", "value": "http://example.com"},
     {"description": "Date and time in ISO format", "value": "2023-11-01T12:00:00Z"},
-    # {"description": "String with escaped quotes", "value": '"Escaped" \\"quotes\\"'}, # https://github.com/waku-org/nwaku/issues/3572
+    {"description": "String with escaped quotes", "value": '"Escaped" \\"quotes\\"'},
     {"description": "A regular expression", "value": "Regular expression: ^[a-z0-9_-]{3,16}$"},
     {"description": "A very long string", "value": "x" * 1000},
     {"description": "A JSON string", "value": '{"name": "John", "age": 30, "city": "New York"}'},
     {"description": "A Unix path", "value": "/usr/local/bin"},
-    # {"description": "A Windows path", "value": "C:\\Windows\\System32"},  # https://github.com/waku-org/nwaku/issues/3572
+    {"description": "A Windows path", "value": "C:\\Windows\\System32"},
     {"description": "An SQL query", "value": "SELECT * FROM users WHERE id = 1;"},
     {"description": "JavaScript code snippet", "value": "function test() { console.log('Hello World'); }"},
     {"description": "A CSS snippet", "value": "body { background-color: #fff; }"},
@@ -203,14 +203,6 @@ METRICS_WITH_INITIAL_VALUE_ZERO = [
     "libp2p_failed_dials_total",
     "waku_rln_messages_total_total",
     "waku_rln_spam_messages_total_total",
-    "waku_rln_valid_messages_total_sum",
-    "waku_rln_valid_messages_total_count",
-    'waku_rln_valid_messages_total_bucket{le="10.0"}',
-    'waku_rln_valid_messages_total_bucket{le="20.0"}',
-    'waku_rln_valid_messages_total_bucket{le="30.0"}',
-    'waku_rln_valid_messages_total_bucket{le="40.0"}',
-    'waku_rln_valid_messages_total_bucket{le="50.0"}',
-    'waku_rln_valid_messages_total_bucket{le="+Inf"}',
     "waku_rln_proof_verification_total_total",
     "waku_rln_number_registered_memberships",
     "waku_rln_proof_verification_duration_seconds",
diff --git a/tests/peer_connection_management/test_peer_store.py b/tests/peer_connection_management/test_peer_store.py
index 43c1314a..fb265db9 100644
--- a/tests/peer_connection_management/test_peer_store.py
+++ b/tests/peer_connection_management/test_peer_store.py
@@ -47,7 +47,7 @@ class TestPeerStore(StepsRelay, StepsStore):
                 multiaddr = peer_info2multiaddr(peer_info, nodes[i].is_nwaku())
                 peers_multiaddr.add(multiaddr)
 
-        assert len(peers_multiaddr) == 5, f"Exactly 5 multi addresses are expected"
+        assert len(peers_multiaddr) >= 5, "At least 5 multi addresses are expected"
 
         # Add peers one by one excluding self for Nodes 2-5
         for i in range(1, 5):