diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index a4b8ddb..837c3e9 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -113,7 +113,7 @@
     ${content}=  To JSON  ${resp.content}
     ${headers}=  Create Dictionary   Content-Type=application/json
     ...  X-Auth-Token=${resp.headers["X-Auth-Token"]}
-    ${resp}=  Delete Request  openbmc  /redfish/v1/SessionService/Sessions/${content["Id"]}  headers=${headers}
+    ${resp}=  Delete Request  openbmc  ${REDFISH_SESSION}${/}${content["Id"]}  headers=${headers}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
 
diff --git a/redfish/systems/test_led_indicator_asserted.robot b/redfish/systems/test_led_indicator_asserted.robot
index 33d9a4a..4bb201b 100755
--- a/redfish/systems/test_led_indicator_asserted.robot
+++ b/redfish/systems/test_led_indicator_asserted.robot
@@ -116,7 +116,8 @@
 
     # Description of Arguments(s):
     # pre_req_state           The pre-requisite state of the host to perform the test (e.g. "On")
-    # asserted                The assert property that sets the value (e.g. "xyz.openbmc_project.Led.Physical.Action.On")
+    # asserted                The assert property that sets the value
+    #                         (e.g. "xyz.openbmc_project.Led.Physical.Action.On")
     # expected_indicator_led  The expected value of the IndicatorLED attribute for all the
     #                         power supplies units are initiated (e.g. "Lit")
 
@@ -166,8 +167,10 @@
 
     # Description of Arguments(s):
     # pre_req_state           The pre-requisite state of the host to perform the test (e.g. "On")
-    # asserted                The assert property that sets the value (e.g. "xyz.openbmc_project.Led.Physical.Action.On")
-    # expected_indicator_led  The expected value of the IndicatorLED attribute for all the fans are initiated (e.g. "Lit")
+    # asserted                The assert property that sets the value
+    #                         (e.g. "xyz.openbmc_project.Led.Physical.Action.On")
+    # expected_indicator_led  The expected value of the IndicatorLED attribute for all the fans
+    #                         are initiated (e.g. "Lit")
 
     Run Key U  Redfish Power ${pre_req_state} \ stack_mode=skip \ quiet=1
     Redfish.Login
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index b21d8af..9794453 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -121,8 +121,11 @@
 
     ${allowable_values}=  Redfish.Get Attribute  /redfish/v1/UpdateService  Actions
 
-    Valid Value  allowable_values["#UpdateService.SimpleUpdate"]["TransferProtocol@Redfish.AllowableValues"][0]  valid_values=['TFTP']
-    Valid Value  allowable_values["#UpdateService.SimpleUpdate"]["target"]  valid_values=['/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate']
+    Valid Value
+    ...  allowable_values["#UpdateService.SimpleUpdate"]["TransferProtocol@Redfish.AllowableValues"][0]
+    ...  valid_values=['TFTP']
+    Valid Value  allowable_values["#UpdateService.SimpleUpdate"]["target"]
+    ...  valid_values=['/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate']
 
 
 Verify Redfish BIOS Version