diff --git a/extended/code_update/test_image_upload.robot b/extended/code_update/test_image_upload.robot
index 2fc615f..e6bf7ef 100644
--- a/extended/code_update/test_image_upload.robot
+++ b/extended/code_update/test_image_upload.robot
@@ -32,131 +32,119 @@
 *** Test Cases ***
 
 Upload Host Image Via REST
-    # Image File Path
-
-    ${PNOR_IMAGE_FILE_PATH}
-
     [Documentation]  Upload a PNOR image via REST.
-    [Template]  Upload Image Via REST And Verify Success
     [Tags]  Upload_Host_Image_Via_REST
+    [Template]  Upload Image Via REST And Verify Success
+
+    # Image File Path
+    ${PNOR_IMAGE_FILE_PATH}
 
 
 Upload BMC Image Via REST
-    # Image File Path
-
-    ${BMC_IMAGE_FILE_PATH}
-
     [Documentation]  Upload a BMC image via REST.
-    [Template]  Upload Image Via REST And Verify Success
     [Tags]  Upload_BMC_Image_Via_REST
+    [Template]  Upload Image Via REST And Verify Success
+
+    # Image File Path
+    ${BMC_IMAGE_FILE_PATH}
 
 
 Upload Host Image Via TFTP
-    # Image File Path
-
-    ${PNOR_TFTP_FILE_NAME}
-
     [Documentation]  Upload a PNOR image via TFTP.
-    [Template]  Upload Image Via TFTP And Verify Success
     [Tags]  Upload_Host_Image_Via_TFTP
+    [Template]  Upload Image Via TFTP And Verify Success
+
+    # Image File Path
+    ${PNOR_TFTP_FILE_NAME}
 
 
 Upload BMC Image Via TFTP
-    # Image File Path
-
-    ${BMC_TFTP_FILE_NAME}
-
     [Documentation]  Upload a BMC image via TFTP
-    [Template]  Upload Image Via TFTP And Verify Success
     [Tags]  Upload_BMC_Image_Via_TFTP
+    [Template]  Upload Image Via TFTP And Verify Success
+
+    # Image File Path
+    ${BMC_TFTP_FILE_NAME}
 
 
 Upload Host Image With Bad Manifest Via REST
-    # Image File Name
-
-    pnor_bad_manifest.tar
-
     [Documentation]  Upload a PNOR image with a bad MANIFEST via REST and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via REST And Verify Failure
     [Tags]  Upload_Host_Image_With_Bad_Manifest_Via_REST
+    [Template]  Upload Bad Image Via REST And Verify Failure
+
+    # Image File Name
+    pnor_bad_manifest.tar
 
 
 Upload Host Image With No Squashfs Via REST
-    # Image File Name
-
-    pnor_no_image.tar
-
     [Documentation]  Upload a PNOR image with just a MANIFEST file via REST
     ...              and verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via REST And Verify Failure
     [Tags]  Upload_Host_Image_With_No_Squashfs_Via_REST
+    [Template]  Upload Bad Image Via REST And Verify Failure
+
+    # Image File Name
+    pnor_no_image.tar
 
 
 Upload BMC Image With Bad Manifest Via REST
-    # Image File Name
-
-    bmc_bad_manifest.tar
-
     [Documentation]  Upload a BMC image with a bad MANFIEST file via REST and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via REST And Verify Failure
     [Tags]  Upload_BMC_Image_With_Bad_Manifest_Via_REST
+    [Template]  Upload Bad Image Via REST And Verify Failure
+
+    # Image File Name
+    bmc_bad_manifest.tar
 
 
 Upload BMC Image With No Image Via REST
-    # Image File Name
-
-    bmc_no_image.tar
-
     [Documentation]  Upload a BMC image with no just a MANIFEST file via REST
     ...              and verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via REST And Verify Failure
     [Tags]  Upload_BMC_Image_With_No_Image_Via_REST
+    [Template]  Upload Bad Image Via REST And Verify Failure
+
+    # Image File Name
+    bmc_no_image.tar
 
 
 Upload Host Image With Bad Manifest Via TFTP
-    # Image File Name
-
-    pnor_bad_manifest.tar
-
     [Documentation]  Upload a PNOR image with a bad MANIFEST file via TFTP and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via TFTP And Verify Failure
     [Tags]  Upload_Host_Image_With_Bad_Manifest_Via_TFTP
+    [Template]  Upload Bad Image Via TFTP And Verify Failure
+
+    # Image File Name
+    pnor_bad_manifest.tar
 
 
 Upload Host Image With No Squashfs Via TFTP
-    # Image File Name
-
-    pnor_no_image.tar
-
     [Documentation]  Upload a PNOR image with just a MANIFEST file via TFTP and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via TFTP And Verify Failure
     [Tags]  Upload_Host_Image_With_No_Squashfs_Via_TFTP
+    [Template]  Upload Bad Image Via TFTP And Verify Failure
+
+    # Image File Name
+    pnor_no_image.tar
 
 
 Upload BMC Image With Bad Manifest Via TFTP
-    # Image File Name
-
-    bmc_bad_manifest.tar
-
     [Documentation]  Upload a BMC image with a bad MANIFEST file via TFTP and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via TFTP And Verify Failure
     [Tags]  Upload_BMC_Image_With_Bad_Manifest_Via_TFTP
+    [Template]  Upload Bad Image Via TFTP And Verify Failure
+
+    # Image File Name
+    bmc_bad_manifest.tar
 
 
 Upload BMC Image With No Image Via TFTP
-    # Image File Name
-
-    bmc_no_image.tar
-
     [Documentation]  Upload a BMC image with just a MANIFEST file via TFTP and
     ...              verify that the BMC does not unpack it.
-    [Template]  Upload Bad Image Via TFTP And Verify Failure
     [Tags]  Upload_BMC_Image_With_No_Image_Via_TFTP
+    [Template]  Upload Bad Image Via TFTP And Verify Failure
+
+    # Image File Name
+    bmc_no_image.tar
 
 
 *** Keywords ***
diff --git a/network/test_network.robot b/network/test_network.robot
index 012598a..49858f0 100644
--- a/network/test_network.robot
+++ b/network/test_network.robot
@@ -88,103 +88,103 @@
     Verify IP Address Via REST And Delete  ${valid_ip}
 
 Configure Invalid IP String
+    [Documentation]  Configure invalid IP address which is a string.
+    [Tags]  Configure_Invalid_IP_String
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP        Expected_Result
     ${alpha_ip}   ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure invalid IP address which is a string.
-    [Tags]  Configure_Invalid_IP_String
-
-    [Template]  Configure Network Settings
 
 Configure Out Of Range IP
