diff --git a/ffdc/templates/env_vars_template.yaml b/ffdc/templates/env_vars_template.yaml
index e0e9e3d..c93515e 100644
--- a/ffdc/templates/env_vars_template.yaml
+++ b/ffdc/templates/env_vars_template.yaml
@@ -1,6 +1,6 @@
 # This is config file for user who wants to load pre-define variables
 # to be loaded at runtime
-# Key pair vlue , used in the main config ffdc_config.yaml file.
+# Key value pairs, used in the main config ffdc_config.yaml file.
 # NOTE:
 # env_params is a reserved key name, don't rename.
 # var1, var2, var3 and so on you can add and populate as needed.
diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index 3dbed36..a0b5fe8 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -66,5 +66,3 @@
    ${redfish_serial_number}=  Redfish.Get Attribute  ${SYSTEM_BASE_URI}  SerialNumber
    Element Should Be Visible  //*[@data-test-id='appHeader-container-overview']
    ...  /following-sibling::*/*[text()='${redfish_serial_number}']
-
-
diff --git a/lib/bmc_date_and_time_utils.robot b/lib/bmc_date_and_time_utils.robot
index 47531e1..5489ec9 100644
--- a/lib/bmc_date_and_time_utils.robot
+++ b/lib/bmc_date_and_time_utils.robot
@@ -154,11 +154,8 @@
 Restore NTP Mode
     [Documentation]  Restore the original NTP mode.
 
-
     Return From Keyword If  &{original_ntp} == &{EMPTY}
     Print Timen  Restore NTP Mode.
     Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}
     ...  body={'NTP':{'ProtocolEnabled': ${original_ntp["ProtocolEnabled"]}}}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
-
-
diff --git a/templates/test_openbmc_setup.robot b/templates/test_openbmc_setup.robot
index c13a3c1..4a66191 100644
--- a/templates/test_openbmc_setup.robot
+++ b/templates/test_openbmc_setup.robot
@@ -6,7 +6,7 @@
 Resource         ../lib/ipmi_client.robot
 Resource         ../lib/bmc_redfish_resource.robot
 
-Force Tags      Openbmc_Setup
+Test Tags      Openbmc_Setup
 
 *** Variables  ***