diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
index 046d180bf6c9ac..c6ada24db3962f 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
@@ -11,9 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+# 
 # SPECS:
 # https://github.com/CHIP-Specifications/chip-test-plans/blob/master/src/cluster/colorcontrol.adoc
+
 name: 25.3.1. [TC-CC-3.1] Hue MoveTo functionality with server as DUT
 
 PICS:
@@ -100,10 +101,10 @@ tests:
               - name: "ms"
                 value: 10000
 
+    - label: "Step 2c: TH reads CurrentHue attribute from DUT"
     # Values computed for shortest distance (Direction=0x00): 
     # current_hue = last_hue + (final_hue - initial_hue) * wait_in_secs / transition_time_in_secs
     # current_hue = 60 + (120 - 60) * 10 / 30 => 80 +/-15% => (68, 92)
-    - label: "Step 2c: TH reads CurrentHue attribute from DUT"
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -121,8 +122,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 80 + (120 - 60) * 10 / 30 => 100 +/- 15% => (85, 115)
     - label: "Step 2d: TH reads CurrentHue attribute from DUT"
+    # current_hue = 80 + (120 - 60) * 10 / 30 => 100 +/- 15% => (85, 115)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -140,8 +141,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 100 + (120 - 60) * 10 / 30 => 120 +/-15% => (102, 138)
     - label: "Step 2e: TH reads CurrentHue attribute from DUT"
+    # current_hue = 100 + (120 - 60) * 10 / 30 => 120 +/-15% => (102, 138)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -159,8 +160,8 @@ tests:
               - name: "ms"
                 value: 5000
 
-    # keeps final Hue
     - label: "Step 2f: H reads CurrentHue attribute from DUT"
+    # keeps final Hue
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -223,12 +224,12 @@ tests:
               - name: "ms"
                 value: 5000
 
+    - label: "Step 3c: TH reads CurrentHue attribute from DUT"
     # Values computed for longest distance (Direction=0x01): 
     # variation = [initial_hue + (255 - final_hue)] * wait_in_secs / transition_time_in_secs
     # variation = [60 + (255 - 135)] * 5 / 30 => 30
     # current_hue = last_hue - variation
     # current_hue = 60 - 30 = 30 +/-15% => (25, 35)
-    - label: "Step 3c: TH reads CurrentHue attribute from DUT"
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -246,12 +247,12 @@ tests:
               - name: "ms"
                 value: 15000
 
+    - label: "Step 3d: TH reads CurrentHue attribute from DUT"
     # Values computed for longest distance (Direction=0x01): 
     # variation = [initial_hue + (255 - final_hue)] * wait_in_secs / transition_time_in_secs
     # variation = [60 + (255 - 135)] * 15 / 30 => 90
     # current_hue = last_hue - variation
     # current_hue = 30 - 90 (underflow) => 255 - 60 = 195 +/-15% => (165, 225)
-    - label: "Step 3d: TH reads CurrentHue attribute from DUT"
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -269,12 +270,12 @@ tests:
               - name: "ms"
                 value: 10000
 
+    - label: "Step 3e: TH reads CurrentHue attribute from DUT"
     # Values computed for longest distance (Direction=0x01): 
     # variation = [initial_hue + (255 - final_hue)] * wait_in_secs / transition_time_in_secs
     # variation = [60 + (255 - 135)] * 10 / 30 => 60
     # current_hue = last_hue - variation
     # current_hue = 195 - 60 = 135 +/-15% => (115, 155)
-    - label: "Step 3e: TH reads CurrentHue attribute from DUT"
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -355,8 +356,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 60 + (120 - 60) * 10 / 30 => 80 +/-15% => (68, 92)
     - label: "Step 4c: TH reads CurrentHue attribute from DUT"
+    # current_hue = 60 + (120 - 60) * 10 / 30 => 80 +/-15% => (68, 92)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -374,8 +375,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 80 + (120 - 60) * 10 / 30 => 100 +/-15% => (85, 115)
     - label: "Step 4d: TH reads CurrentHue attribute from DUT"
+    # current_hue = 80 + (120 - 60) * 10 / 30 => 100 +/-15% => (85, 115)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -393,8 +394,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 100 + (120 - 60) * 10 / 30 => 120 +/-15% => (102, 138)
     - label: "Step 4e: TH reads CurrentHue attribute from DUT"
+    # current_hue = 100 + (120 - 60) * 10 / 30 => 120 +/-15% => (102, 138)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -412,8 +413,8 @@ tests:
               - name: "ms"
                 value: 5000
 
-    # keeps final Hue
     - label: "Step 4f: TH reads CurrentHue attribute from DUT"
+    # keeps final Hue
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -476,8 +477,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 120 - (120 - 60) * 10 / 30 => 100 +/-15% => (85, 115)
     - label: "Step 5c: TH reads CurrentHue attribute from DUT"
+    # current_hue = 120 - (120 - 60) * 10 / 30 => 100 +/-15% => (85, 115)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -495,8 +496,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 100 - (120 - 60) * 10 / 30 => 80 +/-15% => (68, 92)
     - label: "Step 5d: TH reads CurrentHue attribute from DUT"
+    # current_hue = 100 - (120 - 60) * 10 / 30 => 80 +/-15% => (68, 92)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -514,8 +515,8 @@ tests:
               - name: "ms"
                 value: 10000
 
-    # current_hue = 80 - (120 - 60) * 10 / 30 => 60 +/-15% => (51, 69)
     - label: "Step 5e: TH reads CurrentHue attribute from DUT"
+    # current_hue = 80 - (120 - 60) * 10 / 30 => 60 +/-15% => (51, 69)
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"
@@ -533,8 +534,8 @@ tests:
               - name: "ms"
                 value: 5000
 
-    # keeps final Hue
     - label: "Step 5f: TH reads CurrentHue attribute from DUT"
+    # keeps final Hue
       PICS: CC.S.F00 && CC.S.A0000
       command: "readAttribute"
       attribute: "CurrentHue"