diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index 4dd8f68..5f03772 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -15,7 +15,9 @@
 ${HB_SERVICE_INSTANCE_ID}
 ${HB_SERVICE}
 ${HB_IPV4_OAM_ADDRESS}
-
+${TENANT_NAME}
+${VVG_SERVER_ID}
+${SERVICE}
 
 *** Test Cases ***
 Initialize Customer And Models
@@ -37,7 +39,7 @@
 
 Preload VNF
     [Tags]   PreloadDemo
-    Preload User Model   ${VNF_NAME}   ${MODULE_NAME}
+    Preload User Model   ${VNF_NAME}   ${MODULE_NAME}    ${SERVICE}
 
 Create APPC Mount Point
     [Tags]   APPCMountPointDemo
@@ -66,7 +68,7 @@
     [Tags]   deleteVNF
     Setup Browser
     Login To VID GUI
-    Delete VNF
+    Delete VNF    ${TENANT_NAME}    ${VVG_SERVER_ID}
     [Teardown]   Teardown VNF
 
 Run Heatbridge