diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 803a78e..0945040 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -17,7 +17,7 @@
     ...               It simulates sending partial add command with fake content
     ...                and wrong Reservation ID. This command will be rejected.
     [Tags]  Test_Wrong_Reservation_ID
-   
+
     ${rev_id_1} =    Run IPMI Command Returned   0x0a 0x42
     ${rev_id_ls} =   Get Substring   ${rev_id_1}   1   3
     ${rev_id_ms} =   Get Substring   ${rev_id_1}   -2
@@ -31,7 +31,7 @@
     ...                simulates sending partial add command with fake content
     ...               and correct Reservation ID. This command will be accepted.
     [Tags]  Test_Correct_Reservation_ID
-   
+
     Run IPMI command   0x0a 0x42
     ${rev_id_2} =    Run IPMI Command Returned   0x0a 0x42
     ${rev_id_ls} =   Get Substring   ${rev_id_2}   1   3
@@ -41,7 +41,7 @@
 
 Clear Test File
    [Documentation]   Clear /tmp/esel
-   
+
    Execute Command   rm /tmp/esel
    Execute Command   sync
 
diff --git a/tests/test_networkd.robot b/tests/test_networkd.robot
index 3b7ae88..bfd3fc7 100755
--- a/tests/test_networkd.robot
+++ b/tests/test_networkd.robot
@@ -1,7 +1,7 @@
 *** Settings ***
-Documentation		This suite will verifiy the Network Configuration Rest Interfaces
-...					Details of valid interfaces can be found here...
-...					https://github.com/openbmc/docs/blob/master/rest-api.md
+Documentation      This suite will verifiy the Network Configuration Rest Interfaces
+...                Details of valid interfaces can be found here...
+...                https://github.com/openbmc/docs/blob/master/rest-api.md
 
 Resource            ../lib/rest_client.robot
 Resource            ../lib/connection_client.robot
diff --git a/tests/test_obmcrest.robot b/tests/test_obmcrest.robot
index 7f90206..b15e494 100644
--- a/tests/test_obmcrest.robot
+++ b/tests/test_obmcrest.robot
@@ -18,7 +18,7 @@
     ${c}=          get from List       ${content}      0
     Should Be Equal    ${c}     /org
 
-Get an object with no properties 
+Get an object with no properties
     ${content}=    Read Properties     /org/openbmc/inventory
     Should Be Empty     ${content}
 
@@ -59,14 +59,14 @@
 put directory listing /
     [Tags]  CI
     ${resp} =   openbmc put request     /
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
 put directory listing /org/
     [Tags]  CI
     ${resp} =   openbmc put request     /org/
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
@@ -80,14 +80,14 @@
 post directory listing /
     [Tags]  CI
     ${resp} =   openbmc post request    /
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
 post directory listing /org/
     [Tags]  CI
     ${resp} =   openbmc post request    /org/
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
@@ -101,14 +101,14 @@
 delete directory listing /
     [Tags]  CI
     ${resp} =   openbmc delete request  /
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
 delete directory listing /org/
     [Tags]  CI
     ${resp} =   openbmc delete request  /
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings          ${json['status']}   error
 
@@ -143,14 +143,14 @@
 put list names /
     [Tags]  CI
     ${resp} =   openbmc put request     /list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 put list names /org/
     [Tags]  CI
     ${resp} =   openbmc put request     /org/list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -164,14 +164,14 @@
 post list names /
     [Tags]  CI
     ${resp} =   openbmc post request    /list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 post list names /org/
     [Tags]  CI
     ${resp} =   openbmc post request    /org/list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -185,14 +185,14 @@
 delete list names /
     [Tags]  CI
     ${resp} =   openbmc delete request  /list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 delete list names /org/
     [Tags]  CI
     ${resp} =   openbmc delete request  /list
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -229,14 +229,14 @@
 put names /
     [Tags]  CI
     ${resp} =   openbmc put request     /enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 put names /org/
     [Tags]  CI
     ${resp} =   openbmc put request     /org/enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -250,14 +250,14 @@
 post names /
     [Tags]  CI
     ${resp} =   openbmc post request    /enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 post names /org/
     [Tags]  CI
     ${resp} =   openbmc post request    /org/enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -271,14 +271,14 @@
 delete names /
     [Tags]  CI
     ${resp} =   openbmc delete request  /enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
 delete names /org/
     [Tags]  CI
     ${resp} =   openbmc delete request  /enumerate
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -292,7 +292,7 @@
 get method org/openbmc/records/events/action/acceptTestMessage
     [Tags]  CI
     ${resp} =   openbmc get request     org/openbmc/records/events/action/acceptTestMessage
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -306,7 +306,7 @@
 put method org/openbmc/records/events/action/acceptTestMessage
     [Tags]  CI
     ${resp} =   openbmc put request     org/openbmc/records/events/action/acceptTestMessage
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -348,7 +348,7 @@
 delete method org/openbmc/records/events/action/acceptTestMessage
     [Tags]  CI
     ${resp} =   openbmc delete request  org/openbmc/records/events/action/acceptTestMessage
-    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED} 
+    should be equal as strings      ${resp.status_code}     ${HTTP_METHOD_NOT_ALLOWED}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
 
@@ -358,8 +358,8 @@
     should be equal as strings      ${resp.status_code}     ${HTTP_NOT_FOUND}
     ${json} =   to json         ${resp.content}
     should be equal as strings      ${json['status']}       error
-    
-post method org/openbmc/records/events/action/acceptTestMessage no args 
+
+post method org/openbmc/records/events/action/acceptTestMessage no args
     [Tags]  CI
     ${data} =   create dictionary   data=@{EMPTY}
     ${resp} =   openbmc post request    org/openbmc/records/events/action/acceptTestMessage      data=${data}
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 36095c3..79ce8c2 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -304,7 +304,7 @@
 Response Should Be Empty
     Should Be Empty    ${OUTPUT}
 
-Read the Attribute     
+Read the Attribute
     [arguments]    ${uri}    ${parm}
     ${output} =     Read Attribute      ${uri}    ${parm}
     set test variable    ${OUTPUT}     ${output}