diff --git a/lib/external_intf/management_console_utils.robot b/lib/external_intf/management_console_utils.robot
index c95c25a..5b1c0ac 100644
--- a/lib/external_intf/management_console_utils.robot
+++ b/lib/external_intf/management_console_utils.robot
@@ -51,10 +51,11 @@
     #              (e.g. 12345, "EXTERNAL-CLIENT").
 
     ${session_info}=  Create Dictionary
-    ${session_resp}=  Redfish Login  kwargs= "Oem":{"OpenBMC" : {"ClientID":"${client_id}"}}
+
+    ${session_resp}=  Redfish Login  kwargs="Context":"${client_id}"
 
     Set To Dictionary  ${session_info}  SessionIDs  ${session_resp['Id']}
-    Set To Dictionary  ${session_info}  ClientID  ${session_resp["Oem"]["OpenBMC"]["ClientID"]}
+    Set To Dictionary  ${session_info}  ClientID  ${session_resp["Context"]}
     Set To Dictionary  ${session_info}  SessionToken  ${XAUTH_TOKEN}
     Set To Dictionary  ${session_info}  SessionResp  ${session_resp}
 
@@ -107,10 +108,11 @@
     FOR  ${client}  ${session}  IN ZIP  ${client_id}  ${session_ids}
       ${session_resp}=  Redfish.Get Properties  /redfish/v1/SessionService/Sessions/${session["SessionIDs"]}
       Rprint Vars  session_resp
-      @{words} =  Split String  ${session_resp["ClientOriginIPAddress"]}  :
+
       ${ip_address}=  Get Running System IP
-      Set Test Variable  ${temp_ipaddr}  ${words}[-1]
-      Valid Value  client  ['${session_resp["Oem"]["OpenBMC"]["ClientID"]}']
+
+      Set Test Variable  ${temp_ipaddr}  ${session_resp["ClientOriginIPAddress"]}
+      Valid Value  client  ['${session_resp["Context"]}']
       Valid Value  session["SessionIDs"]  ['${session_resp["Id"]}']
       Valid Value  temp_ipaddr  ${ip_address}
     END
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index e549521..0e9b6ab 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -350,10 +350,11 @@
     #              (e.g. 12345, "HMCID").
 
     ${session_info}=  Create Dictionary
-    ${session}=  Redfish Login  kwargs="Oem":{"OpenBMC" : {"ClientID":"${client_id}"}}
+
+    ${session}=  Redfish Login  kwargs="Context": "${client_id}"
 
     Set To Dictionary  ${session_info}  SessionIDs  ${session['Id']}
-    Set To Dictionary  ${session_info}  ClientID  ${session["Oem"]["OpenBMC"]["ClientID"]}
+    Set To Dictionary  ${session_info}  ClientID  ${session["Context"]}
 
     [Return]  ${session_info}
 
@@ -1120,7 +1121,7 @@
 
     Append To List  ${trans_id_list}  ${trans_id}
 
-    ${temp_trans_id_list}=  Copy Dictionary  ${trans_id_list}  deepcopy=True
+    ${temp_trans_id_list}=  Copy List  ${trans_id_list}  deepcopy=True
 
     ${value}=  Get From Dictionary  ${trans_id_list}[0]  TransactionID
     ${value}=  Set Variable  \'${value}\'
@@ -1392,7 +1393,7 @@
     Append To List  ${lock_list}  ${trans_id}
     Verify Lock On Resource  ${session_info1}[0]  ${trans_id_list1}
 
-    ${session_info2}=  Copy Dictionary  ${session_info1}  deepcopy=True
+    ${session_info2}=  Copy List  ${session_info1}  deepcopy=True
     set to dictionary  ${session_info2}[0]  SessionIDs  ${invalid_session_ids}[0]
     Append To List  ${session_dict_list}  ${session_info2}[0]