diff --git a/test/co-tlsv-rdr-p2p-xcdr/src/nf.rs b/test/co-tlsv-rdr-p2p-xcdr/src/nf.rs
index 2a5bd5d77..07cff10ff 100644
--- a/test/co-tlsv-rdr-p2p-xcdr/src/nf.rs
+++ b/test/co-tlsv-rdr-p2p-xcdr/src/nf.rs
@@ -178,12 +178,12 @@ pub fn tlsv_rdr_p2p_xcdr_test<T: 'static + Batch<Header = NullHeader>, S: Schedu
                 //      XCDR packet: group 3,
                 //      rest: group 0
                 if f.proto == 6 {
-                    if (f.src_ip == match_ip || f.dst_ip == match_ip)
-                        && (p2p_match_port.contains(&f.src_port) || p2p_match_port.contains(&f.dst_port))
-                    {
-                        matched = 2
-                    } else {
-                        matched = 1
+                    if (f.src_ip == match_ip || f.dst_ip == match_ip) {
+                        if (p2p_match_port.contains(&f.src_port) || p2p_match_port.contains(&f.dst_port)) {
+                            matched = 2
+                        } else {
+                            matched = 1
+                        }
                     }
                 } else if f.proto == 17
                     && ((f.src_ip == xcdr_match_src_ip
diff --git a/test/co-tlsv-rdr-p2p/src/nf.rs b/test/co-tlsv-rdr-p2p/src/nf.rs
index 4a0e020f3..1e83497cb 100644
--- a/test/co-tlsv-rdr-p2p/src/nf.rs
+++ b/test/co-tlsv-rdr-p2p/src/nf.rs
@@ -144,12 +144,12 @@ pub fn tlsv_rdr_p2p_test<T: 'static + Batch<Header = NullHeader>, S: Scheduler +
                 //      P2P packets: group 2,
                 //      rest to group 0
                 if f.proto == 6 {
-                    if (f.src_ip == match_ip || f.dst_ip == match_ip)
-                        && (p2p_match_port.contains(&f.src_port) || p2p_match_port.contains(&f.dst_port))
-                    {
-                        matched = 2
-                    } else {
-                        matched = 1
+                    if (f.src_ip == match_ip || f.dst_ip == match_ip) {
+                        if (p2p_match_port.contains(&f.src_port) || p2p_match_port.contains(&f.dst_port)) {
+                            matched = 2
+                        } else {
+                            matched = 1
+                        }
                     }
                 }
 
diff --git a/test/co-tlsv-rdr-xcdr/src/nf.rs b/test/co-tlsv-rdr-xcdr/src/nf.rs
index b90fa246d..ee7fb9a56 100644
--- a/test/co-tlsv-rdr-xcdr/src/nf.rs
+++ b/test/co-tlsv-rdr-xcdr/src/nf.rs
@@ -162,7 +162,7 @@ pub fn tlsv_rdr_xcdr_test<T: 'static + Batch<Header = NullHeader>, S: Scheduler
 
                 // Match:
                 //      TLSV/RDR packets: group 1
-                //      P2P packets: group 2
+                //      XCDR packets: group 2
                 //      rest: group 0
                 if f.proto == 6 {
                     if f.src_ip == match_ip || f.dst_ip == match_ip {