diff --git a/lib/connection_client.robot b/lib/connection_client.robot
index e3bbdff..4819a8d 100755
--- a/lib/connection_client.robot
+++ b/lib/connection_client.robot
@@ -48,8 +48,8 @@
     Run Keyword If  '${SSH_PORT}' != '${EMPTY}' and ${has_port} == ${FALSE}
     ...            Run Keywords
     ...            Set To Dictionary  ${connection_args}  port=${SSH_PORT}  AND
-    ...            Open connection  &{connection_args}
-    ...   ELSE  Run Keyword  Open connection  &{connection_args}
+    ...            SSHLibrary.Open connection  &{connection_args}
+    ...   ELSE  Run Keyword   SSHLibrary.Open connection  &{connection_args}
 
     Login  ${username}  ${password}
 
diff --git a/tests/test_bootpolicy.robot b/tests/test_bootpolicy.robot
index f02590e..32e2477 100644
--- a/tests/test_bootpolicy.robot
+++ b/tests/test_bootpolicy.robot
@@ -18,7 +18,7 @@
 Set Onetime boot policy using REST
     [Documentation]   This testcase is to set onetime boot policy using REST
     ...               URI and then verify using REST API and ipmitool.\n
- 
+
     Set Boot Policy   ONETIME
 
     ${boot} =   Read Attribute  /org/openbmc/settings/host0    boot_policy
@@ -46,7 +46,7 @@
     Should Be Equal    ${boot}    ONETIME
     ${output} =   Run IPMI Standard command   chassis bootparam get 5
     Should Contain   ${output}   Options apply to only next boot
- 
+
 Set Permanent boot policy using IPMITOOL
     [Documentation]   This testcase is to set boot policy to permanent using ipmitool
     ...               and then verify using REST URI and ipmitool.
@@ -97,7 +97,7 @@
     Should Be Equal    ${flag}    Network
 
 Permanent boot order after warm reset
-    [Documentation]   This testcase is to verify that boot policy and order does not change  
+    [Documentation]   This testcase is to verify that boot policy and order does not change
     ...               after warm reset on a system with permanent boot policy.
     [Tags]  chassisboot
 
@@ -114,16 +114,16 @@
 
     ${flag} =   Read Attribute  /org/openbmc/settings/host0    boot_flags
     Should Be Equal    ${flag}    CDROM
- 
+
 Set boot policy to invalid value
-    [Documentation]   This testcase is to verify that proper error message is prompted  
+    [Documentation]   This testcase is to verify that proper error message is prompted
     ...               when invalid value to provided to boot policy.
-   
+
     Set Boot Policy   abc
 
     ${boot} =   Read Attribute  /org/openbmc/settings/host0    boot_policy
-    Should Be Not Equal    ${boot}    abc
-    
+    Should Not Be Equal    ${boot}    abc
+
 *** Keywords ***
 
 Set Boot Policy