diff --git a/tests/test_association.robot b/tests/test_association.robot
index ea0fc6c..b348e38 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -252,7 +252,7 @@
     ${resp}=   openbmc get request   ${EVENT_RECORD}
     should be equal as strings    ${resp.status_code}    ${HTTP_OK}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['data']}
+    [Return]    ${jsondata['data']}
 
 Create a test log
     [Arguments]
@@ -263,7 +263,7 @@
     ${json}=   to json         ${resp.content}
     ${LOGID}=    convert to integer    ${json['data']}
     ${uri}=     catenate    SEPARATOR=   ${EVENT_RECORD}   ${LOGID}
-    [return]  ${uri}
+    [Return]  ${uri}
 
 Clear all logs
     ${resp}=   openbmc post request
diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 16d284a..739d37c 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -50,16 +50,16 @@
 Run IPMI Command Returned
     [Arguments]    ${args}
     ${output_1}=    Execute Command    /tmp/ipmitool -I dbus raw ${args}
-    [return]    ${output_1}
+    [Return]    ${output_1}
 
 Check IPMI Oempartialadd Reject
     [Arguments]    ${args}
     ${stdout}    ${stderr}    ${output_2}=  Execute Command    /tmp/ipmitool -I dbus raw ${args}    return_stdout=True    return_stderr= True    return_rc=True
-    [return]    ${stderr}
+    [Return]    ${stderr}
 
 Check IPMI Oempartialadd Accept
     [Arguments]    ${args}
     ${stdout}    ${stderr}    ${output_3}=    Execute Command    /tmp/ipmitool -I dbus raw ${args}    return_stdout=True    return_stderr= True    return_rc=True
     Should Be Equal    ${output_3}    ${0}    msg=${stderr}
-    [return]    ${stderr}
+    [Return]    ${stderr}
 
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 89f7d04..60083e0 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -228,4 +228,4 @@
     ${json}=   to json         ${resp.content}
     ${LOGID}=    convert to integer    ${json['data']}
     ${uri}=     catenate    SEPARATOR=   ${EVENT_RECORD}   ${LOGID}
-    [return]  ${uri}
+    [Return]  ${uri}
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index a733678..1907ceb 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -94,7 +94,7 @@
     \       Append To List   ${l}   ${SYSTEM_INFO['${element}']['present']}
 
     ${sum}=        Get Count       ${l}    True
-    [return]        ${sum}
+    [Return]        ${sum}
 
 Verify Properties
     [Arguments]     ${type}
diff --git a/tests/test_led.robot b/tests/test_led.robot
index 51e3eb5..b31c384 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -203,7 +203,7 @@
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/GetLedState   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
    ${json}=   to json   ${resp.content}
-   [return]    ${json['data'][1]}
+   [Return]    ${json['data'][1]}
 
 Set On
    [Arguments]    ${args}
diff --git a/tests/test_networkd.robot b/tests/test_networkd.robot
index 1e084fc..242b163 100755
--- a/tests/test_networkd.robot
+++ b/tests/test_networkd.robot
@@ -151,7 +151,7 @@
     ${json}=   to json         ${resp.content}
     log to console   ${json['data'][2]}
     log to console   ${json['data'][3]}
-    [return]    ${json}
+    [Return]    ${json}
 
 AddNetworkInfo
     [Arguments]    ${intf}      ${address}    ${mask}   ${gateway}  ${result}
diff --git a/tests/test_occ_powercap.robot b/tests/test_occ_powercap.robot
index e5ce8f0..35b1a2c 100644
--- a/tests/test_occ_powercap.robot
+++ b/tests/test_occ_powercap.robot
@@ -101,17 +101,17 @@
     ${resp}=   OpenBMC Get Request
     ...    ${SENSORS_URI}powercap/min_cap
     ${jsondata}=   To Json    ${resp.content}
-    [return]    ${jsondata["data"]["value"]}
+    [Return]    ${jsondata["data"]["value"]}
 
 Get Maximum PowerCap
     ${resp}=   OpenBMC Get Request   ${SENSORS_URI}powercap/max_cap
     ${jsondata}=   To Json    ${resp.content}
-    [return]    ${jsondata["data"]["value"]}
+    [Return]    ${jsondata["data"]["value"]}
 
 Get User PowerCap
     ${resp}=   OpenBMC Get Request   ${SENSORS_URI}powercap/user_cap
     ${jsondata}=   To Json    ${resp.content}
-    [return]    ${jsondata["data"]["value"]}
+    [Return]    ${jsondata["data"]["value"]}
 
 Set PowerCap
     [Arguments]    ${powercap_value}
@@ -119,13 +119,13 @@
     ${data}=   create dictionary   data=@{pcap_list}
     ${resp}=   openbmc post request
     ...    ${SENSORS_URI}host/powercap/action/setValue      data=${data}
-    [return]    ${resp}
+    [Return]    ${resp}
 
 Get PowerCap
     ${resp}=   OpenBMC Get Request
     ...    ${SENSORS_URI}host/powercap
     ${jsondata}=   To Json    ${resp.content}
