diff --git a/vcloud/core/src/test/resources/catalogItem-hosting.xml b/vcloud/core/src/test/resources/catalogItem-hosting.xml
new file mode 100644
index 0000000000..6f88d046f6
--- /dev/null
+++ b/vcloud/core/src/test/resources/catalogItem-hosting.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CatalogItem
+ href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/2"
+ name="Windows 2008 Datacenter 64 Bit"
+ xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 catalogItem.xsd"
+ xmlns="http://www.vmware.com/vcloud/v0.8"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Description>Windows 2008 Datacenter 64 Bit</Description>
+  <Entity href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/2"
+        type="application/vnd.vmware.vcloud.vAppTemplate+xml"
+        name="Windows 2008 Datacenter 64 Bit" />
+  <Property key="Foo">Bar</Property>
+  <Property key="Hello">World</Property>
+</CatalogItem>
diff --git a/vcloud/core/src/test/resources/catalogItem-terremark.xml b/vcloud/core/src/test/resources/catalogItem-terremark.xml
new file mode 100644
index 0000000000..feb8b826a5
--- /dev/null
+++ b/vcloud/core/src/test/resources/catalogItem-terremark.xml
@@ -0,0 +1,16 @@
+<CatalogItem
+    href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22"
+    type="application/vnd.vmware.vcloud.catalogItem+xml" name="Windows Web Server 2008 R2 (64-bit)"
+    xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Link rel="down"
+        href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/compute"
+        type="application/xml" name="Compute Options" />
+    <Link rel="down"
+        href="https://services.vcloudexpress.terremark.com/api/v0.8/catalogItem/22/options/customization"
+        type="application/xml" name="Customization Options" />
+    <Entity
+        href="https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/22"
+        type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="Windows Web Server 2008 R2 (64-bit)" />
+    <Property key="LicensingCost">0</Property>
+</CatalogItem>
\ No newline at end of file
diff --git a/vcloud/core/src/test/resources/newvapp-hostingcpumemdisk.xml b/vcloud/core/src/test/resources/newvapp-hostingcpumemdisk.xml
new file mode 100644
index 0000000000..6533a55c3a
--- /dev/null
+++ b/vcloud/core/src/test/resources/newvapp-hostingcpumemdisk.xml
@@ -0,0 +1 @@
+<InstantiateVAppTemplateParams xmlns="http://www.vmware.com/vcloud/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="CentOS 01" xsi:schemaLocation="http://www.vmware.com/vcloud/0.8 http://vcloud.safesecureweb.com/ns/vcloud.xsd"><VAppTemplate href="https://vcloud.safesecureweb.com/api/v0.8/vAppTemplate/3"/><InstantiationParams><VirtualHardwareSection xmlns:q1="http://www.vmware.com/vcloud/v1"><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">3</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1</VirtualQuantity></Item><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">4</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512</VirtualQuantity></Item><Item xmlns="http://schemas.dmtf.org/ovf/envelope/1"><InstanceID xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">9</InstanceID><ResourceType xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">17</ResourceType><VirtualQuantity xmlns="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">1024</VirtualQuantity></Item></VirtualHardwareSection><NetworkConfigSection><NetworkConfig name="CentOS 01"><Features><FenceMode>allowInOut</FenceMode><Dhcp>false</Dhcp></Features><NetworkAssociation href="https://vcloud.safesecureweb.com/network/1990"/></NetworkConfig></NetworkConfigSection></InstantiationParams></InstantiateVAppTemplateParams>
\ No newline at end of file
diff --git a/vcloud/core/src/test/resources/vAppTemplate-hosting.xml b/vcloud/core/src/test/resources/vAppTemplate-hosting.xml
new file mode 100644
index 0000000000..00e52295ac
--- /dev/null
+++ b/vcloud/core/src/test/resources/vAppTemplate-hosting.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VAppTemplate
+ href="https://vcloud.safesecureweb.com/api/v0.8/catalogItem/4"
+ name="cPanel (Linux) 64 Bit"
+ status="1"
+ xmlns="http://www.vmware.com/vcloud/v0.8"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.vmware.com/vcloud/v0.8 vAppTemplate.xsd">
+  <Link rel="up" href="https://vcloud.safesecureweb.com/api/v0.8/1" type="application/vnd.vmware.vcloud.catalog+xml" />
+  <Description>cPanel (Linux) 64 Bit</Description>
+</VAppTemplate>
\ No newline at end of file
diff --git a/vcloud/core/src/test/resources/vAppTemplate-trmk.xml b/vcloud/core/src/test/resources/vAppTemplate-trmk.xml
new file mode 100644
index 0000000000..32c6906967
--- /dev/null
+++ b/vcloud/core/src/test/resources/vAppTemplate-trmk.xml
@@ -0,0 +1,7 @@
+<VAppTemplate
+    href="https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/5"
+    type="application/vnd.vmware.vcloud.vAppTemplate+xml" name="CentOS 5.3 (32-bit)"
+    xmlns="http://www.vmware.com/vcloud/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Description>description of CentOS 5.3 (32-bit)</Description>
+</VAppTemplate>
\ No newline at end of file