diff --git a/labs/vcloud-director/src/test/resources/media/error400.xml b/labs/vcloud-director/src/test/resources/media/error400.xml
index 6d89bd48b4..981f249e85 100644
--- a/labs/vcloud-director/src/test/resources/media/error400.xml
+++ b/labs/vcloud-director/src/test/resources/media/error400.xml
@@ -1,8 +1,2 @@
-HTTP/1.1 400 Bad Request
-Date: Mon, 13 Feb 2012 14:52:25 GMT
-Content-Type: application/vnd.vmware.vcloud.error+xml;version=1.5
-Date: Mon, 13 Feb 2012 14:52:25 GMT
-Content-Length: 401
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="BAD_REQUEST" message="validation error on field 'id': String value has invalid format or length" majorErrorCode="400" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
diff --git a/labs/vcloud-director/src/test/resources/media/error403-catalog.xml b/labs/vcloud-director/src/test/resources/media/error403-catalog.xml
index ce45419e82..f1f0b7fee5 100644
--- a/labs/vcloud-director/src/test/resources/media/error403-catalog.xml
+++ b/labs/vcloud-director/src/test/resources/media/error403-catalog.xml
@@ -1,8 +1,2 @@
-HTTP/1.1 403 Forbidden
-Date: Mon, 13 Feb 2012 14:51:28 GMT
-Content-Type: application/vnd.vmware.vcloud.error+xml;version=1.5
-Date: Mon, 13 Feb 2012 14:51:28 GMT
-Content-Length: 450
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity &quot;(com.vmware.vcloud.entity.media:e9cd3387-ac57-4d27-a481-9bee75e0690f)&quot;." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
diff --git a/labs/vcloud-director/src/test/resources/media/error403-fake.xml b/labs/vcloud-director/src/test/resources/media/error403-fake.xml
index ebfd422830..3b582f3c0c 100644
--- a/labs/vcloud-director/src/test/resources/media/error403-fake.xml
+++ b/labs/vcloud-director/src/test/resources/media/error403-fake.xml
@@ -1,8 +1,2 @@
-HTTP/1.1 403 Forbidden
-Date: Mon, 13 Feb 2012 14:54:07 GMT
-Content-Type: application/vnd.vmware.vcloud.error+xml;version=1.5
-Date: Mon, 13 Feb 2012 14:54:07 GMT
-Content-Length: 450
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Error xmlns="http://www.vmware.com/vcloud/v1.5" minorErrorCode="ACCESS_TO_RESOURCE_IS_FORBIDDEN" message="No access to entity &quot;(com.vmware.vcloud.entity.media:aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee)&quot;." majorErrorCode="403" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd"></Error>
diff --git a/labs/vcloud-director/src/test/resources/media/metadata.xml b/labs/vcloud-director/src/test/resources/media/metadata.xml
new file mode 100644
index 0000000000..4ff6274ff6
--- /dev/null
+++ b/labs/vcloud-director/src/test/resources/media/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://vcloudbeta.bluelock.com/api/v1.5/schema/master.xsd">
+    <Link rel="up" type="application/vnd.vmware.vcloud.media+xml" href="https://vcloudbeta.bluelock.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
+</Metadata>
diff --git a/labs/vcloud-director/src/test/resources/media/owner.xml b/labs/vcloud-director/src/test/resources/media/owner.xml
new file mode 100644
index 0000000000..fe6c4228ff
--- /dev/null
+++ b/labs/vcloud-director/src/test/resources/media/owner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Owner xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.owner+xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://mycloud.greenhousedata.com/api/v1.5/schema/master.xsd">
+    <Link rel="up" type="application/vnd.vmware.vcloud.media+xml" href="https://mycloud.greenhousedata.com/api/media/794eb334-754e-4917-b5a0-5df85cbd61d1"/>
+    <User type="application/vnd.vmware.admin.user+xml" name="acole" href="https://mycloud.greenhousedata.com/api/admin/user/c090335b-708c-4c1c-9e3d-89560d002120"/>
+</Owner>