diff --git a/extended/code_update/test_field_mode.robot b/extended/code_update/test_field_mode.robot
index 6bba58f..e3efce4 100644
--- a/extended/code_update/test_field_mode.robot
+++ b/extended/code_update/test_field_mode.robot
@@ -37,6 +37,7 @@
 
     ${args}=  Create Dictionary  data=${1}
     Write Attribute  ${SOFTWARE_VERSION_URI}  FieldModeEnabled  data=${args}
+    Sleep  5s
     BMC Execute Command  [ ! -d "/usr/local/share" ]
 
 
diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index f82cc3c..8dec2d7 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -209,7 +209,7 @@
     Return From Keyword If  ${verify} == ${FALSE}
 
     ${expected_value}=  Set Variable If  '${expected_value}' == '${EMPTY}'
-    ...  ${kwargs['data']['data']}
+    ...  ${kwargs['data']['data']}  ${expected_value}
     ${value}=  Read Attribute  ${uri}  ${attr}
     Should Be Equal  ${value}  ${expected_value}