--- a/test-suite/context.jsonld	Wed Aug 01 17:17:34 2012 +0200
+++ b/test-suite/context.jsonld	Wed Aug 01 18:21:29 2012 +0200
@@ -4,14 +4,15 @@
     "jld":      "http://json-ld.org/test-suite/vocab#",
     "test":     "http://www.w3.org/2006/03/test-description#",
     "rdfs":     "http://www.w3.org/2000/01/rdf-schema#",
-                
-    "context":  {"@id": "test:input", "@type": "@id"},
-    "expect":   {"@id": "test:informationResourceResults", "@type": "@id"},
-    "frame":    {"@id": "test:input", "@type": "@id"},
-    "input":    {"@id": "test:informationResourceInput", "@type": "@id"},
+
+    "context":  { "@id": "test:input", "@type": "@id" },
+    "expect":   { "@id": "test:informationResourceResults", "@type": "@id" },
+    "frame":    { "@id": "test:input", "@type": "@id" },
+    "input":    { "@id": "test:informationResourceInput", "@type": "@id" },
     "name":     "dc:title",
-    "optimize": {"@id": "test:input", "@type": "@id"},
+    "optimize": { "@id": "test:input", "@type": "@id"},
     "purpose":  "test:purpose",
-    "sequence": {"@id": "jld:sequence", "@type": "@id", "@container": "@list"}
+    "sequence": { "@id": "jld:sequence", "@type": "@id", "@container": "@list" },
+    "baseIri":  { "@id": "jld:baseiri", "@type": "@id" }
   }
 }

--- a/test-suite/tests/expand-0028-out.jsonld	Wed Aug 01 17:17:34 2012 +0200
+++ b/test-suite/tests/expand-0028-out.jsonld	Wed Aug 01 18:21:29 2012 +0200
@@ -1,7 +1,7 @@
 [
   {
-    "@id": "example1",
-    "@type": "http://example.org/vocab#test",
+    "@id": "http://json-ld.org/test-suite/tests/example1",
+    "@type": [ "http://example.org/vocab#test" ],
     "http://example.org/vocab#date": [
       {
         "@value": "2011-01-25T00:00:00Z",
@@ -10,7 +10,7 @@
     ],
     "http://example.org/vocab#embed": [
       {
-        "@id": "example2",
+        "@id": "http://json-ld.org/test-suite/tests/example2",
         "http://example.org/vocab#expandedDate": [
           {
             "@value": "2012-08-01T00:00:00Z",

--- a/test-suite/tests/expand-manifest.jsonld	Wed Aug 01 17:17:34 2012 +0200
+++ b/test-suite/tests/expand-manifest.jsonld	Wed Aug 01 18:21:29 2012 +0200
@@ -4,6 +4,7 @@
   "@type": "jld:Manifest",
   "rdfs:comment": "JSON-LD to Expansion tests use object compare",
   "name": "expand",
+  "baseIri": "http://json-ld.org/test-suite/tests/",
   "sequence": [
     {
       "@type": ["test:TestCase", "jld:ExpandTest"],