+    [Documentation]  Configure out-of-range IP address.
+    [Tags]  Configure_Out_Of_Range_IP
+    [Template]  Configure Network Settings
+
     # IP Address        Prefix_length        Gateway_IP        Expected_Result
     ${out_of_range_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure out-of-range IP address.
-    [Tags]  Configure_Out_Of_Range_IP
-
-    [Template]  Configure Network Settings
 
 Configure Broadcast IP
+    [Documentation]  Configure broadcast IP address.
+    [Tags]  Configure_Broadcast_IP
+    [Template]  Configure Network Settings
+
     # IP Address     Prefix_length        Gateway_IP        Expected_Result
     ${broadcast_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure broadcast IP address.
-    [Tags]  Configure_Broadcast_IP
-
-    [Template]  Configure Network Settings
 
 Configure Multicast IP
+    [Documentation]  Configure multicast IP address.
+    [Tags]  Configure_Multicast_IP
+    [Template]  Configure Network Settings
+
     # IP Address     Prefix_length        Gateway_IP        Expected_Result
     ${multicast_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure multicast IP address.
-    [Tags]  Configure_Multicast_IP
-
-    [Template]  Configure Network Settings
 
 Configure Loopback IP
+    [Documentation]  Configure loopback IP address.
+    [Tags]  Configure_Loopback_IP
+    [Template]  Configure Network Settings
+
     # IP Address    Prefix_length        Gateway_IP        Expected_Result
     ${loopback_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure loopback IP address.
-    [Tags]  Configure_Loopback_IP
-
-    [Template]  Configure Network Settings
 
 Configure Network ID
+    [Documentation]  Configure network ID IP address.
+    [Tags]  Configure_Network_ID
+    [Template]  Configure Network Settings
+
     # IP Address   Prefix_length        Gateway_IP        Expected_Result
     ${network_id}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure network ID IP address.
-    [Tags]  Configure_Network_ID
-
-    [Template]  Configure Network Settings
 
 Configure Less Octet IP
+    [Documentation]  Configure less octet IP address.
+    [Tags]  Configure_Less_Octet_IP
+    [Template]  Configure Network Settings
+
     # IP Address      Prefix_length        Gateway_IP        Expected_Result
     ${less_octet_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure less octet IP address.
-    [Tags]  Configure_Less_Octet_IP
-
-    [Template]  Configure Network Settings
 
 Configure Empty IP
+    [Documentation]  Configure less octet IP address.
+    [Tags]  Configure_Empty_IP
+    [Template]  Configure Network Settings
+
     # IP Address   Prefix_length        Gateway_IP        Expected_Result
     ${EMPTY}       ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure less octet IP address.
-    [Tags]  Configure_Empty_IP
-
-    [Template]  Configure Network Settings
 
 Configure Special Char IP
+    [Documentation]  Configure invalid IP address containing special chars.
+    [Tags]  Configure_Special_Char_IP
+    [Template]  Configure Network Settings
+
     # IP Address     Prefix_length         Gateway_IP        Expected_Result
     @@@.%%.44.11     ${valid_prefix_len}   ${valid_gateway}  error
 
-    [Documentation]  Configure invalid IP address containing special chars.
-    [Tags]  Configure_Special_Char_IP
-
-    [Template]  Configure Network Settings
 
 Configure Hexadecimal IP
+    [Documentation]  Configure invalid IP address containing hex value.
+    [Tags]  Configure_Hexadecimal_IP
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP        Expected_Result
     ${hex_ip}     ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure invalid IP address containing hex value.
-    [Tags]  Configure_Hexadecimal_IP
-
-    [Template]  Configure Network Settings
 
 Configure Negative Octet IP
+    [Documentation]  Configure invalid IP address containing negative octet.
+    [Tags]  Configure_Negative_Octet_IP
+    [Template]  Configure Network Settings
+
     # IP Address    Prefix_length        Gateway_IP        Expected_Result
     ${negative_ip}  ${valid_prefix_len}  ${valid_gateway}  error
 
-    [Documentation]  Configure invalid IP address containing negative octet.
-    [Tags]  Configure_Negative_Octet_IP
-
-    [Template]  Configure Network Settings
 
 Add New Valid IP With Blank Gateway
     [Documentation]  Add new IP with blank gateway.
@@ -197,116 +197,117 @@
     # Delete IP address and IP object after verification.
     Verify IP Address Via REST And Delete  ${valid_ip}
 
-Configure Invalid Gateway String
-    # IP Address  Prefix_length        Gateway_IP   Expected_Result
-    ${valid_ip}   ${valid_prefix_len}  ${alpha_ip}  error
 
+Configure Invalid Gateway String
     [Documentation]  Configure invalid IP address to a gateway which is
     ...  an alpha string and expect an error.
     [Tags]  Configure_Invalid_Gateway_String
-
     [Template]  Configure Network Settings
 
+    # IP Address  Prefix_length        Gateway_IP   Expected_Result
+    ${valid_ip}   ${valid_prefix_len}  ${alpha_ip}  error
+
+
 Configure Out Of Range IP For Gateway
+    [Documentation]  Configure out-of-range IP for gateway and expect an error.
+    [Tags]  Configure_Out_Of_Range_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP          Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${out_of_range_ip}  error
 
-    [Documentation]  Configure out-of-range IP for gateway and expect an error.
-    [Tags]  Configure_Out_Of_Range_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Broadcast IP For Gateway
+    [Documentation]  Configure broadcast IP for gateway and expect an error.
+    [Tags]  Configure_Broadcast_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP       Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${broadcast_ip}  error
 
-    [Documentation]  Configure broadcast IP for gateway and expect an error.
-    [Tags]  Configure_Broadcast_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Loopback IP For Gateway
+    [Documentation]  Configure loopback IP for gateway and expect an error.
+    [Tags]  Configure_Loopback_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP      Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${loopback_ip}  error
 
-    [Documentation]  Configure loopback IP for gateway and expect an error.
-    [Tags]  Configure_Loopback_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Multicast IP For Gateway
+    [Documentation]  Configure multicast IP for gateway and expect an error.
+    [Tags]  Configure_Multicast_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP       Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${multicast_ip}  error
 
-    [Documentation]  Configure multicast IP for gateway and expect an error.
-    [Tags]  Configure_Multicast_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Network ID For Gateway
+    [Documentation]  Configure network ID for gateway and expect an error.
+    [Tags]  Configure_Network_ID_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP     Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${network_id}  error
 
-    [Documentation]  Configure network ID for gateway and expect an error.
-    [Tags]  Configure_Network_ID_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Less Octet IP For Gateway
+    [Documentation]  Configure less octet IP for gateway and expect an error.
+    [Tags]  Configure_Less_Octet_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP        Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${less_octet_ip}  error
 
-    [Documentation]  Configure less octet IP for gateway and expect an error.
-    [Tags]  Configure_Less_Octet_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Special Char IP For Gateway
+    [Documentation]  Configure special char IP for gateway and expect an error.
+    [Tags]  Configure_Special_Char_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP    Expected_Result
     ${valid_ip}   ${valid_prefix_len}  @@@.%%.44.11  error
 
-    [Documentation]  Configure special char IP for gateway and expect an error.
-    [Tags]  Configure_Special_Char_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Hexadecimal IP For Gateway
+    [Documentation]  Configure hexadecimal IP for gateway and expect an error.
+    [Tags]  Configure_Hexadecimal_IP_For_Gateway
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length        Gateway_IP  Expected_Result
     ${valid_ip}   ${valid_prefix_len}  ${hex_ip}   error
 
-    [Documentation]  Configure hexadecimal IP for gateway and expect an error.
-    [Tags]  Configure_Hexadecimal_IP_For_Gateway
-
-    [Template]  Configure Network Settings
 
 Configure Out Of Range Prefix Length
+    [Documentation]  Configure out-of-range prefix length and expect an error.
+    [Tags]  Configure_Out_Of_Range_Prefix_Length
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length  Gateway_IP        Expected_Result
     ${valid_ip}   33             ${valid_gateway}  error
 
-    [Documentation]  Configure out-of-range prefix length and expect an error.
-    [Tags]  Configure_Out_Of_Range_Prefix_Length
-
-    [Template]  Configure Network Settings
 
 Configure Negative Value For Prefix Length
+    [Documentation]  Configure negative prefix length and expect an error.
+    [Tags]  Configure_Negative_Value_For_Prefix_Length
+    [Template]  Configure Network Settings
+
     # IP Address  Prefix_length  Gateway_IP        Expected_Result
     ${valid_ip}   -10            ${valid_gateway}  error
 
-    [Documentation]  Configure negative prefix length and expect an error.
-    [Tags]  Configure_Negative_Value_For_Prefix_Length
-
-    [Template]  Configure Network Settings
 
 Configure Non Numeric Value For Prefix Length
-    # IP Address  Prefix_length  Gateway_IP        Expected_Result
-    ${valid_ip}   xx             ${valid_gateway}  error
-
     [Documentation]  Configure non numeric  value prefix length and expect
     ...  an error.
     [Tags]  Configure_String_Value_For_Prefix_Length
-
     [Template]  Configure Network Settings
 
+    # IP Address  Prefix_length  Gateway_IP        Expected_Result
+    ${valid_ip}   xx             ${valid_gateway}  error
+
+
 Add Fourth Octet Threshold IP And Verify
     [Documentation]  Add fourth octet threshold IP and verify.
     [Tags]  Add_Fourth_Octet_Threshold_IP_And_Verify
diff --git a/snmp/test_bmc_snmp_config.robot b/snmp/test_bmc_snmp_config.robot
index 26912c5..29f0b8b 100644
--- a/snmp/test_bmc_snmp_config.robot
+++ b/snmp/test_bmc_snmp_config.robot
@@ -29,45 +29,45 @@
     Delete SNMP Manager And Object  ${SNMP_MGR1_IP}  ${NON_DEFAULT_PORT1}
 
 Configure SNMP Manager On BMC With Out Of Range Port And Verify
-    # SNMP manager IP  Port                  Scenario
-    ${SNMP_MGR1_IP}    ${out_of_range_port}  error
     [Documentation]  Configure SNMP Manager On BMC with out-of range port and verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Out_Of_Range_Port_And_Verify
-
     [Template]  Configure SNMP Manager On BMC
 
+    # SNMP manager IP  Port                  Scenario
+    ${SNMP_MGR1_IP}    ${out_of_range_port}  error
+
 Configure SNMP Manager On BMC With Alpha Port And Verify
-    # SNMP manager IP  Port           Scenario
-    ${SNMP_MGR1_IP}    ${alpha_port}  error
     [Documentation]  Configure SNMP Manager On BMC with alpha port and verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Alpha_Port_And_Verify
-
     [Template]  Configure SNMP Manager On BMC
 
+    # SNMP manager IP  Port           Scenario
+    ${SNMP_MGR1_IP}    ${alpha_port}  error
+
 Configure SNMP Manager On BMC With Negative Port And Verify
-    # SNMP manager IP  Port              Scenario
-    ${SNMP_MGR1_IP}    ${negative_port}  error
     [Documentation]  Configure SNMP Manager On BMC with negative port and verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Negative_Port_And_Verify
-
     [Template]  Configure SNMP Manager On BMC
 
+    # SNMP manager IP  Port              Scenario
+    ${SNMP_MGR1_IP}    ${negative_port}  error
+
 Configure SNMP Manager On BMC With Empty Port And Verify
-    # SNMP manager IP  Port           Scenario
-    ${SNMP_MGR1_IP}    ${empty_port}  error
     [Documentation]  Configure SNMP Manager On BMC with empty port and verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Empty_Port_And_Verify
-
     [Template]  Configure SNMP Manager On BMC
 
+    # SNMP manager IP  Port           Scenario
+    ${SNMP_MGR1_IP}    ${empty_port}  error
+
 Configure SNMP Manager On BMC With Out Of Range IP And Verify
-    # SNMP manager IP   Port                  Scenario
-    ${out_of_range_ip}  ${SNMP_DEFAULT_PORT}  error
     [Documentation]  Configure SNMP Manager On BMC with out-of range IP and verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Out_Of_Range_IP_And_Verify
-
     [Template]  Configure SNMP Manager On BMC
 
+    # SNMP manager IP   Port                  Scenario
+    ${out_of_range_ip}  ${SNMP_DEFAULT_PORT}  error
+
 Configure Multiple SNMP Managers And Verify
     [Documentation]  Configure multiple SNMP Managers And Verify.
     [Tags]  Configure_Multiple_SNMP_Managers_And_Verify
diff --git a/tests/ipmi/test_sensors_ipmi.robot b/tests/ipmi/test_sensors_ipmi.robot
index 1a685b1..6e987d6 100644
--- a/tests/ipmi/test_sensors_ipmi.robot
+++ b/tests/ipmi/test_sensors_ipmi.robot
@@ -50,253 +50,229 @@
 
 CPU Present
     [Documentation]  Verify the IPMI sensor for CPU present.
+    [Tags]  CPU_Present
+    [Template]  Check Present Bit
 
     # sensor_id  component
     0x5a          cpu0
 
-    [Template]  Check Present Bit
-    [Tags]  CPU_Present
-
 
 CPU Not Present
     [Documentation]  Verify the IPMI sensor for CPU not present.
+    [Tags]  CPU_Not_Present
+    [Template]  Check Not Present Bit
 
     # sensor_id  component
     0x5a          cpu0
 
-    [Template]  Check Not Present Bit
-    [Tags]  CPU_Not_Present
-
 
 CPU Functional
     [Documentation]  Verify the IPMI sensor for CPU functional.
+    [Tags]  CPU_Functional
+    [Template]  Check Functional Bit
 
     # sensor_id  component
     0x5a          cpu0
 
-    [Template]  Check Functional Bit
-    [Tags]  CPU_Functional
-
 
 CPU Not Functional
     [Documentation]  Verify the IPMI sensor for CPU not functional.
+    [Tags]  CPU_Not_Functional
+    [Template]  Check Not Functional Bit
 
     # sensor_id  component
     0x5a          cpu0
 
-    [Template]  Check Not Functional Bit
-    [Tags]  CPU_Not_Functional
-
 
 GPU Present
     [Documentation]  Verify the IPMI sensor for GPU present.
+    [Tags]  GPU_Present
+    [Template]  Check Present Bit
 
     # sensor_id  component
     0xC5          gv100card0
 
-    [Template]  Check Present Bit
-    [Tags]  GPU_Present
-
 
 GPU Not Present
     [Documentation]  Verify the IPMI sensor for GPU not present.
+    [Tags]  GPU_Not_Present
+    [Template]  Check Not Present Bit
 
     # sensor_id  component
     0xC5          gv100card0
 
-    [Template]  Check Not Present Bit
-    [Tags]  GPU_Not_Present
-
 
 GPU Functional
     [Documentation]  Verify the IPMI sensor GPU for functional.
+    [Tags]  GPU_Functional
+    [Template]  Check Functional Bit
 
     # sensor_id  component
     0xC5          gv100card0
 
-    [Template]  Check Functional Bit
-    [Tags]  GPU_Functional
-
 
 GPU Not Functional
     [Documentation]  Verify the IPMI sensor GPU for not functional.
+    [Tags]  GPU_Not_Functional
+    [Template]  Check Not Functional Bit
 
     # sensor_id  component
     0xC5          gv100card0
 
-    [Template]  Check Not Functional Bit
-    [Tags]  GPU_Not_Functional
-
 
 Core Present
     [Documentation]  Verify the IPMI sensor for core present.
+    [Tags]  Core_Present
+    [Template]  Check Present Bit
 
     # sensor_id  component
     0x1e          cpu0/core4
 
-    [Template]  Check Present Bit
-    [Tags]  Core_Present
-
 
 Core Not Present
     [Documentation]  Verify the IPMI sensor for core not present.
+    [Tags]  Core_Not_Present
+    [Template]  Check Not Present Bit
 
     # sensor_id  component
     0x1e          cpu0/core4
 
-    [Template]  Check Not Present Bit
-    [Tags]  Core_Not_Present
-
 
 Core Functional
     [Documentation]  Verify the IPMI sensor for core functional.
+    [Tags]  Core_Functional
+    [Template]  Check Functional Bit
 
     # sensor_id  component
     0x1e          cpu0/core4
 
-    [Template]  Check Functional Bit
-    [Tags]  Core_Functional
-
 
 Core Not Functional
     [Documentation]  Verify the IPMI sensor for core not functional.
+    [Tags]  Core_Not_Functional
+    [Template]  Check Not Functional Bit
 
     # sensor_id  component
     0x1e          cpu0/core4
 
-    [Template]  Check Not Functional Bit
-    [Tags]  Core_Not_Functional
-
 
 # Operating System State Test Cases.
 
 Set BootProgress To OSStart And Verify
     [Documentation]  Set BootProgress To OSStart and verify.
+    [Tags]  Set_BootProgress_To_OSStart_And_Verify
+    [Template]  Check BootProgress
 
     # BootProgressID  BootProgress
     0x13              ${OS_BOOT_START}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_OSStart_And_Verify
-
 
 Set OperatingSystemState To CBoot And Verify
     [Documentation]  Set Operating System State to "CBoot"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_CBoot_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x02                      ${OS_BOOT_CBoot}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_CBoot_And_Verify
-
 
 Set OperatingSystemState To PXEBoot And Verify
     [Documentation]  Set Operating System State to "PXEBoot"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_PXEBoot_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x05                      ${OS_BOOT_PXE}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_PXEBoot_And_Verify
-
 
 Set OperatingSystemState To BootComplete And Verify
     [Documentation]  Set Operating System State to "BootComplete"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_BootComplete_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x40                      ${OS_BOOT_COMPLETE}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_BootComplete_And_Verify
-
 
 Set OperatingSystemState To CDROMBoot And Verify
     [Documentation]  Set Operating System State to "CDROMBoot"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_CDROMBoot_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x10                      ${OS_BOOT_CDROM}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_CDROMBoot_And_Verify
-
 
 Set OperatingSystemState To ROMBoot And Verify
     [Documentation]  Set Operating System State to "ROMBoot"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_ROMBoot_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x20                      ${OS_BOOT_ROM}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_ROMBoot_And_Verify
-
 
 Set OperatingSystemState To DiagBoot And Verify
     [Documentation]  Set Operating System State to "DiagBoot"
     ...  and verify using REST.
+    [Tags]  Set_OperatingSystemState_To_DiagBoot_And_Verify
+    [Template]  Check OperatingSystemState
 
     # OperatingSystemStateID  OperatingSystemState
     0x08                      ${OS_BOOT_DiagBoot}
 
-    [Template]  Check OperatingSystemState
-    [Tags]  Set_OperatingSystemState_To_DiagBoot_And_Verify
-
 
 # Boot Progress Test Cases.
 
 Set BootProgress To MemoryInit And Verify
     [Documentation]  Set BootProgress to "MemoryInit" and verify.
+    [Tags]  Set_BootProgress_To_MemoryInit_And_Verify
+    [Template]  Check BootProgress
 
     # BootProgressID  BootProgress
     0x01              ${OS_BOOT_MEM}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_MemoryInit_And_Verify
-
 
 Set BootProgress To MotherboardInit And Verify
     [Documentation]  Set BootProgress to "MotherboardInit" and verify.
+    [Tags]  Set_BootProgress_To_MotherboardInit_And_Verify
+    [Template]  Check BootProgress
 
     # BootProgressID  BootProgress
     0x14              ${OS_BOOT_MOTHERBOARD}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_MotherboardInit_And_Verify
-
 
 Set BootProgress To SecondaryProcInit And Verify
     [Documentation]  Set BootProgress to "SecondaryProcInit" and verify.
+    [Tags]  Set_BootProgress_To_SecondaryProcInit_And_Verify
+    [Template]  Check BootProgress
 
     # BootProgressID  BootProgress
     0x03              ${OS_BOOT_SECPCI}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_SecondaryProcInit_And_Verify
-
 
 Set BootProgress To PCIinit And Verify
     [Documentation]  Set BootProgress to "PCIinit" and verify.
+    [Tags]  Set_BootProgress_To_PCIinit_And_Verify
+    [Template]  Check BootProgress
 
     #BootProgressID  BootProgress
     0x07             ${OS_BOOT_PCI}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_PCIinit_And_Verify
-
 
 Set BootProgress To Unspecified And Verify
     [Documentation]  Set BootProgress to "Unspecified" and verify.
+    [Tags]  Set_BootProgress_To_Unspecified_And_Verify
+    [Template]  Check BootProgress
 
     # BootProgressID  BootProgress
     0x00              ${OS_BOOT_OFF}
 
-    [Template]  Check BootProgress
-    [Tags]  Set_BootProgress_To_Unspecified_And_Verify
-
 
 TPM Enable and Disable
     [Documentation]  Enable and disable TPM.
diff --git a/tests/ipmi/test_sol.robot b/tests/ipmi/test_sol.robot
index 30dd78a..2872776 100644
--- a/tests/ipmi/test_sol.robot
+++ b/tests/ipmi/test_sol.robot
@@ -141,44 +141,40 @@
 
 
 Set Valid SOL Retry Count
-    # Description of template fields:
-    # Setting name    Min valid value    Max valid value
-    retry-count       0                  7
     [Documentation]  Verify valid SOL's retry count via IPMI.
     [Tags]  Set_Valid_SOL_Retry_Count
-
     [Template]  Verify SOL Setting
 
+    # Setting name    Min valid value    Max valid value
+    retry-count       0                  7
+
 
 Set Valid SOL Retry Interval
-    # Description of template fields:
-    # Setting name    Min valid value    Max valid value
-    retry-interval    0                  255
     [Documentation]  Verify valid SOL's retry interval via IPMI.
     [Tags]  Set_Valid_SOL_Retry_Interval
-
     [Template]  Verify SOL Setting
 
+    # Setting name    Min valid value    Max valid value
+    retry-interval    0                  255
+
 
 Set Valid SOL Character Accumulate Level
-    # Description of template fields:
-    # Setting name              Min valid value    Max valid value
-    character-accumulate-level  1                  255
     [Documentation]  Verify valid SOL's character accumulate level via IPMI.
     [Tags]  Set_Valid_SOL_Character_Accumulate_Level
-
     [Template]  Verify SOL Setting
 
+    # Setting name              Min valid value    Max valid value
+    character-accumulate-level  1                  255
+
 
 Set Valid SOL Character Send Threshold
-    # Description of template fields:
-    # Setting name              Min valid value    Max valid value
-    character-send-threshold    0                  255
     [Documentation]  Verify valid SOL's character send threshold via IPMI.
     [Tags]  Set_Valid_SOL_Character_Send_Threshold
-
     [Template]  Verify SOL Setting
 
+    # Setting name              Min valid value    Max valid value
+    character-send-threshold    0                  255
+
 *** Keywords ***
 
 Check IPMI SOL Output Content
diff --git a/tests/test_bmc_devicetree.robot b/tests/test_bmc_devicetree.robot
index 7a7b2f9..486a42f 100644
--- a/tests/test_bmc_devicetree.robot
+++ b/tests/test_bmc_devicetree.robot
@@ -13,143 +13,181 @@
 
 *** Test Cases ***
 Check BMC Model Property Is Set
-   #Property
-   model
    [Documentation]  Verify if the BMC Model is populated in the device tree.
    [Tags]  Check_BMC_Model_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Name Property Is Set
    #Property
-   name
+   model
+
+
+Check BMC Name Property Is Set
    [Documentation]  Verify if the BMC name property is populated.
    [Tags]  Check_BMC_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Compatible Property Is Set
    #Property
-   compatible
+   name
+
+
+Check BMC Compatible Property Is Set
    [Documentation]  Verify if the BMC compatible property is populated.
    [Tags]  Check_BMC_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC CPU Name Property Is Set
    #Property
-   cpus/name
+   compatible
+
+
+Check BMC CPU Name Property Is Set
    [Documentation]  Verify if the BMC CPU name property is populated.
    [Tags]  Check_BMC_CPU_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC CPU Compatible Property Is Set
    #Property
-   cpus/cpu@0/compatible
+   cpus/name
+
+
+Check BMC CPU Compatible Property Is Set
    [Documentation]  Verify if the BMC CPU compatible property is populated.
    [Tags]  Check_BMC_CPU_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Memory Name Property Is Set
    #Property
-   memory/name
+   cpus/cpu@0/compatible
+
+
+Check BMC Memory Name Property Is Set
    [Documentation]  Verify if the BMC Memory name property is populated.
    [Tags]  Check_BMC_Memory_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Memory Device Type Property Is Set
    #Property
-   memory/device_type
+   memory/name
+
+
+Check BMC Memory Device Type Property Is Set
    [Documentation]  Verify if the BMC Memory Device Type property is
    ...  populated.
    [Tags]  Check_BMC_Memory_Device_Type_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC FSI Name Property Is Set
    #Property
-   fsi-master/name
+   memory/device_type
+
+
+Check BMC FSI Name Property Is Set
    [Documentation]  Verify if the BMC FSI name property is populated.
    [Tags]  Check_BMC_FSI_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC FSI Compatible Property Is Set
    #Property
-   fsi-master/compatible
+   fsi-master/name
+
+
+Check BMC FSI Compatible Property Is Set
    [Documentation]  Verify if the BMC FSI compatible property is populated.
    [Tags]  Check_BMC_FSI_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC GPIO-FSI Name Property Is Set
    #Property
-   gpio-fsi/name
+   fsi-master/compatible
+
+
+Check BMC GPIO-FSI Name Property Is Set
    [Documentation]  Verify if the BMC GPIO-FSI name property is populated.
    [Tags]  Check_BMC_GPIO_FSI_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC GPIO-FSI Compatible Property Is Set
    #Property
-   gpio-fsi/compatible
+   gpio-fsi/name
+
+
+Check BMC GPIO-FSI Compatible Property Is Set
    [Documentation]  Verify if the BMC GPIO-FSI compatible property is populated.
    [Tags]  Check_BMC_GPIO_FSI_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC GPIO-keys Name Property Is Set
    #Property
-   gpio-keys/name
+   gpio-fsi/compatible
+
+
+Check BMC GPIO-keys Name Property Is Set
    [Documentation]  Verify if the BMC GPIO-keys name property is
    ...  populated.
    [Tags]  Check_BMC_GPIO_keys_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC GPIO-keys Compatible Property Is Set
    #Property
-   gpio-keys/compatible
+   gpio-keys/name
+
+
+Check BMC GPIO-keys Compatible Property Is Set
    [Documentation]  Verify if the BMC GPIO-keys compatible property is
    ...  populated.
    [Tags]  Check_BMC_GPIO_keys_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC IIO-HWMON Name Property Is Set
    #Property
-   iio-hwmon-dps310/name
+   gpio-keys/compatible
+
+
+Check BMC IIO-HWMON Name Property Is Set
    [Documentation]  Verify if the BMC IIO-HWMON-DPS310 name property is
    ...  populated.
    [Tags]  Check_BMC_IIO-HWMON_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC IIO-HWMON Compatible Property Is Set
    #Property
-   iio-hwmon-dps310/compatible
+   iio-hwmon-dps310/name
+
+
+Check BMC IIO-HWMON Compatible Property Is Set
    [Documentation]  Verify if the BMC IIO-HWMON-DPS310 compatible property is
    ...  populated.
    [Tags]  Check_BMC_IIO-HWMON_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC LED Name Property Is Set
    #Property
-   leds/name
+   iio-hwmon-dps310/compatible
+
+
+Check BMC LED Name Property Is Set
    [Documentation]  Verify if the BMC LED name property is populated.
    [Tags]  Check_BMC_LED_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC LED Compatible Property Is Set
    #Property
-   leds/compatible
+   leds/name
+
+
+Check BMC LED Compatible Property Is Set
    [Documentation]  Verify if the BMC LED compatible property is populated.
    [Tags]  Check_BMC_LED_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Clocks Name Property Is Set
    #Property
-   clocks/name
+   leds/compatible
+
+
+Check BMC Clocks Name Property Is Set
    [Documentation]  Verify if the BMC clocks name property is populated.
    [Tags]  Check_BMC_Clocks_Name_Property_Is_Set
    [Template]  Template Check Property
 
-Check BMC Clocks Compatible Property Is Set
    #Property
-   clocks/clk_clkin/compatible
+   clocks/name
+
+
+Check BMC Clocks Compatible Property Is Set
    [Documentation]  Verify if the BMC clocks compatible property is populated.
    [Tags]  Check_BMC_Clocks_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
+   #Property
+   clocks/clk_clkin/compatible
+
+
 *** Keywords ***
 
 Template Check Property
diff --git a/tests/test_host_auto_reboot.robot b/tests/test_host_auto_reboot.robot
index cfc062a..f83cd95 100644
--- a/tests/test_host_auto_reboot.robot
+++ b/tests/test_host_auto_reboot.robot
@@ -16,22 +16,22 @@
 *** Test Cases ***
 
 Verify Host Quiesce State Without Auto Reboot During Boot
-    # Description of template fields:
-    # Auto Reboot   Initial Host State     Expected Host Action
-    ${0}               Booting                No Reboot
     [Documentation]  Validate "Quiesce" state during IPL.
     [Tags]  Verify_Host_Quiesce_State_Without_Auto_Reboot_During_Boot
     [Template]  Verify Host Quiesce State
 
+    # Auto Reboot   Initial Host State     Expected Host Action
+    ${0}               Booting                No Reboot
+
 
 Verify Host Quiesce State With Auto Reboot During Boot
-    # Description of template fields:
-    # Auto Reboot   Initial Host State     Expected Host Action
-    ${1}               Booting                Reboot
     [Documentation]  Validate "Quiesce" state during IPL.
     [Tags]  Verify_Host_Quiesce_State_With_Auto_Reboot_During_Boot
     [Template]  Verify Host Quiesce State
 
+    # Auto Reboot   Initial Host State     Expected Host Action
+    ${1}               Booting                Reboot
+
 
 *** Keywords ***
 
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 0d177e3..8895d17 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -430,69 +430,69 @@
 Verify Minimal CPU Inventory
     [Documentation]  Verify minimal CPU inventory.
     [Tags]  Verify_Minimal_CPU_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     cpu            1
-    [Template]     Minimum Inventory
 
 Verify Minimal DIMM Inventory
     [Documentation]  Verify minimal DIMM inventory.
     [Tags]  Verify_Minimal_DIMM_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     dimm           2
-    [Template]     Minimum Inventory
 
 Verify Minimal Core Inventory
     [Documentation]  Verify minimal core inventory.
     [Tags]  Verify_Minimal_Core_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     core           1
-    [Template]     Minimum Inventory
 
 Verify Minimal Memory Buffer Inventory
     [Documentation]  Verify minimal memory buffer inventory.
     [Tags]  Verify_Minimal_Memory_Buffer_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     memory_buffer  1
-    [Template]     Minimum Inventory
 
 Verify Minimal Fan Inventory
     [Documentation]  Verify minimal fan inventory.
     [Tags]  Verify_Minimal_Fan_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     fan            2
-    [Template]     Minimum Inventory
 
 Verify Minimal Main Planar Inventory
     [Documentation]  Verify minimal main planar inventory.
     [Tags]  Verify_Minimal_Main_Planar_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     main_planar    1
-    [Template]     Minimum Inventory
 
 Verify Minimal System Inventory
     [Documentation]  Verify minimal system inventory.
     [Tags]  Verify_Minimal_System_Inventory
+    [Template]     Minimum Inventory
 
     # item         minimum_count
     system         1
-    [Template]     Minimum Inventory
 
 Verify Minimal Power Supply Inventory
     [Documentation]  Verify minimal power supply inventory.
     [Tags]  Verify_Minimal_Power_Supply_Inventory
+    [Template]     Minimum Inventory
     # Example:
     # "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
     # "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
 
     # item         minimum_count
     powersupply    1
-    [Template]     Minimum Inventory
 
 
 Verify Inventory List After Reboot
diff --git a/tests/test_led.robot b/tests/test_led.robot
index a060829..7e96d31 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -19,64 +19,64 @@
 
 Test Heartbeat LED And Verify Via REST
     [Documentation]  Turn On Off heartbeat LED and verify via REST.
+    [Tags]  Test_Heartbeat_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     #LED Name  LED State
     heartbeat  On
     heartbeat  Off
 
-    [Tags]  Test_Heartbeat_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 Test Beep LED And Verify Via REST
     [Documentation]  Turn On Off beep LED and verify via REST.
+    [Tags]  Test_Beep_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     #LED Name  LED State
     beep       On
     beep       Off
 
-    [Tags]  Test_Beep_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 Test Identify LED And Verify Via REST
     [Documentation]  Turn On Off identify LED and verify via REST.
+    [Tags]  Test_Identify_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     #LED Name  LED State
     identify   On
     identify   Off
 
-    [Tags]  Test_Identify_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 Test Power LED And Verify Via REST
     [Documentation]  Turn On/Off power LED and verify via REST.
+    [Tags]  Test_Power_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     # LED Name  LED State
     rear_power       On
     rear_power       Off
     front_power      On
     front_power      Off
 
-    [Tags]  Test_Power_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 Test Fault LED And Verify Via REST
     [Documentation]  Turn On/Off fault LED and verify via REST.
+    [Tags]  Test_Fault_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     # LED Name  LED State
     rear_fault       On
     rear_fault       Off
     front_fault      On
     front_fault      Off
 
-    [Tags]  Test_Fault_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 Test Rear Identify LED And Verify Via REST
     [Documentation]  Turn On/Off identify LED and verify via REST.
+    [Tags]  Test_Rear_Identify_LED_And_Verify_Via_REST
+    [Template]  Set System LED State
+
     #LED Name  LED State
     rear_id    On
     rear_id    Off
     front_id   On
     front_id   Off
 
-    [Tags]  Test_Rear_Identify_LED_And_Verify_Via_REST
-    [Template]  Set System LED State
-
 
 Verify Rear Power LED With Host Power Off
     [Documentation]  Verify power LED state with host power off.
diff --git a/tests/test_power_restore.robot b/tests/test_power_restore.robot
index c4dca6b..128f7a6 100644
--- a/tests/test_power_restore.robot
+++ b/tests/test_power_restore.robot
@@ -23,10 +23,6 @@
 *** Test Cases ***
 
 Test Restore Policy ALWAYS_POWER_OFF With Host Off
-    # Policy                Initial Host State     Expected Host State
-
-    ${ALWAYS_POWER_OFF}     Off                    Off
-
     [Documentation]  Validate ALWAYS_POWER_OFF restore policy functionality.
     ...              Policy:
     ...                    System policy set to ALWAYS_POWER_OFF.
@@ -36,26 +32,24 @@
     ...              Expected Host State:
     ...                    After BMC reset, system should reach this
     ...                    specific state.
-
-    [Template]  Verify Restore Policy
     [Tags]  Test_Restore_Policy_ALWAYS_POWER_OFF_With_Host_Off
+    [Template]  Verify Restore Policy
+
+    # Policy                Initial Host State     Expected Host State
+    ${ALWAYS_POWER_OFF}     Off                    Off
+
 
 
 Test Restore Policy ALWAYS_POWER_OFF With Host Running
-    # Policy                Initial Host State     Expected Host State
-
-    ${ALWAYS_POWER_OFF}     Running                Running
-
     [Documentation]  Verify that the BMC restore policy is ALWAYS_POWER_OFF while the Host is running.
-    [Template]  Verify Restore Policy
     [Tags]  Test_Restore_Policy_ALWAYS_POWER_OFF_With_Host_Running
+    [Template]  Verify Restore Policy
+
+    # Policy                Initial Host State     Expected Host State
+    ${ALWAYS_POWER_OFF}     Running                Running
 
 
 Test Restore Policy ALWAYS_POWER_ON With Host Off
-    # Policy                Initial Host State     Expected Host State
-
-    ${ALWAYS_POWER_ON}      Off                    Running
-
     [Documentation]  Validate ALWAYS_POWER_ON restore policy functionality.
     ...              Policy:
     ...                    System policy set to ALWAYS_POWER_OFF.
@@ -65,26 +59,25 @@
     ...              Expected Host State:
     ...                    After BMC reset, system should reach this
     ...                    specific state.
-
-    [Template]  Verify Restore Policy
     [Tags]  Test_Restore_Policy_ALWAYS_POWER_ON_With_Host_Off
+    [Template]  Verify Restore Policy
+
+    # Policy                Initial Host State     Expected Host State
+    ${ALWAYS_POWER_ON}      Off                    Running
+
 
 
 Test Restore Policy ALWAYS_POWER_ON With Host Running
-    # Policy                Initial Host State     Expected Host State
+    [Documentation]  Verify the BMC restore policy is ALWAYS_POWER_ON while the Host is running.
+    [Tags]  Test_Restore_Policy_ALWAYS_POWER_ON_With_Host_Running
+    [Template]  Verify Restore Policy
 
+    # Policy                Initial Host State     Expected Host State
     ${ALWAYS_POWER_ON}      Running                Running
 
-    [Documentation]  Verify the BMC restore policy is ALWAYS_POWER_ON while the Host is running.
-    [Template]  Verify Restore Policy
-    [Tags]  Test_Restore_Policy_ALWAYS_POWER_ON_With_Host_Running
 
 
 Test Restore Policy Restore Last State With Host Running
-    # Policy                Initial Host State     Expected Host State
-
-    ${RESTORE_LAST_STATE}   Running                Running
-
     [Documentation]  Validate RESTORE_LAST_STATE restore policy functionality.
     ...              Policy:
     ...                    System policy set to RESTORE_LAST_STATE.
@@ -94,19 +87,21 @@
     ...              Expected Host State:
     ...                    After BMC reset, system should reach this
     ...                    specific state.
-
-    [Template]  Verify Restore Policy
     [Tags]  Test_Restore_Policy_Restore_Last_State_With_Host_Running
+    [Template]  Verify Restore Policy
+
+    # Policy                Initial Host State     Expected Host State
+    ${RESTORE_LAST_STATE}   Running                Running
+
 
 
 Test Restore Policy Restore Last State With Host Off
-    # Policy                Initial Host State     Expected Host State
-
-    ${RESTORE_LAST_STATE}   Off                    Off
-
     [Documentation]  Verify the RESTORE_LAST_STATE restore policy functionality while the Host is off.
-    [Template]  Verify Restore Policy
     [Tags]  Test_Restore_Policy_Restore_Last_State_With_Host_Off
+    [Template]  Verify Restore Policy
+
+    # Policy                Initial Host State     Expected Host State
+    ${RESTORE_LAST_STATE}   Off                    Off
 
 
 *** Keywords ***
diff --git a/tests/test_rest_interfaces.robot b/tests/test_rest_interfaces.robot
index 82d621f..1938923 100644
--- a/tests/test_rest_interfaces.robot
+++ b/tests/test_rest_interfaces.robot
@@ -270,101 +270,87 @@
 
 Get Response Codes
     [Documentation]  REST "Get" response status test.
-    #--------------------------------------------------------------------
+    [Tags]  Get_Response_Codes
+    [Template]  Execute Get And Check Response
+
     # Expect status      URL Path
-    #--------------------------------------------------------------------
     ${HTTP_OK}           /org/
     ${HTTP_OK}           /xyz/
     ${HTTP_OK}           /xyz/openbmc_project/
     ${HTTP_OK}           /xyz/openbmc_project/state/enumerate
     ${HTTP_NOT_FOUND}    /i/dont/exist/
 
-    [Tags]  Get_Response_Codes
-    [Template]  Execute Get And Check Response
-
 
 Get Data
     [Documentation]  REST "Get" request url and expect the
     ...              response OK and data non empty.
-    #--------------------------------------------------------------------
+    [Tags]  Get_Data
+    [Template]  Execute Get And Check Data
+
     # URL Path
-    #--------------------------------------------------------------------
     /xyz/openbmc_project/
     /xyz/openbmc_project/list
     /xyz/openbmc_project/state/enumerate
 
-    [Tags]  Get_Data
-    [Template]  Execute Get And Check Data
-
 
 Get Data Validation
     [Documentation]  REST "Get" request url and expect the
     ...              pre-defined string in response data.
-    #--------------------------------------------------------------------
-    # URL Path                  Expect Data
-    #--------------------------------------------------------------------
-    /xyz/openbmc_project/       /xyz/openbmc_project/logging
-    /i/dont/exist/              path or object not found: /i/dont/exist
-
     [Tags]  Get_Data_Validation
     [Template]  Execute Get And Verify Data
 
+    # URL Path                  Expect Data
+    /xyz/openbmc_project/       /xyz/openbmc_project/logging
+    /i/dont/exist/              path or object not found: /i/dont/exist
+
 
 Put Response Codes
     [Documentation]  REST "Put" request url and expect the REST pre-defined
     ...              codes.
-    #--------------------------------------------------------------------
+    [Tags]  Put_Response_Codes
+    [Template]  Execute Put And Check Response
+
     # Expect status                 URL Path
-    #--------------------------------------------------------------------
     ${HTTP_METHOD_NOT_ALLOWED}      /
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/
     ${HTTP_METHOD_NOT_ALLOWED}      /i/dont/exist/
 
-    [Tags]  Put_Response_Codes
-    [Template]  Execute Put And Check Response
-
 
 Put Data Validation
     [Documentation]  REST "Put" request url and expect success.
-    #--------------------------------------------------------------------
-    # URL Path                      Parm Data
-    #--------------------------------------------------------------------
-    /xyz/openbmc_project/state/host0/attr/RequestedHostTransition
-    ...  xyz.openbmc_project.State.Host.Transition.Off
-
     [Tags]  Put_Data_Validation
     [Template]  Execute Put And Expect Success
 
+    # URL Path                      Parm Data
+    /xyz/openbmc_project/state/host0/attr/RequestedHostTransition
+    ...  xyz.openbmc_project.State.Host.Transition.Off
+
 
 Post Response Code
     [Documentation]  REST Post request url and expect the
     ...              REST response code pre define.
-    #--------------------------------------------------------------------
+    [Tags]  Post_Response_Codes
+    [Template]  Execute Post And Check Response
+
     # Expect status                 URL Path
-    #--------------------------------------------------------------------
     ${HTTP_METHOD_NOT_ALLOWED}      /
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/
     ${HTTP_METHOD_NOT_ALLOWED}      /i/dont/exist/
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/login
 
-    [Tags]  Post_Response_Codes
-    [Template]  Execute Post And Check Response
-
 
 Delete Response Code
     [Documentation]  REST "Delete" request url and expect the
     ...              REST response code pre define.
-    #--------------------------------------------------------------------
+    [Tags]  Delete_Response_Codes
+    [Template]  Execute Delete And Check Response
+
     # Expect status                 URL Path
-    #--------------------------------------------------------------------
     ${HTTP_METHOD_NOT_ALLOWED}      /
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/nothere/
     ${HTTP_METHOD_NOT_ALLOWED}      /xyz/openbmc_project/state/
 
-    [Tags]  Delete_Response_Codes
-    [Template]  Execute Delete And Check Response
-
 
 Verify All REST Objects Are Accessible
     [Documentation]  Verify all the REST objects are accessible using "GET".
diff --git a/tests/test_time.robot b/tests/test_time.robot
index 728ce83..fb932fa 100644
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -81,148 +81,165 @@
 
 
 Set BMC Time With BMC And Manual
-    #Operation    Owner          Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${BMC_OWNER}   ${MANUAL_MODE}  ok      Set       Change
-
     [Documentation]  Set BMC time when time owner is BMC and time mode is
     ...              manual.
     [Tags]  Set_BMC_Time_With_BMC_And_Manual
     [Template]  Set Time Using REST
 
-Set BMC Time With Both And Manual
     #Operation    Owner          Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${BOTH_OWNER}  ${MANUAL_MODE}  ok      Set       Change
+    Set BMC Time  ${BMC_OWNER}   ${MANUAL_MODE}  ok      Set       Change
 
+
+Set BMC Time With Both And Manual
     [Documentation]  Set BMC time when time owner is Both and time mode is
     ...              manual.
     [Tags]  Set_BMC_Time_With_Both_And_Manual
     [Template]  Set Time Using REST
 
+    #Operation    Owner          Mode            Status  BMC Time  Host Time
+    Set BMC Time  ${BOTH_OWNER}  ${MANUAL_MODE}  ok      Set       Change
+
 
 Set BMC Time With Split And Manual
-    #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${SPLIT_OWNER}  ${MANUAL_MODE}  ok      Set       No Change
-
     [Documentation]  Set BMC time when time owner is Split and time mode is
     ...              manual.
     [Tags]  Set_BMC_Time_With_Split_And_Manual
     [Template]  Set Time Using REST
 
-Set BMC Time With BMC And NTP
     #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${BMC_OWNER}    ${NTP_MODE}     ok      Not Set   No Change
+    Set BMC Time  ${SPLIT_OWNER}  ${MANUAL_MODE}  ok      Set       No Change
 
+
+Set BMC Time With BMC And NTP
     [Documentation]  Set BMC time when time owner is BMC and time mode is
     ...              NTP.
     [Tags]  Set_BMC_Time_With_BMC_And_NTP
     [Template]  Set Time Using REST
 
-Set BMC Time With Host And Manual
     #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${HOST_OWNER}   ${MANUAL_MODE}  ok      Not Set   No Change
+    Set BMC Time  ${BMC_OWNER}    ${NTP_MODE}     ok      Not Set   No Change
+
+
+Set BMC Time With Host And Manual
     [Documentation]  Set BMC time when time owner is Host and time mode is
     ...              Manual.
     [Tags]  Set_BMC_Time_With_Host_And_Manual
     [Template]  Set Time Using REST
 
-Set BMC Time With Both And NTP
     #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${BOTH_OWNER}   ${NTP_MODE}     ok      Not Set   No Change
+    Set BMC Time  ${HOST_OWNER}   ${MANUAL_MODE}  ok      Not Set   No Change
 
+
+Set BMC Time With Both And NTP
     [Documentation]  Set BMC time when time owner is Both and time mode is
     ...              NTP.
     [Tags]  Set_BMC_Time_With_Both_And_NTP
     [Template]  Set Time Using REST
 
-Set BMC Time With Split And NTP
     #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${SPLIT_OWNER}  ${NTP_MODE}     ok      Not Set   No Change
+    Set BMC Time  ${BOTH_OWNER}   ${NTP_MODE}     ok      Not Set   No Change
 
+
+Set BMC Time With Split And NTP
     [Documentation]  Set BMC time when time owner is Split and time mode is
     ...              NTP.
     [Tags]  Set_BMC_Time_With_Split_And_NTP
     [Template]  Set Time Using REST
 
-Set BMC Time With Host And NTP
     #Operation    Owner           Mode            Status  BMC Time  Host Time
-    Set BMC Time  ${HOST_OWNER}   ${NTP_MODE}     ok      Not Set   No Change
+    Set BMC Time  ${SPLIT_OWNER}  ${NTP_MODE}     ok      Not Set   No Change
 
+
+Set BMC Time With Host And NTP
     [Documentation]  Set BMC time when time owner is Host and time mode is
     ...              NTP.
     [Tags]  Set_BMC_Time_With_Host_And_NTP
     [Template]  Set Time Using REST
 
+    #Operation    Owner           Mode            Status  BMC Time  Host Time
+    Set BMC Time  ${HOST_OWNER}   ${NTP_MODE}     ok      Not Set   No Change
+
 
 Set Host Time With Host And Manual
-    #Operation     Owner          Mode            Status  BMC Time  Host Time
-    Set Host Time  ${HOST_OWNER}  ${MANUAL_MODE}  ok      Change    Set
-
     [Documentation]  Set host time when time owner is host and time mode is
     ...              manual.
     [Tags]  Set_Host_Time_With_Host_And_Manual
     [Template]  Set Time Using REST
 
-Set Host Time With Both And Manual
     #Operation     Owner          Mode            Status  BMC Time  Host Time
-    Set Host Time  ${BOTH_OWNER}  ${MANUAL_MODE}  ok      Change    Set
+    Set Host Time  ${HOST_OWNER}  ${MANUAL_MODE}  ok      Change    Set
 
+
+Set Host Time With Both And Manual
     [Documentation]  Set host time when time owner is both and time mode is
     ...              manual.
     [Tags]  Set_Host_Time_With_Both_And_Manual
     [Template]  Set Time Using REST
 
-Set Host Time With Both And NTP
-    #Operation     Owner           Mode           Status  BMC Time   Host Time
-    Set Host Time  ${BOTH_OWNER}   ${NTP_MODE}    ok      No Change  Not Set
+    #Operation     Owner          Mode            Status  BMC Time  Host Time
+    Set Host Time  ${BOTH_OWNER}  ${MANUAL_MODE}  ok      Change    Set
 
+
+Set Host Time With Both And NTP
     [Documentation]  Set host time when time owner is both and time mode is
     ...              NTP.
     [Tags]  Set_Host_Time_With_Both_And_NTP
     [Template]  Set Time Using REST
 
-Set Host Time With Split And Manual
-    #Operation     Owner           Mode            Status  BMC Time   Host Time
-    Set Host Time  ${SPLIT_OWNER}  ${MANUAL_MODE}  ok      No Change  Set
+    #Operation     Owner           Mode           Status  BMC Time   Host Time
+    Set Host Time  ${BOTH_OWNER}   ${NTP_MODE}    ok      No Change  Not Set
 
+
+Set Host Time With Split And Manual
     [Documentation]  Set host time when time owner is split and time mode is
     ...              manual.
     [Tags]  Set_Host_Time_With_Split_And_Manual
     [Template]  Set Time Using REST
 
-Set Host Time With Split And NTP
-    #Operation     Owner           Mode            Status   BMC Time   HOST Time
-    Set Host Time  ${SPLIT_OWNER}  ${NTP_MODE}     ok       No Change  Set
+    #Operation     Owner           Mode            Status  BMC Time   Host Time
+    Set Host Time  ${SPLIT_OWNER}  ${MANUAL_MODE}  ok      No Change  Set
 
+
+Set Host Time With Split And NTP
     [Documentation]  Set host time when time owner is split and time mode is
     ...              NTP.
     [Tags]  Set_Host_Time_With_Split_And_NTP
     [Template]  Set Time Using REST
 
-Set Host Time With BMC And Manual
     #Operation     Owner           Mode            Status   BMC Time   HOST Time
-    Set Host Time  ${BMC_OWNER}    ${MANUAL_MODE}  ok       No Change  Not Set
+    Set Host Time  ${SPLIT_OWNER}  ${NTP_MODE}     ok       No Change  Set
+
+
+Set Host Time With BMC And Manual
     [Documentation]  Set host time when time owner is BMC and time mode is
     ...              Manual.
     [Tags]  Set_Host_Time_With_BMC_And_Manual
     [Template]  Set Time Using REST
 
-Set Host Time With BMC Owner NTP
     #Operation     Owner           Mode            Status   BMC Time   HOST Time
-    Set Host Time  ${BMC_OWNER}    ${NTP_MODE}     ok       No Change  Not Set
+    Set Host Time  ${BMC_OWNER}    ${MANUAL_MODE}  ok       No Change  Not Set
+
+
+Set Host Time With BMC Owner NTP
     [Documentation]  Set host time when time owner is BMC and time mode is
     ...              NTP.
     [Tags]  Set_Host_Time_With_BMC_And_NTP
     [Template]  Set Time Using REST
 
-Set Host Time With Host And NTP
-    #Operation     Owner           Mode            Status  BMC Time    Host Time
-    Set Host Time  ${HOST_OWNER}   ${NTP_MODE}     ok      Not Change  No Set
+    #Operation     Owner           Mode            Status   BMC Time   HOST Time
+    Set Host Time  ${BMC_OWNER}    ${NTP_MODE}     ok       No Change  Not Set
 
+
+Set Host Time With Host And NTP
     [Documentation]  Set host time when time owner is Host and time mode is
     ...              NTP.
     [Tags]  Set_Host_Time_With_Host_And_NTP
     [Template]  Set Time Using REST
 
+    #Operation     Owner           Mode            Status  BMC Time    Host Time
+    Set Host Time  ${HOST_OWNER}   ${NTP_MODE}     ok      Not Change  No Set
+
+
 Set Invalid Time Mode
     [Documentation]  Set time mode with invalid value using REST and verify
     ...              that it should throw error.