Update normalization tests to use new algorithm output.
authorDave Longley <dlongley@digitalbazaar.com>
Sun, 25 Mar 2012 16:26:56 -0400
changeset 406 0d20ecc9a6aa
parent 405 2acddd33b135
child 409 ff80888a52f9
Update normalization tests to use new algorithm output.
test-suite/tests/normalize-0002-out.jsonld
test-suite/tests/normalize-0003-out.jsonld
test-suite/tests/normalize-0004-out.jsonld
test-suite/tests/normalize-0005-out.jsonld
test-suite/tests/normalize-0007-in.jsonld
test-suite/tests/normalize-0007-out.jsonld
test-suite/tests/normalize-0008-out.jsonld
test-suite/tests/normalize-0009-in.jsonld
test-suite/tests/normalize-0009-out.jsonld
test-suite/tests/normalize-0010-out.jsonld
test-suite/tests/normalize-0011-out.jsonld
test-suite/tests/normalize-0012-out.jsonld
test-suite/tests/normalize-0013-out.jsonld
test-suite/tests/normalize-0014-in.jsonld
test-suite/tests/normalize-0014-out.jsonld
test-suite/tests/normalize-0015-in.jsonld
test-suite/tests/normalize-0016-in.jsonld
test-suite/tests/normalize-0016-out.jsonld
test-suite/tests/normalize-0017-out.jsonld
test-suite/tests/normalize-0018-in.jsonld
test-suite/tests/normalize-0018-out.jsonld
test-suite/tests/normalize-0019-in.jsonld
test-suite/tests/normalize-0019-out.jsonld
test-suite/tests/normalize-0020-in.jsonld
test-suite/tests/normalize-0020-out.jsonld
test-suite/tests/normalize-0021-in.jsonld
test-suite/tests/normalize-0021-out.jsonld
test-suite/tests/normalize-0022-in.jsonld
test-suite/tests/normalize-0022-out.jsonld
test-suite/tests/normalize-0023-in.jsonld
test-suite/tests/normalize-0023-out.jsonld
test-suite/tests/normalize-0024-in.jsonld
test-suite/tests/normalize-0024-out.jsonld
test-suite/tests/normalize-0025-in.jsonld
test-suite/tests/normalize-0025-out.jsonld
test-suite/tests/normalize-0026-in.jsonld
test-suite/tests/normalize-0026-out.jsonld
test-suite/tests/normalize-0027-in.jsonld
test-suite/tests/normalize-0027-out.jsonld
test-suite/tests/normalize-0028-in.jsonld
test-suite/tests/normalize-0028-out.jsonld
test-suite/tests/normalize-0029-in.jsonld
test-suite/tests/normalize-0029-out.jsonld
test-suite/tests/normalize-0030-in.jsonld
test-suite/tests/normalize-0030-out.jsonld
test-suite/tests/normalize-0031-out.jsonld
test-suite/tests/normalize-0032-out.jsonld
test-suite/tests/normalize-0033-in.jsonld
test-suite/tests/normalize-0033-out.jsonld
test-suite/tests/normalize-0034-in.jsonld
test-suite/tests/normalize-0034-out.jsonld
test-suite/tests/normalize-0035-in.jsonld
test-suite/tests/normalize-0035-out.jsonld
test-suite/tests/normalize-0036-in.jsonld
test-suite/tests/normalize-0036-out.jsonld
test-suite/tests/normalize-0037-in.jsonld
test-suite/tests/normalize-0037-out.jsonld
test-suite/tests/normalize-0038-in.jsonld
test-suite/tests/normalize-0038-out.jsonld
test-suite/tests/normalize-0039-in.jsonld
test-suite/tests/normalize-0039-out.jsonld
test-suite/tests/normalize-0040-in.jsonld
test-suite/tests/normalize-0040-out.jsonld
test-suite/tests/normalize-0041-in.jsonld
test-suite/tests/normalize-0041-out.jsonld
test-suite/tests/normalize-0042-in.jsonld
test-suite/tests/normalize-0042-out.jsonld
test-suite/tests/normalize-0043-out.jsonld
test-suite/tests/normalize-0044-in.jsonld
test-suite/tests/normalize-0044-out.jsonld
test-suite/tests/normalize-0045-in.jsonld
test-suite/tests/normalize-0045-out.jsonld
test-suite/tests/normalize-0046-in.jsonld
test-suite/tests/normalize-0046-out.jsonld
test-suite/tests/normalize-0047-in.jsonld
test-suite/tests/normalize-0047-out.jsonld
test-suite/tests/normalize-0048-in.jsonld
test-suite/tests/normalize-0048-out.jsonld
test-suite/tests/normalize-0049-in.jsonld
test-suite/tests/normalize-0050-in.jsonld
test-suite/tests/normalize-0050-out.jsonld
test-suite/tests/normalize-0052-in.jsonld
test-suite/tests/normalize-0052-out.jsonld
test-suite/tests/normalize-manifest.jsonld
--- a/test-suite/tests/normalize-0002-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0002-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,13 @@
-[{"@id":"http://example.org/test#example1","http://example.org/vocab#p":{"@id":"http://example.org/test#example2"}},{"@id":"http://example.org/test#example2"}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "http://example.org/test#example2"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example2"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0003-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0003-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,1 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
+[{"@id":"_:c14n0","@type":["http://example.org/vocab#Foo"]}]
\ No newline at end of file
--- a/test-suite/tests/normalize-0004-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0004-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,16 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo","http://example.org/vocab#embed":{"@id":"http://example.org/test#example"}},{"@id":"http://example.org/test#example"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "@type": [
+      "http://example.org/vocab#Foo"
+    ],
+    "http://example.org/vocab#embed": [
+      {
+        "@id": "http://example.org/test#example"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0005-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0005-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,19 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Bar"},{"@id":"http://example.org/test#example","@type":"http://example.org/vocab#Foo","http://example.org/vocab#embed":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "@type": [
+      "http://example.org/vocab#Bar"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example",
+    "@type": [
+      "http://example.org/vocab#Foo"
+    ],
+    "http://example.org/vocab#embed": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0007-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0007-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,10 +1,7 @@
 {
   "@context": {
     "ex": "http://example.org/vocab#",
-    "ex:foo": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "ex:foo": {"@type": "@id"}
   },
   "@id": "http://example.org/test#example",
   "@type": "ex:Foo",
--- a/test-suite/tests/normalize-0007-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0007-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,16 @@
-[{"@id":"http://example.org/test#example","@type":"http://example.org/vocab#Foo","http://example.org/vocab#foo":{"@id":"http://example.org/vocab#Bar"}},{"@id":"http://example.org/vocab#Bar"}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example",
+    "@type": [
+      "http://example.org/vocab#Foo"
+    ],
+    "http://example.org/vocab#foo": [
+      {
+        "@id": "http://example.org/vocab#Bar"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/vocab#Bar"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0008-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0008-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,33 @@
-[{"@id":"http://example.org/test#book","http://example.org/vocab#contains":{"@id":"http://example.org/test#chapter"},"http://purl.org/dc/elements/1.1/contributor":"Writer","http://purl.org/dc/elements/1.1/title":"My Book"},{"@id":"http://example.org/test#chapter","http://purl.org/dc/elements/1.1/description":"Fun","http://purl.org/dc/elements/1.1/title":"Chapter One"},{"@id":"http://example.org/test#library","http://example.org/vocab#contains":{"@id":"http://example.org/test#book"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#book",
+    "http://purl.org/dc/elements/1.1/contributor": [
+      "Writer"
+    ],
+    "http://purl.org/dc/elements/1.1/title": [
+      "My Book"
+    ],
+    "http://example.org/vocab#contains": [
+      {
+        "@id": "http://example.org/test#chapter"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#chapter",
+    "http://purl.org/dc/elements/1.1/description": [
+      "Fun"
+    ],
+    "http://purl.org/dc/elements/1.1/title": [
+      "Chapter One"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#library",
+    "http://example.org/vocab#contains": [
+      {
+        "@id": "http://example.org/test#book"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0009-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0009-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -11,7 +11,7 @@
     "foaf": "http://xmlns.com/foaf/0.1/",
     "xsd": "http://www.w3.org/2001/XMLSchema#"
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "http://example.org/test#chapter",
       "dc:description": "Fun",
--- a/test-suite/tests/normalize-0009-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0009-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,50 @@
-[{"@id":"http://example.org/test#book","http://example.org/vocab#contains":{"@id":"http://example.org/test#chapter"},"http://purl.org/dc/elements/1.1/contributor":"Writer","http://purl.org/dc/elements/1.1/title":"My Book"},{"@id":"http://example.org/test#chapter","http://purl.org/dc/elements/1.1/description":"Fun","http://purl.org/dc/elements/1.1/title":"Chapter One"},{"@id":"http://example.org/test#jane","http://example.org/vocab#authored":{"@id":"http://example.org/test#chapter"},"http://xmlns.com/foaf/0.1/name":"Jane"},{"@id":"http://example.org/test#john","http://xmlns.com/foaf/0.1/name":"John"},{"@id":"http://example.org/test#library","http://example.org/vocab#contains":{"@id":"http://example.org/test#book"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#book",
+    "http://purl.org/dc/elements/1.1/contributor": [
+      "Writer"
+    ],
+    "http://purl.org/dc/elements/1.1/title": [
+      "My Book"
+    ],
+    "http://example.org/vocab#contains": [
+      {
+        "@id": "http://example.org/test#chapter"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#chapter",
+    "http://purl.org/dc/elements/1.1/description": [
+      "Fun"
+    ],
+    "http://purl.org/dc/elements/1.1/title": [
+      "Chapter One"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#jane",
+    "http://example.org/vocab#authored": [
+      {
+        "@id": "http://example.org/test#chapter"
+      }
+    ],
+    "http://xmlns.com/foaf/0.1/name": [
+      "Jane"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#john",
+    "http://xmlns.com/foaf/0.1/name": [
+      "John"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#library",
+    "http://example.org/vocab#contains": [
+      {
+        "@id": "http://example.org/test#book"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0010-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0010-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,11 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#validFrom":{"@value":"2011-01-25T00:00:00+0000","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example",
+    "http://example.org/vocab#validFrom": [
+      {
+        "@value": "2011-01-25T00:00:00+0000",
+        "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0011-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0011-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,11 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#validFrom":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example",
+    "http://example.org/vocab#validFrom": [
+      {
+        "@value": "2011-01-25T00:00:00Z",
+        "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0012-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0012-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,11 @@
-[{"@id":"http://example.org/test#example","http://example.org/vocab#date":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"}}]
+[
+  {
+    "@id": "http://example.org/test#example",
+    "http://example.org/vocab#date": [
+      {
+        "@value": "2011-01-25T00:00:00Z",
+        "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0013-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0013-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,24 @@
-[{"@id":"http://example.org/test#example1","http://example.org/vocab#date":{"@value":"2011-01-25T00:00:00Z","@type":"http://www.w3.org/2001/XMLSchema#dateTime"},"http://example.org/vocab#embed":{"@id":"http://example.org/test#example2"}},{"@id":"http://example.org/test#example2","http://example.org/vocab#parent":{"@id":"http://example.org/test#example1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example1",
+    "http://example.org/vocab#date": [
+      {
+        "@value": "2011-01-25T00:00:00Z",
+        "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+      }
+    ],
+    "http://example.org/vocab#embed": [
+      {
+        "@id": "http://example.org/test#example2"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example2",
+    "http://example.org/vocab#parent": [
+      {
+        "@id": "http://example.org/test#example1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0014-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0014-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,16 +1,9 @@
 {
   "@context": {
-    "d": "http://purl.org/dc/elements/1.1/",
-    "e": "http://example.org/vocab#",
-    "e:double-zero": {
-      "@type": "xsd:double"
-    },
-    "f": "http://xmlns.com/foaf/0.1/",
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e": "http://example.org/vocab#"
   },
   "@id": "http://example.org/test",
   "e:bool": true,
   "e:double": 1.23,
-  "e:double-zero": 0,
   "e:int": 123
 }
\ No newline at end of file
--- a/test-suite/tests/normalize-0014-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0014-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,23 @@
-[{"@id":"http://example.org/test","http://example.org/vocab#bool":{"@value":"true","@type":"http://www.w3.org/2001/XMLSchema#boolean"},"http://example.org/vocab#double":{"@value":"1.230000e+00","@type":"http://www.w3.org/2001/XMLSchema#double"},"http://example.org/vocab#double-zero":{"@value":"0.000000e+00","@type":"http://www.w3.org/2001/XMLSchema#double"},"http://example.org/vocab#int":{"@value":"123","@type":"http://www.w3.org/2001/XMLSchema#integer"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test",
+    "http://example.org/vocab#bool": [
+      {
+        "@value": "true",
+        "@type": "http://www.w3.org/2001/XMLSchema#boolean"
+      }
+    ],
+    "http://example.org/vocab#double": [
+      {
+        "@value": "1.2300000000000000e+00",
+        "@type": "http://www.w3.org/2001/XMLSchema#double"
+      }
+    ],
+    "http://example.org/vocab#int": [
+      {
+        "@value": "123",
+        "@type": "http://www.w3.org/2001/XMLSchema#integer"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0015-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0015-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -2,7 +2,7 @@
   "@context": {
     "e": "http://example.org/vocab#"
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "e:A"
     },
--- a/test-suite/tests/normalize-0016-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0016-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,10 +1,7 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:B": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:B": {"@type": "@id"}
   },
   "@id": "http://example.org/test",
   "e:A": {
--- a/test-suite/tests/normalize-0016-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0016-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,23 @@
-[{"@id":"_:c14n0","name":"foo"},{"@id":"http://example.org/test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n0"},"http://example.org/vocab#embed":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0"
+  },
+  {
+    "@id": "http://example.org/test",
+    "http://example.org/vocab#A": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#B": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#embed": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0017-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0017-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,18 @@
-[{"@id":"_:c14n0","name":"foo"},{"@id":"http://example.org/test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0"
+  },
+  {
+    "@id": "http://example.org/test",
+    "http://example.org/vocab#A": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#B": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0018-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0018-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,10 +1,7 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:self": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:self": {"@type": "@id"}
   },
   "@id": "_:b0",
   "e:self": "_:b0"
--- a/test-suite/tests/normalize-0018-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0018-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,10 @@
-[{"@id":"_:c14n0","http://example.org/vocab#self":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#self": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0019-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0019-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:self": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:self": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b0",
       "e:self": "_:b0"
--- a/test-suite/tests/normalize-0019-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0019-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,18 @@
-[{"@id":"_:c14n0","http://example.org/vocab#self":{"@id":"_:c14n0"}},{"@id":"_:c14n1","http://example.org/vocab#self":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#self": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#self": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0020-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0020-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,18 +1,11 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:A": {
-      "@type": "@id"
-    },
-    "e:B": {
-      "@type": "@id"
-    },
-    "e:next": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:A": {"@type": "@id"},
+    "e:B": {"@type": "@id"},
+    "e:next": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "e:test",
       "e:A": "_:b1",
--- a/test-suite/tests/normalize-0020-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0020-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,34 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"http://example.org/vocab#test","http://example.org/vocab#A":{"@id":"_:c14n1"},"http://example.org/vocab#B":{"@id":"_:c14n2"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/vocab#test",
+    "http://example.org/vocab#A": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#B": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0021-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0021-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:next": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:next": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "e:next": "_:b2"
--- a/test-suite/tests/normalize-0021-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0021-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,18 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0022-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0022-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,15 +1,10 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:next": {
-      "@type": "@id"
-    },
-    "e:prev": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:next": {"@type": "@id"},
+    "e:prev": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "e:next": "_:b2",
--- a/test-suite/tests/normalize-0022-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0022-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,28 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0023-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0023-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "e": "http://example.org/vocab#",
-    "e:next": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "e:next": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "e:next": "_:b2"
--- a/test-suite/tests/normalize-0023-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0023-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,26 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0024-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0024-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "e:next": "_:b2",
--- a/test-suite/tests/normalize-0024-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0024-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0025-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0025-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "e:next": "_:b2",
--- a/test-suite/tests/normalize-0025-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0025-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0026-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0026-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b2",
       "e:next": "_:b3",
--- a/test-suite/tests/normalize-0026-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0026-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0027-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0027-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b2",
       "e:next": "_:b3",
--- a/test-suite/tests/normalize-0027-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0027-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0028-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0028-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b3",
       "e:next": "_:b1",
--- a/test-suite/tests/normalize-0028-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0028-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0029-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0029-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -6,10 +6,9 @@
     },
     "e:prev": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b3",
       "e:next": "_:b1",
--- a/test-suite/tests/normalize-0029-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0029-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,41 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"},"http://example.org/vocab#prev":{"@id":"_:c14n2"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"},"http://example.org/vocab#prev":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"},"http://example.org/vocab#prev":{"@id":"_:c14n1"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ],
+    "http://example.org/vocab#prev": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0030-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0030-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -12,10 +12,9 @@
     },
     "e:next": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "e:test",
       "e:A": "_:b1",
--- a/test-suite/tests/normalize-0030-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0030-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,44 @@
-[{"@id":"_:c14n0","http://example.org/vocab#next":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#next":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#next":{"@id":"_:c14n0"}},{"@id":"http://example.org/vocab#test","http://example.org/vocab#A":{"@id":"_:c14n0"},"http://example.org/vocab#B":{"@id":"_:c14n1"},"http://example.org/vocab#C":{"@id":"_:c14n2"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#next": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/vocab#test",
+    "http://example.org/vocab#A": [
+      {
+        "@id": "_:c14n1"
+      }
+    ],
+    "http://example.org/vocab#B": [
+      {
+        "@id": "_:c14n2"
+      }
+    ],
+    "http://example.org/vocab#C": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0031-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0031-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,1 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
+[{"@id":"_:c14n0","@type":["http://example.org/vocab#Foo"]}]
\ No newline at end of file
--- a/test-suite/tests/normalize-0032-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0032-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,1 @@
-[{"@id":"_:c14n0","@type":"http://example.org/vocab#Foo"}]
\ No newline at end of file
+[{"@id":"_:c14n0","@type":["http://example.org/vocab#Foo"]}]
\ No newline at end of file
--- a/test-suite/tests/normalize-0033-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0033-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -2,7 +2,7 @@
   "@context": {
     "ex": "http://example.org/vocab#"
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:a0",
       "ex:prop": {
--- a/test-suite/tests/normalize-0033-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0033-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,24 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#prop":{"@id":"_:c14n0"}},{"@id":"_:c14n2"},{"@id":"_:c14n3","http://example.org/vocab#prop":{"@id":"_:c14n2"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#prop": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#prop": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0034-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0034-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -2,7 +2,7 @@
   "@context": {
     "ex": "http://example.org/vocab#"
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b0",
       "ex:prop": {
--- a/test-suite/tests/normalize-0034-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0034-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,24 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#prop":{"@id":"_:c14n0"}},{"@id":"_:c14n2"},{"@id":"_:c14n3","http://example.org/vocab#prop":{"@id":"_:c14n2"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#prop": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#prop": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0035-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0035-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:a1",
       "ex:p1": "_:a3"
--- a/test-suite/tests/normalize-0035-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0035-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,30 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0036-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0036-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:a1",
       "ex:p1": "_:a4"
--- a/test-suite/tests/normalize-0036-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0036-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,30 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0037-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0037-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "ex:p1": "_:b4"
--- a/test-suite/tests/normalize-0037-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0037-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,30 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p2":"Foo"},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n3","http://example.org/vocab#p2":"Foo"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p2": [
+      "Foo"
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0038-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0038-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:a0",
       "ex:p1": [
--- a/test-suite/tests/normalize-0038-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0038-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,27 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":[{"@id":"_:c14n1"},{"@id":"_:c14n3"}]},{"@id":"_:c14n3"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2"
+  },
+  {
+    "@id": "_:c14n3"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0039-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0039-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b0",
       "ex:p1": [
--- a/test-suite/tests/normalize-0039-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0039-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,27 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":[{"@id":"_:c14n1"},{"@id":"_:c14n3"}]},{"@id":"_:c14n3"}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2"
+  },
+  {
+    "@id": "_:c14n3"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0040-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0040-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "ex:p1": "_:b2"
--- a/test-suite/tests/normalize-0040-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0040-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,40 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0041-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0041-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "ex:p1": "_:b2"
--- a/test-suite/tests/normalize-0041-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0041-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,40 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0042-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0042-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -3,10 +3,9 @@
     "ex": "http://example.org/vocab#",
     "ex:p1": {
       "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    }
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "ex:p1": "_:b3"
--- a/test-suite/tests/normalize-0042-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0042-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,40 @@
-[{"@id":"_:c14n0"},{"@id":"_:c14n1","http://example.org/vocab#p1":{"@id":"_:c14n0"}},{"@id":"_:c14n2","http://example.org/vocab#p1":{"@id":"_:c14n1"}},{"@id":"_:c14n3"},{"@id":"_:c14n4","http://example.org/vocab#p1":{"@id":"_:c14n3"}},{"@id":"_:c14n5","http://example.org/vocab#p1":{"@id":"_:c14n4"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1"
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3"
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p1": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0043-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0043-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,11 @@
-[{"@id":"http://example.org/test","http://example.org/vocab#test":{"@language":"en","@value":"test"}}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test",
+    "http://example.org/vocab#test": [
+      {
+        "@language": "en",
+        "@value": "test"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0044-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0044-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "eg:p": [
--- a/test-suite/tests/normalize-0044-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0044-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,170 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n10",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n11",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n6",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n7",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n8",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n9",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0045-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0045-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:c1",
       "eg:p": [
--- a/test-suite/tests/normalize-0045-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0045-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,170 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n10",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n11",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n6",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n7",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n8",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n9",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0046-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0046-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b6",
       "eg:p": [
--- a/test-suite/tests/normalize-0046-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0046-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,170 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n2"},{"@id":"_:c14n3"}]},{"@id":"_:c14n1","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n2"},{"@id":"_:c14n4"}]},{"@id":"_:c14n10","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n11","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n2","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n1"},{"@id":"_:c14n5"}]},{"@id":"_:c14n3","http://example.org/vocab#p":[{"@id":"_:c14n0"},{"@id":"_:c14n4"},{"@id":"_:c14n5"}]},{"@id":"_:c14n4","http://example.org/vocab#p":[{"@id":"_:c14n1"},{"@id":"_:c14n3"},{"@id":"_:c14n5"}]},{"@id":"_:c14n5","http://example.org/vocab#p":[{"@id":"_:c14n2"},{"@id":"_:c14n3"},{"@id":"_:c14n4"}]},{"@id":"_:c14n6","http://example.org/vocab#p":[{"@id":"_:c14n7"},{"@id":"_:c14n8"},{"@id":"_:c14n9"}]},{"@id":"_:c14n7","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n8","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]},{"@id":"_:c14n9","http://example.org/vocab#p":[{"@id":"_:c14n10"},{"@id":"_:c14n11"},{"@id":"_:c14n6"}]}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n1"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n10",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n11",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n5"
+      },
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n4"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      },
+      {
+        "@id": "_:c14n0"
+      },
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n6",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n7",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n8",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n7"
+      },
+      {
+        "@id": "_:c14n9"
+      },
+      {
+        "@id": "_:c14n11"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n9",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n8"
+      },
+      {
+        "@id": "_:c14n10"
+      },
+      {
+        "@id": "_:c14n6"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0047-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0047-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:b1",
       "eg:p": [
--- a/test-suite/tests/normalize-0047-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0047-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,48 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#z":["bar1","bar2"]},{"@id":"_:c14n3","http://example.org/vocab#p":{"@id":"_:c14n4"}},{"@id":"_:c14n4","http://example.org/vocab#p":{"@id":"_:c14n5"}},{"@id":"_:c14n5","http://example.org/vocab#z":["foo1","foo2"]}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#z": [
+      "foo1",
+      "foo2"
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#z": [
+      "bar1",
+      "bar2"
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0048-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0048-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,12 +1,9 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
-  "@id": [
+  "@graph": [
     {
       "@id": "_:c1",
       "eg:p": [
--- a/test-suite/tests/normalize-0048-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0048-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,48 @@
-[{"@id":"_:c14n0","http://example.org/vocab#p":{"@id":"_:c14n1"}},{"@id":"_:c14n1","http://example.org/vocab#p":{"@id":"_:c14n2"}},{"@id":"_:c14n2","http://example.org/vocab#z":["bar1","bar2"]},{"@id":"_:c14n3","http://example.org/vocab#p":{"@id":"_:c14n4"}},{"@id":"_:c14n4","http://example.org/vocab#p":{"@id":"_:c14n5"}},{"@id":"_:c14n5","http://example.org/vocab#z":["foo1","foo2"]}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0",
+    "http://example.org/vocab#z": [
+      "foo1",
+      "foo2"
+    ]
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n2"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n2",
+    "http://example.org/vocab#z": [
+      "bar1",
+      "bar2"
+    ]
+  },
+  {
+    "@id": "_:c14n3",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n4",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n3"
+      }
+    ]
+  },
+  {
+    "@id": "_:c14n5",
+    "http://example.org/vocab#p": [
+      {
+        "@id": "_:c14n1"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0049-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0049-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,10 +1,7 @@
 {
   "@context": {
     "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg:p": {"@type": "@id"}
   },
   "@id": "http://example.org/test#example",
   "eg:p": null
--- a/test-suite/tests/normalize-0050-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0050-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,16 +1,9 @@
 {
   "@context": {
-    "eg": "http://example.org/vocab#",
-    "eg:p": {
-      "@type": "@id"
-    },
-    "xsd": "http://www.w3.org/2001/XMLSchema#"
+    "eg": "http://example.org/vocab#"
   },
   "@id": "_:c1",
-  "eg:array": [
-    "value",
-    null
-  ],
+  "eg:array": ["value", null],
   "eg:doc": "Test 'null' in various locations",
   "eg:null": null,
   "eg:object": {
--- a/test-suite/tests/normalize-0050-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0050-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,19 @@
-[{"@id":"_:c14n0","prop1":"value1"},{"@id":"_:c14n1","http://example.org/vocab#array":"value","http://example.org/vocab#doc":"Test 'null' in various locations","http://example.org/vocab#object":{"@id":"_:c14n0"}}]
\ No newline at end of file
+[
+  {
+    "@id": "_:c14n0"
+  },
+  {
+    "@id": "_:c14n1",
+    "http://example.org/vocab#array": [
+      "value"
+    ],
+    "http://example.org/vocab#doc": [
+      "Test 'null' in various locations"
+    ],
+    "http://example.org/vocab#object": [
+      {
+        "@id": "_:c14n0"
+      }
+    ]
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-0052-in.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0052-in.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,11 +1,7 @@
 {
   "@context": {
-    "http://example.org/test#property1": {
-      "@type": "uri"
-    },
-    "http://example.org/test#property2": {
-      "@type": "uri"
-    },
+    "http://example.org/test#property1": {"@type": "uri"},
+    "http://example.org/test#property2": {"@type": "uri"},
     "uri": "@id"
   },
   "http://example.org/test#property1": {
--- a/test-suite/tests/normalize-0052-out.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-0052-out.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,1 +1,32 @@
-[{"@id":"http://example.org/test#example1","http://example.org/test#property1":{"@id":"http://example.org/test#example2"},"http://example.org/test#property2":{"@id":"http://example.org/test#example3"},"http://example.org/test#property3":{"@id":"http://example.org/test#example4"}},{"@id":"http://example.org/test#example2","http://example.org/test#property4":"foo"},{"@id":"http://example.org/test#example3"},{"@id":"http://example.org/test#example4"}]
\ No newline at end of file
+[
+  {
+    "@id": "http://example.org/test#example1",
+    "http://example.org/test#property1": [
+      {
+        "@id": "http://example.org/test#example2"
+      }
+    ],
+    "http://example.org/test#property2": [
+      {
+        "@id": "http://example.org/test#example3"
+      }
+    ],
+    "http://example.org/test#property3": [
+      {
+        "@id": "http://example.org/test#example4"
+      }
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example2",
+    "http://example.org/test#property4": [
+      "foo"
+    ]
+  },
+  {
+    "@id": "http://example.org/test#example3"
+  },
+  {
+    "@id": "http://example.org/test#example4"
+  }
+]
\ No newline at end of file
--- a/test-suite/tests/normalize-manifest.jsonld	Fri Mar 23 21:48:15 2012 -0400
+++ b/test-suite/tests/normalize-manifest.jsonld	Sun Mar 25 16:26:56 2012 -0400
@@ -1,268 +1,268 @@
 {
-   "@context": "http://json-ld.org/test-suite/context.jsonld",
-   "@id": "",
-   "@type": "jld:Manifest",
-   "rdfs:comment": "JSON-LD to Expansion tests use object compare",
-   "name": "normalize",
-   "sequence": [{
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "simple id",
-      "input": "normalize-0001-in.jsonld",
-      "expect": "normalize-0001-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "duplicate property iri values",
-      "input": "normalize-0002-in.jsonld",
-      "expect": "normalize-0002-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "bnode",
-      "input": "normalize-0003-in.jsonld",
-      "expect": "normalize-0003-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "bnode plus embed w/subject",
-      "input": "normalize-0004-in.jsonld",
-      "expect": "normalize-0004-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "bnode embed",
-      "input": "normalize-0005-in.jsonld",
-      "expect": "normalize-0005-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "multiple rdf types",
-      "input": "normalize-0006-in.jsonld",
-      "expect": "normalize-0006-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "coerce CURIE value",
-      "input": "normalize-0007-in.jsonld",
-      "expect": "normalize-0007-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "single subject complex",
-      "input": "normalize-0008-in.jsonld",
-      "expect": "normalize-0008-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "multiple subjects - complex",
-      "input": "normalize-0009-in.jsonld",
-      "expect": "normalize-0009-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "type",
-      "input": "normalize-0010-in.jsonld",
-      "expect": "normalize-0010-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "type-coerced type",
-      "input": "normalize-0011-in.jsonld",
-      "expect": "normalize-0011-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "type-coerced type, remove duplicate reference",
-      "input": "normalize-0012-in.jsonld",
-      "expect": "normalize-0012-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "type-coerced type, cycle",
-      "input": "normalize-0013-in.jsonld",
-      "expect": "normalize-0013-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "check types",
-      "input": "normalize-0014-in.jsonld",
-      "expect": "normalize-0014-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "top level context",
-      "input": "normalize-0015-in.jsonld",
-      "expect": "normalize-0015-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - dual link - embed",
-      "input": "normalize-0016-in.jsonld",
-      "expect": "normalize-0016-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - dual link - non-embed",
-      "input": "normalize-0017-in.jsonld",
-      "expect": "normalize-0017-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - self link",
-      "input": "normalize-0018-in.jsonld",
-      "expect": "normalize-0018-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - disjoint self links",
-      "input": "normalize-0019-in.jsonld",
-      "expect": "normalize-0019-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - diamond",
-      "input": "normalize-0020-in.jsonld",
-      "expect": "normalize-0020-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - circle of 2",
-      "input": "normalize-0021-in.jsonld",
-      "expect": "normalize-0021-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 2",
-      "input": "normalize-0022-in.jsonld",
-      "expect": "normalize-0022-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - circle of 3",
-      "input": "normalize-0023-in.jsonld",
-      "expect": "normalize-0023-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (1-2-3)",
-      "input": "normalize-0024-in.jsonld",
-      "expect": "normalize-0024-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (1-3-2)",
-      "input": "normalize-0025-in.jsonld",
-      "expect": "normalize-0025-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (2-1-3)",
-      "input": "normalize-0026-in.jsonld",
-      "expect": "normalize-0026-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (2-3-1)",
-      "input": "normalize-0027-in.jsonld",
-      "expect": "normalize-0027-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (3-2-1)",
-      "input": "normalize-0028-in.jsonld",
-      "expect": "normalize-0028-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - double circle of 3 (3-1-2)",
-      "input": "normalize-0029-in.jsonld",
-      "expect": "normalize-0029-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "blank node - point at circle of 3",
-      "input": "normalize-0030-in.jsonld",
-      "expect": "normalize-0030-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "bnode (1)",
-      "input": "normalize-0031-in.jsonld",
-      "expect": "normalize-0031-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "bnode (2)",
-      "input": "normalize-0032-in.jsonld",
-      "expect": "normalize-0032-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "disjoint identical subgraphs (1)",
-      "input": "normalize-0033-in.jsonld",
-      "expect": "normalize-0033-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "disjoint identical subgraphs (2)",
-      "input": "normalize-0034-in.jsonld",
-      "expect": "normalize-0034-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered w/strings (1)",
-      "input": "normalize-0035-in.jsonld",
-      "expect": "normalize-0035-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered w/strings (2)",
-      "input": "normalize-0036-in.jsonld",
-      "expect": "normalize-0036-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered w/strings (3)",
-      "input": "normalize-0037-in.jsonld",
-      "expect": "normalize-0037-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered 4 bnodes, reordered 2 properties (1)",
-      "input": "normalize-0038-in.jsonld",
-      "expect": "normalize-0038-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered 4 bnodes, reordered 2 properties (2)",
-      "input": "normalize-0039-in.jsonld",
-      "expect": "normalize-0039-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered 6 bnodes (1)",
-      "input": "normalize-0040-in.jsonld",
-      "expect": "normalize-0040-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered 6 bnodes (2)",
-      "input": "normalize-0041-in.jsonld",
-      "expect": "normalize-0041-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "reordered 6 bnodes (3)",
-      "input": "normalize-0042-in.jsonld",
-      "expect": "normalize-0042-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "literal with language",
-      "input": "normalize-0043-in.jsonld",
-      "expect": "normalize-0043-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "evil (1)",
-      "input": "normalize-0044-in.jsonld",
-      "expect": "normalize-0044-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "evil (2)",
-      "input": "normalize-0045-in.jsonld",
-      "expect": "normalize-0045-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "evil (3)",
-      "input": "normalize-0046-in.jsonld",
-      "expect": "normalize-0046-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "deep diff (1)",
-      "input": "normalize-0047-in.jsonld",
-      "expect": "normalize-0047-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "deep diff (2)",
-      "input": "normalize-0048-in.jsonld",
-      "expect": "normalize-0048-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "remove null",
-      "input": "normalize-0049-in.jsonld",
-      "expect": "normalize-0049-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "nulls",
-      "input": "normalize-0050-in.jsonld",
-      "expect": "normalize-0050-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "merging subjects",
-      "input": "normalize-0051-in.jsonld",
-      "expect": "normalize-0051-out.jsonld"
-   }, {
-      "@type": ["test:TestCase", "jld:NormalizeTest"],
-      "name": "alias keywords",
-      "input": "normalize-0052-in.jsonld",
-      "expect": "normalize-0052-out.jsonld"
-   }]
+  "@context": "http://json-ld.org/test-suite/context.jsonld",
+  "@id": "",
+  "@type": "jld:Manifest",
+  "rdfs:comment": "JSON-LD to Expansion tests use object compare",
+  "name": "normalize",
+  "sequence": [{
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "simple id",
+    "input": "normalize-0001-in.jsonld",
+    "expect": "normalize-0001-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "duplicate property iri values",
+    "input": "normalize-0002-in.jsonld",
+    "expect": "normalize-0002-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "bnode",
+    "input": "normalize-0003-in.jsonld",
+    "expect": "normalize-0003-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "bnode plus embed w/subject",
+    "input": "normalize-0004-in.jsonld",
+    "expect": "normalize-0004-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "bnode embed",
+    "input": "normalize-0005-in.jsonld",
+    "expect": "normalize-0005-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "multiple rdf types",
+    "input": "normalize-0006-in.jsonld",
+    "expect": "normalize-0006-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "coerce CURIE value",
+    "input": "normalize-0007-in.jsonld",
+    "expect": "normalize-0007-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "single subject complex",
+    "input": "normalize-0008-in.jsonld",
+    "expect": "normalize-0008-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "multiple subjects - complex",
+    "input": "normalize-0009-in.jsonld",
+    "expect": "normalize-0009-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "type",
+    "input": "normalize-0010-in.jsonld",
+    "expect": "normalize-0010-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "type-coerced type",
+    "input": "normalize-0011-in.jsonld",
+    "expect": "normalize-0011-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "type-coerced type, remove duplicate reference",
+    "input": "normalize-0012-in.jsonld",
+    "expect": "normalize-0012-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "type-coerced type, cycle",
+    "input": "normalize-0013-in.jsonld",
+    "expect": "normalize-0013-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "check types",
+    "input": "normalize-0014-in.jsonld",
+    "expect": "normalize-0014-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "top level context",
+    "input": "normalize-0015-in.jsonld",
+    "expect": "normalize-0015-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - dual link - embed",
+    "input": "normalize-0016-in.jsonld",
+    "expect": "normalize-0016-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - dual link - non-embed",
+    "input": "normalize-0017-in.jsonld",
+    "expect": "normalize-0017-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - self link",
+    "input": "normalize-0018-in.jsonld",
+    "expect": "normalize-0018-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - disjoint self links",
+    "input": "normalize-0019-in.jsonld",
+    "expect": "normalize-0019-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - diamond",
+    "input": "normalize-0020-in.jsonld",
+    "expect": "normalize-0020-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - circle of 2",
+    "input": "normalize-0021-in.jsonld",
+    "expect": "normalize-0021-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 2",
+    "input": "normalize-0022-in.jsonld",
+    "expect": "normalize-0022-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - circle of 3",
+    "input": "normalize-0023-in.jsonld",
+    "expect": "normalize-0023-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (1-2-3)",
+    "input": "normalize-0024-in.jsonld",
+    "expect": "normalize-0024-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (1-3-2)",
+    "input": "normalize-0025-in.jsonld",
+    "expect": "normalize-0025-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (2-1-3)",
+    "input": "normalize-0026-in.jsonld",
+    "expect": "normalize-0026-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (2-3-1)",
+    "input": "normalize-0027-in.jsonld",
+    "expect": "normalize-0027-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (3-2-1)",
+    "input": "normalize-0028-in.jsonld",
+    "expect": "normalize-0028-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - double circle of 3 (3-1-2)",
+    "input": "normalize-0029-in.jsonld",
+    "expect": "normalize-0029-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "blank node - point at circle of 3",
+    "input": "normalize-0030-in.jsonld",
+    "expect": "normalize-0030-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "bnode (1)",
+    "input": "normalize-0031-in.jsonld",
+    "expect": "normalize-0031-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "bnode (2)",
+    "input": "normalize-0032-in.jsonld",
+    "expect": "normalize-0032-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "disjoint identical subgraphs (1)",
+    "input": "normalize-0033-in.jsonld",
+    "expect": "normalize-0033-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "disjoint identical subgraphs (2)",
+    "input": "normalize-0034-in.jsonld",
+    "expect": "normalize-0034-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered w/strings (1)",
+    "input": "normalize-0035-in.jsonld",
+    "expect": "normalize-0035-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered w/strings (2)",
+    "input": "normalize-0036-in.jsonld",
+    "expect": "normalize-0036-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered w/strings (3)",
+    "input": "normalize-0037-in.jsonld",
+    "expect": "normalize-0037-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered 4 bnodes, reordered 2 properties (1)",
+    "input": "normalize-0038-in.jsonld",
+    "expect": "normalize-0038-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered 4 bnodes, reordered 2 properties (2)",
+    "input": "normalize-0039-in.jsonld",
+    "expect": "normalize-0039-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered 6 bnodes (1)",
+    "input": "normalize-0040-in.jsonld",
+    "expect": "normalize-0040-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered 6 bnodes (2)",
+    "input": "normalize-0041-in.jsonld",
+    "expect": "normalize-0041-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "reordered 6 bnodes (3)",
+    "input": "normalize-0042-in.jsonld",
+    "expect": "normalize-0042-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "literal with language",
+    "input": "normalize-0043-in.jsonld",
+    "expect": "normalize-0043-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "evil (1)",
+    "input": "normalize-0044-in.jsonld",
+    "expect": "normalize-0044-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "evil (2)",
+    "input": "normalize-0045-in.jsonld",
+    "expect": "normalize-0045-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "evil (3)",
+    "input": "normalize-0046-in.jsonld",
+    "expect": "normalize-0046-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "deep diff (1)",
+    "input": "normalize-0047-in.jsonld",
+    "expect": "normalize-0047-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "deep diff (2)",
+    "input": "normalize-0048-in.jsonld",
+    "expect": "normalize-0048-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "remove null",
+    "input": "normalize-0049-in.jsonld",
+    "expect": "normalize-0049-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "nulls",
+    "input": "normalize-0050-in.jsonld",
+    "expect": "normalize-0050-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "merging subjects",
+    "input": "normalize-0051-in.jsonld",
+    "expect": "normalize-0051-out.jsonld"
+  }, {
+    "@type": ["test:TestCase", "jld:NormalizeTest"],
+    "name": "alias keywords",
+    "input": "normalize-0052-in.jsonld",
+    "expect": "normalize-0052-out.jsonld"
+  }]
 }