diff --git a/src/python_testing/TC_DeviceBasicComposition.py b/src/python_testing/TC_DeviceBasicComposition.py
index 161fa3f07c6aee..ecd2c760b2f920 100644
--- a/src/python_testing/TC_DeviceBasicComposition.py
+++ b/src/python_testing/TC_DeviceBasicComposition.py
@@ -592,12 +592,14 @@ class RequiredMandatoryAttribute:
                                                      attribute_id=manufacturer_value)
                     if suffix > attribute_standard_range_max and suffix < global_range_min:
                         self.record_error(self.get_test_name(), location=location,
-                                          problem=f"Manufacturer attribute in undefined range {manufacturer_value} in cluster {cluster_id}",
+                                          problem=f"Manufacturer attribute in undefined range {
+                                              manufacturer_value} in cluster {cluster_id}",
                                           spec_location=f"Cluster {cluster_id}")
                         success = False
                     elif suffix >= global_range_min:
                         self.record_error(self.get_test_name(), location=location,
-                                          problem=f"Manufacturer attribute in global range {manufacturer_value} in cluster {cluster_id}",
+                                          problem=f"Manufacturer attribute in global range {
+                                              manufacturer_value} in cluster {cluster_id}",
                                           spec_location=f"Cluster {cluster_id}")
                         success = False
 
@@ -692,25 +694,25 @@ def test_TC_IDM_11_1(self):
         if not success:
             self.fail_current_test("At least one attribute string was not valid UTF-8")
 
-    def test_all_event_strings_valid(self):
-        asserts.skip("TODO: Validate every string in the read events is valid UTF-8 and has no nulls")
+    # def test_all_event_strings_valid(self):
+    #     asserts.skip("TODO: Validate every string in the read events is valid UTF-8 and has no nulls")
 
-    def test_all_schema_scalars(self):
-        asserts.skip("TODO: Validate all int/uint are in range of the schema (or null if nullable) for known attributes")
+    # def test_all_schema_scalars(self):
+    #     asserts.skip("TODO: Validate all int/uint are in range of the schema (or null if nullable) for known attributes")
 
-    def test_all_commands_reported_are_executable(self):
-        asserts.skip("TODO: Validate all commands reported in AcceptedCommandList are actually executable")
+    # def test_all_commands_reported_are_executable(self):
+    #     asserts.skip("TODO: Validate all commands reported in AcceptedCommandList are actually executable")
 
-    def test_dump_all_pics_for_all_endpoints(self):
-        asserts.skip("TODO: Make a test that generates the basic PICS list for each endpoint based on actually reported contents")
+    # def test_dump_all_pics_for_all_endpoints(self):
+    #     asserts.skip("TODO: Make a test that generates the basic PICS list for each endpoint based on actually reported contents")
 
-    def test_all_schema_mandatory_elements_present(self):
-        asserts.skip(
-            "TODO: Make a test that ensures every known cluster has the mandatory elements present (commands, attributes) based on features")
+    # def test_all_schema_mandatory_elements_present(self):
+    #     asserts.skip(
+    #         "TODO: Make a test that ensures every known cluster has the mandatory elements present (commands, attributes) based on features")
 
-    def test_all_endpoints_have_valid_composition(self):
-        asserts.skip(
-            "TODO: Make a test that verifies each endpoint has valid set of device types, and that the device type conformance is respected for each")
+    # def test_all_endpoints_have_valid_composition(self):
+    #     asserts.skip(
+    #         "TODO: Make a test that verifies each endpoint has valid set of device types, and that the device type conformance is respected for each")
 
     def test_TC_SM_1_2(self):
         self.print_step(1, "Wildcard read of device - already done")
@@ -896,7 +898,8 @@ def record_problems(problems):
             for ep, problem in problems.items():
                 location = AttributePathLocation(endpoint_id=ep, cluster_id=Clusters.Descriptor.id,
                                                  attribute_id=Clusters.Descriptor.Attributes.TagList.attribute_id)
-                msg = f'problem on ep {ep}: missing feature = {problem.missing_feature}, missing attribute = {problem.missing_attribute}, duplicates = {problem.duplicates}, same_tags = {problem.same_tag}'
+                msg = f'problem on ep {ep}: missing feature = {problem.missing_feature}, missing attribute = {
+                    problem.missing_attribute}, duplicates = {problem.duplicates}, same_tags = {problem.same_tag}'
                 self.record_error(self.get_test_name(), location=location, problem=msg, spec_location="Descriptor TagList")
 
         record_problems(problems)