diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
index f239a96a573aaf..dfa1dbcf72fcc1 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
@@ -84,7 +84,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=1"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           +   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
index c5276bb8389901..f9768b43d93817 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
@@ -89,7 +89,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=2"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           grl@grl-ThinkPad-L480:~/2nd_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           + wlp5s0 IPv6 C326228BDB082BF4                              _matterc._udp        local
@@ -261,7 +261,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=1"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
           ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           +   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
           =   eth0 IPv6 2664ED6939FC373C                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
index d69ce2a188ee77..448772975c016a 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
@@ -187,7 +187,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=1"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
           grl@grl-ThinkPad-L480:~/2nd_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           + wlp5s0 IPv6 C326228BDB082BF4                              _matterc._udp        local
           + wlp5s0 IPv6 7B6545A75C5330BE                              _matterc._udp        local
@@ -350,7 +350,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=2"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
           grl@grl-ThinkPad-L480:~/2nd_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           + wlp5s0 IPv6 C326228BDB082BF4                              _matterc._udp        local
           + wlp5s0 IPv6 7B6545A75C5330BE                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
index 2ea6cab8c6e968..86bdb60ead19b6 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
@@ -83,7 +83,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=2"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           avahi-browse -rt _matterc._udp
 
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
index b4a947fcbe2ebe..8e97818764bb3f 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
@@ -75,7 +75,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=1"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           +   eth0 IPv6 B2822245F1F43570                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
index 4e52c0a792320a..59b582fedb35a9 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
@@ -94,7 +94,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=2"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$  avahi-browse -rt _matterc._udp
           +   eth0 IPv6 B755245DE9E5E186                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
index c65d94fe1d2540..50f37c402ac0a9 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
@@ -82,7 +82,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=1"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$ avahi-browse -rt _matterc._udp
           +   eth0 IPv6 05EB1D3652D2F544                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
index 65ec3d6470bbbe..aaedd3de548812 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
@@ -94,7 +94,7 @@ tests:
     #Check for DNS-SD advertisement CM is not possible in YAML
     - label: "Verify that the DNS-SD advertisement shows CM=2"
       verification: |
-          On TH_CR1 send the below command  
+          On TH_CR1 send the below command
 
           "ubuntu@ubuntu:~/may16_cntrl/connectedhomeip/examples/chip-tool/out/debug$  avahi-browse -rt _matterc._udp
           +   eth0 IPv6 B755245DE9E5E186                              _matterc._udp        local
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
index 1061ca740bcc98..f2cba95fa0385f 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -165,7 +165,7 @@ tests:
           Please use Interactive mode to Verify subscription test cases
           Here the command to enter interactive mode:--   ./chip-tool interactive start
 
-          generaldiagnostics subscribe  active-hardware-faults 0 100 1 0 
+          generaldiagnostics subscribe  active-hardware-faults 0 100 1 0
 
           Verify in TH(chip-tool) log