diff --git a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
index 0650198..8bccdc4 100755
--- a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
@@ -45,6 +45,9 @@
 ${scripts}        ../../scripts
 # Per-test logging on failure is turned off by default; set this variable to enable
 ${container_log_dir}    ${None}
+# KV Store Prefix
+# example: -v kvstoreprefix:voltha_voltha
+${kvstoreprefix}    voltha_voltha
 # determines the environment workflow: DT, TT or ATT (default)
 # example: -v workflow:DT
 ${workflow}    ATT
@@ -139,6 +142,7 @@
     ${jsondata}=    To Json    ${result}
     ${length}=    Get Length    ${jsondata}
     log    ${jsondata}
+    Should Not Be Empty     ${jsondata}
     FOR    ${INDEX}    IN RANGE    0    ${length}
         ${value}=    Get From List    ${jsondata}    ${INDEX}
         ${flowparams}=    Get From Dictionary    ${value['uni_config'][0]}    flow_params
@@ -180,7 +184,7 @@
     ${jsondata}=    To Json    ${result}
     ${length}=    Get Length    ${jsondata}
     log    ${jsondata}
-    ${vlan_rules}=    Create Dictionary
+    Should Not Be Empty     ${jsondata}
     FOR    ${INDEX}    IN RANGE    0    ${length}
         ${value}=    Get From List    ${jsondata}    ${INDEX}
         @{result_values}=    Run Keyword And Ignore Error