diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml
new file mode 100644
index 0000000000000000000000000000000000000000..53a50d091fe67c66880362719016299c6c6232cf
--- /dev/null
+++ b/example-data/complex-vnfd.xml
@@ -0,0 +1,272 @@
+
+
+ complex-vnf
+ My Company
+ complex-vnf
+ 1.0
+ 1.0
+ netconf
+
+ control-plane-active
+ control-plane-active
+
+ internal
+ internal-vl
+ ipv4
+
+
+ mgmt
+ mgmt
+ ipv4
+
+ CP
+ root
+ CP
+
+
+ control-plane-standby
+ control-plane-standby
+
+ internal
+ internal-vl
+ ipv4
+
+
+ mgmt
+ mgmt
+ ipv4
+
+ CP
+ root
+ CP
+
+
+ data-plane
+ data-plane
+
+ in
+ ipv4
+
+
+ internal
+ internal-vl
+ ipv4
+
+
+ out
+ ipv4
+
+ DP
+ root
+ DP
+
+
+ CP
+
+ 16.0
+
+
+ 8
+
+
+
+ DP
+
+ 32.0
+
+
+ 16
+
+
+
+ root
+ root-storage
+ 10
+
+
+ CP
+ CP
+ 1.1
+
+ sha-224
+ deadbeef
+
+ bare
+ qcow2
+ 2.0
+ 1
+ http://mycompany.images.com/control-plane.qcow2
+
+
+ DP
+ DP
+ 1.1
+
+ sha-224
+ deadbeef
+
+ bare
+ qcow2
+ 2.0
+ 1
+ http://mycompany.images.com/data-plane.qcow2
+
+
+ internal-vl
+
+
+ ipv4
+
+
+
+
+ mgmt
+
+
+ ipv4
+
+
+
+
+ in
+
+ data-plane
+ in
+
+ ipv4
+
+
+ mgmt
+ mgmt
+ ipv4
+
+
+ out
+
+ data-plane
+ out
+
+ ipv4
+
+
+ gold
+
+ control-plane-active
+ 1
+ 1
+
+ control-plane
+
+
+
+ control-plane-standby
+ 1
+ 1
+
+ control-plane
+
+
+
+ data-plane
+ 2
+ 8
+
+
+ il-1
+
+ control-plane-active
+ 1
+
+
+ control-plane-standby
+ 1
+
+
+ data-plane
+ 2
+
+
+
+ il-2
+
+ control-plane-active
+ 1
+
+
+ control-plane-standby
+ 1
+
+
+ data-plane
+ 4
+
+
+ il-1
+
+ control-plane
+ anti-affinity
+ nfvi-node
+
+
+
+ silver
+
+ control-plane-active
+ 1
+ 1
+
+ control-plane
+
+
+
+ control-plane-standby
+ 1
+ 1
+
+ control-plane
+
+
+
+ data-plane
+ 1
+ 4
+
+
+ il-1
+
+ control-plane-active
+ 1
+
+
+ control-plane-standby
+ 1
+
+
+ data-plane
+ 1
+
+
+
+ il-2
+
+ control-plane-active
+ 1
+
+
+ control-plane-standby
+ 1
+
+
+ data-plane
+ 2
+
+
+ il-1
+
+ control-plane
+ anti-affinity
+ nfvi-node
+
+
+
+
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 4b5b9d4f216bdc851caaa60395a7352a34ac9a64..a70942b2f94c14cf4cbd729f4b25fea31ca6a666 100644
--- a/example-data/nfv.xml
+++ b/example-data/nfv.xml
@@ -51,7 +51,7 @@
qcow2
2.0
1
- http://www.cisco.com/asa.qcow2
+ http://mycompany.images.com/asa.qcow2
inside
@@ -153,7 +153,7 @@
qcow2
2.0
1
- http://www.cisco.com/csr.qcow2
+ http://mycompany.images.com/csr.qcow2
left
diff --git a/run-test.sh b/run-test.sh
index 13601993ccb8ed386d62cb8b72f374ed9848fce7..471b13aec126d886f0f2d6f3b1fb8eba09b89090 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -15,8 +15,10 @@ confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-descriptors.fxs etsi-nfv-
echo "Starting ConfD"
confd
-echo "Loading Data"
+echo "Loading data for the simple example"
confd_load -l -m nfv.xml
+echo "Loading data for the complex Vnfd example"
+confd_load -l -m complex-vnfd.xml
# Don't do this in the actual test, just waste of cycles
# echo "Stopping ConfD"