diff --git a/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseNoCDN.json b/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseNoCDN.json
new file mode 100644
index 0000000000..4d872152f8
--- /dev/null
+++ b/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseNoCDN.json
@@ -0,0 +1,104 @@
+{
+    "access": {
+        "token": {
+            "expires": "2012-01-18T21:35:59.050Z",
+            "id": "Auth_4f173437e4b013bee56d1007",
+            "tenant": {
+                "id": "40806637803162",
+                "name": "user@jclouds.org-default-tenant"
+            }
+        },
+        "user": {
+            "id": "36980896575174",
+            "name": "user@jclouds.org",
+            "roles": [
+                {
+                    "id": "00000000004022",
+                    "serviceId": "110",
+                    "name": "Admin",
+                    "tenantName": "40806637803162"
+                },
+                {
+                    "id": "00000000004024",
+                    "serviceId": "140",
+                    "name": "user",
+                    "tenantName": "40806637803162"
+                },
+                {
+                    "id": "00000000004004",
+                    "serviceId": "100",
+                    "name": "domainuser"
+                },
+                {
+                    "id": "00000000004016",
+                    "serviceId": "120",
+                    "name": "netadmin",
+                    "tenantName": "40806637803162"
+                }
+            ]
+        },
+        "serviceCatalog": [
+            {
+                "name": "Object Storage",
+                "type": "object-store",
+                "endpoints": [
+                    {
+                        "tenantName": "40806637803162",
+                        "adminURL": "https://objects.jclouds.org/v1.0/",
+                        "publicURL": "https://objects.jclouds.org/v1.0/40806637803162",
+                        "region": "region-a.geo-1",
+                        "id": "1.0"
+                    }
+                ]
+            },
+            {
+                "name": "Identity",
+                "type": "identity",
+                "endpoints": [
+                    {
+                        "publicURL": "https://csnode.jclouds.org/v2.0/",
+                        "region": "region-a.geo-1",
+                        "id": "2.0",
+                        "list": "https://csnode.jclouds.org/extension"
+                    }
+                ]
+            },
+            {
+                "name": "Image Management",
+                "type": "image",
+                "endpoints": [
+                    {
+                        "tenantName": "40806637803162",
+                        "publicURL": "https://glance.jclouds.org:9292/v1.0",
+                        "region": "az-1.region-a.geo-1",
+                        "id": "1.0"
+                    }
+                ]
+            },
+            {
+                "name":"Cloud Servers",
+                "type":"compute",
+                "endpoints":[{
+                        "tenantId":"1",
+                        "publicURL":"https://compute.north.host/v1/1234",
+                        "internalURL":"https://compute.north.host/v1/1234",
+                        "region":"az-1.region-a.geo-1",
+                        "versionId":"1.0",
+                        "versionInfo":"https://compute.north.host/v1.0/",
+                        "versionList":"https://compute.north.host/"
+                    },
+                    {
+                        "tenantId":"2",
+                        "publicURL":"https://compute.north.host/v1.1/3456",
+                        "internalURL":"https://compute.north.host/v1.1/3456",
+                        "region":"az-1.region-a.geo-1",
+                        "versionId":"1.1",
+                        "versionInfo":"https://compute.north.host/v1.1/",
+                        "versionList":"https://compute.north.host/"
+                    }
+                ],
+                "endpoints_links":[]
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseWithCDN.json b/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseWithCDN.json
new file mode 100644
index 0000000000..832baf0ddb
--- /dev/null
+++ b/labs/hpcloud-objectstorage/src/test/resources/keystoneAuthResponseWithCDN.json
@@ -0,0 +1,116 @@
+{
+    "access": {
+        "token": {
+            "expires": "2012-01-18T21:35:59.050Z",
+            "id": "Auth_4f173437e4b013bee56d1007",
+            "tenant": {
+                "id": "40806637803162",
+                "name": "user@jclouds.org-default-tenant"
+            }
+        },
+        "user": {
+            "id": "36980896575174",
+            "name": "user@jclouds.org",
+            "roles": [
+                {
+                    "id": "00000000004022",
+                    "serviceId": "110",
+                    "name": "Admin",
+                    "tenantName": "40806637803162"
+                },
+                {
+                    "id": "00000000004024",
+                    "serviceId": "140",
+                    "name": "user",
+                    "tenantName": "40806637803162"
+                },
+                {
+                    "id": "00000000004004",
+                    "serviceId": "100",
+                    "name": "domainuser"
+                },
+                {
+                    "id": "00000000004016",
+                    "serviceId": "120",
+                    "name": "netadmin",
+                    "tenantName": "40806637803162"
+                }
+            ]
+        },
+        "serviceCatalog": [
+            {
+                "name": "CDN",
+                "type": "hpext:cdn",
+                "endpoints": [{
+                    "tenantId": "1",
+                    "publicURL": "https://cdnmgmt.jclouds.org/v1.0/40806637803162",
+                    "region": "region-a.geo-1",
+                    "versionId": "1.0",
+                    "versionInfo":"https://cdnmgmt.jclouds.org/v1.0/",
+                    "versionList":"https://cdnmgmt.jclouds.org"
+                }]
+            },
+            {
+                "name": "Object Storage",
+                "type": "object-store",
+                "endpoints": [
+                    {
+                        "tenantName": "40806637803162",
+                        "adminURL": "https://objects.jclouds.org/v1.0/",
+                        "publicURL": "https://objects.jclouds.org/v1.0/40806637803162",
+                        "region": "region-a.geo-1",
+                        "id": "1.0"
+                    }
+                ]
+            },
+            {
+                "name": "Identity",
+                "type": "identity",
+                "endpoints": [
+                    {
+                        "publicURL": "https://csnode.jclouds.org/v2.0/",
+                        "region": "region-a.geo-1",
+                        "id": "2.0",
+                        "list": "https://csnode.jclouds.org/extension"
+                    }
+                ]
+            },
+            {
+                "name": "Image Management",
+                "type": "image",
+                "endpoints": [
+                    {
+                        "tenantName": "40806637803162",
+                        "publicURL": "https://glance.jclouds.org:9292/v1.0",
+                        "region": "az-1.region-a.geo-1",
+                        "id": "1.0"
+                    }
+                ]
+            },
+            {
+                "name":"Cloud Servers",
+                "type":"compute",
+                "endpoints":[{
+                        "tenantId":"1",
+                        "publicURL":"https://compute.north.host/v1/1234",
+                        "internalURL":"https://compute.north.host/v1/1234",
+                        "region":"az-1.region-a.geo-1",
+                        "versionId":"1.0",
+                        "versionInfo":"https://compute.north.host/v1.0/",
+                        "versionList":"https://compute.north.host/"
+                    },
+                    {
+                        "tenantId":"2",
+                        "publicURL":"https://compute.north.host/v1.1/3456",
+                        "internalURL":"https://compute.north.host/v1.1/3456",
+                        "region":"az-1.region-a.geo-1",
+                        "versionId":"1.1",
+                        "versionInfo":"https://compute.north.host/v1.1/",
+                        "versionList":"https://compute.north.host/"
+                    }
+                ],
+                "endpoints_links":[]
+            }
+        ]
+    }
+}
\ No newline at end of file