diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoOE.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoOE.json
new file mode 100644
index 0000000..a6aa3e1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/ServiceInstanceTest/ServiceInstanceNoOE.json
@@ -0,0 +1,33 @@
+{
+	"serviceInstanceId":"1882939",
+	"vnfInstanceId":"1882938",
+	"networkInstanceId":"1882937",
+	"volumeGroupInstanceId":"1882935",
+	"vfModuleInstanceId":"1882934",
+	"requestDetails": {
+		"requestInfo": {
+			"source": "VID", 
+			"requestorId": "xxxxxx",
+			"instanceName": "testService9"
+		},
+		"requestParameters": {
+			"aLaCarte": true,
+			"autoBuildVfModules": false,
+			"subscriptionServiceType": "test",
+			"disableOwningEntityProject": true
+		},
+		"modelInfo":{
+			"modelInvariantId": "f7ce78bb-423b-11e7-93f8-0050569a7965",
+			"modelVersion":"1", 
+			"modelVersionId":"10", 
+			"modelType":"service",
+			"modelName":"serviceModel",
+			"modelInstanceName":"modelInstanceName",
+			"modelCustomizationId":"f7ce78bb-423b-11e7-93f8-0050569a796"
+		},
+	 	"subscriberInfo": {
+		"globalSubscriberId": "someTestId", 
+		"subscriberName": "someTestId"
+    	}
+  	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/Vnf.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/Vnf.json
index 09f6d81..0b03f56 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/Vnf.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/Vnf.json
@@ -101,7 +101,7 @@
 					},
 					{
 						"relationship-key": "volume-group.volume-group-id",
-						"relationship-value": "18b220c8-af84-4b82-a8c0-41bbea6328a6"
+						"relationship-value": "volumeGroupId"
 					}
 				]
 			},
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
index 731d2be..ee53e49 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql
@@ -1111,6 +1111,7 @@
   `CREATION_TIMESTAMP` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `VNF_RESOURCE_MODEL_UUID` varchar(200) NOT NULL,
   `SERVICE_MODEL_UUID` varchar(200) NOT NULL,
+  `NF_DATA_VALID` tinyint(1) DEFAULT '0',
   `VNFCINSTANCEGROUP_ORDER` varchar(200) default NULL,
   PRIMARY KEY (`ID`),
   UNIQUE KEY `UK_vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`,`SERVICE_MODEL_UUID`),