-    [return]    ${jsondata["data"]["value"]}
+    [Return]    ${jsondata["data"]["value"]}
 
 Get OCC status link
     ${resp}=    OpenBMC Get Request
@@ -142,7 +142,7 @@
     ${data}=   create dictionary   data=@{EMPTY}
     ${resp}=   openbmc post request    ${occstatus_link}/action/getValue      data=${data}
     ${jsondata}=   To Json    ${resp.content}
-    [return]    ${jsondata["data"]}
+    [Return]    ${jsondata["data"]}
 
 Get Chassis URI
     ${resp}=    OpenBMC Get Request     ${OPENBMC_BASE_URI}control/
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 72c5d71..699d857 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -292,7 +292,7 @@
     ${list}=    Get Dictionary Keys    ${SYSTEM_INFO}
     ${resp}=    Get Matches    ${list}    regexp=^.*[0-9a-z_].${type}[0-9]*$
     ${url}=    Get From List    ${resp}    0
-    [return]    ${url}
+    [Return]    ${url}
 
 Execute new Command
     [Arguments]    ${args}
@@ -314,9 +314,9 @@
 Get Sensor Number
     [Arguments]  ${name}
     ${x}=       get sensor   ${OPENBMC_MODEL}   ${name}
-    [return]     ${x}
+    [Return]     ${x}
 
 Get Inventory Sensor Number
     [Arguments]  ${name}
     ${x}=       get inventory sensor   ${OPENBMC_MODEL}   ${name}
-    [return]     ${x}
+    [Return]     ${x}
diff --git a/tests/test_time.robot b/tests/test_time.robot
index 71f458e..3c13f49 100755
--- a/tests/test_time.robot
+++ b/tests/test_time.robot
@@ -148,7 +148,7 @@
     ${resp}=     Convert Date    ${stdout}     date_format=%m/%d/%Y %H:%M:%S
     ...          exclude_millis=yes
     Should Not Be Empty    ${resp}
-    [return]    ${resp}
+    [Return]    ${resp}
 
 Set Time Owner
     [Arguments]    ${args}
@@ -158,7 +158,7 @@
     ${resp}=   OpenBMC Put Request
     ...    ${SETTING_HOST}/attr/time_owner    data=${valueDict}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Set Time Mode
     [Arguments]    ${args}
@@ -168,7 +168,7 @@
     ${resp}=   OpenBMC Put Request
     ...   ${SETTING_HOST}/attr/time_mode    data=${valueDict}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 
 Post Test Execution
diff --git a/tests/test_user.robot b/tests/test_user.robot
index 58316bf..89739a6 100755
--- a/tests/test_user.robot
+++ b/tests/test_user.robot
@@ -280,7 +280,7 @@
     ...   ${USER_MANAGER_URI}Users/action/UserList   data=${data}
     should be equal as strings    ${resp.status_code}    ${HTTP_OK}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['data']}
+    [Return]    ${jsondata['data']}
 
 Get GroupListUsr
     ${data}=   create dictionary   data=@{EMPTY}
@@ -288,7 +288,7 @@
     ...   ${USER_MANAGER_URI}/Groups/action/GroupListUsr   data=${data}
     should be equal as strings    ${resp.status_code}    ${HTTP_OK}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['data']}
+    [Return]    ${jsondata['data']}
 
 Create User
     [Arguments]    ${comment}    ${username}    ${groupname}    ${password}
@@ -297,7 +297,7 @@
     ${resp}=   OpenBMC Post Request
     ...    ${USER_MANAGER_URI}Users/action/UserAdd      data=${data}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Change Password
     [Arguments]    ${username}    ${password}
@@ -306,7 +306,7 @@
     ${resp}=   OpenBMC Post Request
     ...    ${USER_MANAGER_URI}User/action/Passwd      data=${data}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Create UserGroup
     [Arguments]    ${args}
@@ -315,7 +315,7 @@
     ${resp}=   OpenBMC Post Request
     ...    ${USER_MANAGER_URI}Groups/action/GroupAddUsr      data=${data}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Delete Group
     [Arguments]    ${args}
@@ -324,7 +324,7 @@
     ${resp}=   OpenBMC Post Request
     ...    ${USER_MANAGER_URI}Group/action/GroupDel      data=${data}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Delete User
     [Arguments]    ${args}
@@ -333,10 +333,10 @@
     ${resp}=   OpenBMC Post Request
     ...    ${USER_MANAGER_URI}User/action/Userdel      data=${data}
     ${jsondata}=    to json    ${resp.content}
-    [return]    ${jsondata['status']}
+    [Return]    ${jsondata['status']}
 
 Login BMC
     [Arguments]    ${username}    ${password}
     Open connection     ${OPENBMC_HOST}
     ${resp}=   Login   ${username}    ${password}
-    [return]    ${resp}
+    [Return]    ${resp}