diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
index 1b1872cc4850ee..d3d9dcb2f04581 100644
--- a/examples/darwin-framework-tool/templates/tests/ciTests.json
+++ b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -56,11 +56,6 @@
         "Test_TC_TCTL_2_1",
         "Disabled because darwin-framework-tool does not support constraints arithmetic operations",
         "Test_TC_FLW_2_1",
-        "Test_TC_RH_2_1",
-        "Test_TC_S_1_1",
-        "Test_TC_S_2_1",
-        "Test_TC_S_2_2",
-        "Test_TC_S_2_3",
-        "Test_TC_S_2_4"
+        "Test_TC_RH_2_1"
     ]
 }
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index c16d1f2259850a..b665402846255f 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -175,6 +175,7 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
         "Test_TC_ACE_1_6.yaml",    # Test fails only in chip-repl: Refer--> https://github.com/project-chip/connectedhomeip/pull/27910#issuecomment-1632485584
         "Test_TC_IDM_1_2.yaml",              # chip-repl does not support AnyCommands (19/07/2023)
         "TestGroupKeyManagementCluster.yaml",  # chip-repl does not support EqualityCommands (2023-08-04)
+        "Test_TC_S_2_2.yaml",              # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_2.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_3.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
index a63a94b08262e9..b2b65dadf72d61 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -23,14 +23,18 @@ config:
     cluster: "Scenes"
     endpoint: 1
     G1:
-        type: int16u
+        type: group_id
         defaultValue: 0x0001
     G2:
-        type: int16u
+        type: group_id
         defaultValue: 0x0002
 
-    GroupKeyManagement.Endpoint: 0
-    Groups.Endpoint: 1
+    GroupKeyManagement.Endpoint: 
+        type: int16u
+        defaultValue: 0
+    Groups.Endpoint: 
+        type: int16u
+        defaultValue: 0
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -1033,7 +1037,7 @@ tests:
       response:
           values:
               - name: "Status"
-                saveAs: StoreStatus
+                saveAs: StoredStatus
                 constraints:
                     anyOf: [0x00, 0x89]
               - name: "GroupID"
@@ -1052,16 +1056,16 @@ tests:
               - name: "Value1"
                 value: 0x00
               - name: "Value2"
-                value: StoreStatus
+                value: StoredStatus
       response:
           - values:
                 - name: "Equals"
-                  saveAs: ContinueTest
+                  saveAs: ContinueStep14
 
     - label:
           "Step 14c: TH sends a GetSceneMembership command to DUT with the
           GroupID field set to G2."
-      runIf: ContinueTest
+      runIf: ContinueStep14
       PICS: S.S.C06.Rsp
       command: "GetSceneMembership"
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
index b91f6eee39f3e3..531066a5b7d9b3 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -23,9 +23,12 @@ config:
     cluster: "Scenes"
     endpoint: 1
     G1:
-        type: int16u
+        type: group_id 
         defaultValue: 0x0101
-    GroupKeyManagement.Endpoint: 0
+    
+    GroupKeyManagement.Endpoint: 
+        type: int16u
+        defaultValue: 0
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
index 12657fc8dd8cce..f40f5bdc53c3a6 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
@@ -21,13 +21,14 @@ PICS:
 config:
     nodeId: 0x12344321
     cluster: "Scenes"
-    endpoint: 1
-
-    GroupKeyManagement.Endpoint: 0
+    endpoint: 1    
     G1:
-        type: int16u
+        type: group_id
         defaultValue: 0x0001
-    Groups.Endpoint: 1
+
+    GroupKeyManagement.Endpoint:
+        type: int16u
+        defaultValue: 0
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -72,7 +73,6 @@ tests:
     - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
-      endpoint: Groups.Endpoint
       command: "RemoveAllGroups"
 
     - label: