diff --git a/gui/test/server_control/test_obmc_gui_server_power_operations.robot b/gui/test/server_control/test_obmc_gui_server_power_operations.robot
index c000d85..e3e2790 100644
--- a/gui/test/server_control/test_obmc_gui_server_power_operations.robot
+++ b/gui/test/server_control/test_obmc_gui_server_power_operations.robot
@@ -31,7 +31,7 @@
 
 
 Verify Immediate Shutdown Button At Power Off
-    [Documentation] Verify immediate shutdown button not present at power Off.
+    [Documentation]  Verify immediate shutdown button not present at power Off.
     [Tags]  Verify_Immediate_Shutdown_Button_At_Power_Off
 
     Select Server Power Operations Sub Menu
diff --git a/openpower/secureboot/secure.robot b/openpower/secureboot/secure.robot
index 359fa31..4760e65 100644
--- a/openpower/secureboot/secure.robot
+++ b/openpower/secureboot/secure.robot
@@ -99,8 +99,9 @@
     BMC Execute Command  /usr/sbin/obmcutil poweron
     Wait Until Keyword Succeeds  15 min  15 sec  Error Logs Should Exist
 
-    #TODO: This will be enabled little later as more tesing required
-    #Wait Until Keyword Succeeds  5 min  5 sec  Collect Error Logs and Verify SRC  ${error_rc}  ${error_log_path}
+    # TODO: This will be enabled little later as more tesing required
+    # Wait Until Keyword Succeeds
+    # ...  5 min  5 sec  Collect Error Logs and Verify SRC  ${error_rc}  ${error_log_path}
 
     # Verify the RC 0x1E07 in the SOL logs.
     Get And Verify Partition Corruption  ${sol_log_file_path}
diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index 127cd55..5ea4282 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Documentation    Test BMC Manager functionality.
 Resource         ../../lib/resource.robot
 Resource         ../../lib/bmc_redfish_resource.robot
 Resource         ../../lib/common_utils.robot
@@ -81,4 +82,3 @@
 
     FFDC On Test Case Fail
     redfish.Logout
-
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 8aef25e..e6ae47a 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -1,4 +1,5 @@
 *** Settings ***
+Documentation    Test Redfish to verify responses for SessionService and Hypermedia.
 
 Resource         ../../lib/resource.robot
 Resource         ../../lib/bmc_redfish_resource.robot
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index ac2f482..8663150 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -1,4 +1,6 @@
 *** Settings ***
+Documentation    Test Redfish service root login security.
+
 Resource         ../../lib/resource.robot
 Resource         ../../lib/bmc_redfish_resource.robot
 Resource         ../../lib/openbmc_ffdc.robot
@@ -132,4 +134,3 @@
 
     :FOR  ${item}  IN  @{session_list}
     \  Redfish.Delete  ${item}
-
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index 9e26b88..cd2304a 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -1,4 +1,6 @@
 *** Settings ***
+Documentation    Verify that Redfish software inventory can be collected.
+
 Resource         ../../lib/resource.robot
 Resource         ../../lib/bmc_redfish_resource.robot
 Resource         ../../lib/openbmc_ffdc.robot
diff --git a/remote_logging/test_remote_logging.robot b/remote_logging/test_remote_logging.robot
index 27ba41d..ed82ccb 100644
--- a/remote_logging/test_remote_logging.robot
+++ b/remote_logging/test_remote_logging.robot
@@ -141,7 +141,8 @@
     ...  remote_host=${REMOTE_LOG_SERVER_HOST}  remote_port=${INVALID_PORT}
 
     Sleep  3s
-    # rsyslogd[1870]: action 'action 0' suspended, next retry is Fri Sep 14 05:47:39 2018 [v8.29.0 try http://www.rsyslog.com/e/2007 ]
+    # rsyslogd[1870]: action 'action 0' suspended,
+    # next retry is Fri Sep 14 05:47:39 2018 [v8.29.0 try http://www.rsyslog.com/e/2007 ]
     ${bmc_journald}  ${stderr}  ${rc}=  BMC Execute Command
     ...  journalctl -b --no-pager | egrep 'rsyslog.*${RSYSLOG_RETRY_REGEX}'
 
@@ -252,8 +253,11 @@
 
     # Expected filter rsyslog entries.
     # Example:
-    # syslogd[3356]:  [origin software="rsyslogd" swVersion="8.29.0" x-pid="3356" x-info="http://www.rsyslog.com"] exiting on signal 15.
-    # rsyslogd[3364]:  [origin software="rsyslogd" swVersion="8.29.0" x-pid="3364" x-info="http://www.rsyslog.com"] start
+    # syslogd[3356]:
+    #   [origin software="rsyslogd" swVersion="8.29.0" x-pid="3356" x-info="http://www.rsyslog.com"]
+    #     exiting on signal 15.
+    # rsyslogd[3364]:
+    # [origin software="rsyslogd" swVersion="8.29.0" x-pid="3364" x-info="http://www.rsyslog.com"] start
     ${bmc_journald}  ${stderr}  ${rc}=  BMC Execute Command
     ...  journalctl -b --no-pager | egrep 'rsyslog' | egrep -Ev '${RSYSLOG_REGEX}|${RSYSLOG_RETRY_REGEX}'
     ...  ignore_err=${1}