--- a/test-suite/tests/frame-manifest.jsonld	Wed Jun 05 18:01:14 2013 +0200
+++ b/test-suite/tests/frame-manifest.jsonld	Wed Jun 05 18:08:52 2013 +0200
@@ -111,42 +111,42 @@
       "frame": "frame-0015-frame.jsonld",
       "expect": "frame-0015-out.jsonld"
     }, {
-      "@id": "#t0015",
+      "@id": "#t0016",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "Use @type in ducktype filter",
       "input": "frame-0016-in.jsonld",
       "frame": "frame-0016-frame.jsonld",
       "expect": "frame-0016-out.jsonld"
     }, {
-      "@id": "#t0016",
+      "@id": "#t0017",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "Non-flat input",
       "input": "frame-0017-in.jsonld",
       "frame": "frame-0017-frame.jsonld",
       "expect": "frame-0017-out.jsonld"
     }, {
-      "@id": "#t0017",
+      "@id": "#t0018",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "no frame @context but @graph output",
       "input": "frame-0018-in.jsonld",
       "frame": "frame-0018-frame.jsonld",
       "expect": "frame-0018-out.jsonld"
     }, {
-      "@id": "#t0018",
+      "@id": "#t0019",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "Resources can be re-embedded again in each top-level frame match",
       "input": "frame-0019-in.jsonld",
       "frame": "frame-0019-frame.jsonld",
       "expect": "frame-0019-out.jsonld"
     }, {
-      "@id": "#t0019",
+      "@id": "#t0020",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "Blank nodes in an array",
       "input": "frame-0020-in.jsonld",
       "frame": "frame-0020-frame.jsonld",
       "expect": "frame-0020-out.jsonld"
     }, {
-      "@id": "#t0020",
+      "@id": "#t0021",
       "@type": ["jld:PositiveEvaluationTest", "jld:FrameTest"],
       "name": "Blank nodes in @type",
       "input": "frame-0021-in.jsonld",

--- a/test-suite/tests/normalize-manifest.jsonld	Wed Jun 05 18:01:14 2013 +0200
+++ b/test-suite/tests/normalize-manifest.jsonld	Wed Jun 05 18:08:52 2013 +0200
@@ -5,347 +5,349 @@
   "description": "JSON-LD to Expansion tests use object compare",
   "name": "normalize",
   "baseIri": "http://json-ld.org/test-suite/tests/",
-  "sequence": [{
-    "@id": "#t0001",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "simple id",
-    "input": "normalize-0001-in.jsonld",
-    "expect": "normalize-0001-out.nq"
-  }, {
-    "@id": "#t0002",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "duplicate property iri values",
-    "input": "normalize-0002-in.jsonld",
-    "expect": "normalize-0002-out.nq"
-  }, {
-    "@id": "#t0003",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "bnode",
-    "input": "normalize-0003-in.jsonld",
-    "expect": "normalize-0003-out.nq"
-  }, {
-    "@id": "#t0004",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "bnode plus embed w/subject",
-    "input": "normalize-0004-in.jsonld",
-    "expect": "normalize-0004-out.nq"
-  }, {
-    "@id": "#t0005",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "bnode embed",
-    "input": "normalize-0005-in.jsonld",
-    "expect": "normalize-0005-out.nq"
-  }, {
-    "@id": "#t0006",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "multiple rdf types",
-    "input": "normalize-0006-in.jsonld",
-    "expect": "normalize-0006-out.nq"
-  }, {
-    "@id": "#t0007",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "coerce CURIE value",
-    "input": "normalize-0007-in.jsonld",
-    "expect": "normalize-0007-out.nq"
-  }, {
-    "@id": "#t0008",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "single subject complex",
-    "input": "normalize-0008-in.jsonld",
-    "expect": "normalize-0008-out.nq"
-  }, {
-    "@id": "#t0009",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "multiple subjects - complex",
-    "input": "normalize-0009-in.jsonld",
-    "expect": "normalize-0009-out.nq"
-  }, {
-    "@id": "#t0010",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "type",
-    "input": "normalize-0010-in.jsonld",
-    "expect": "normalize-0010-out.nq"
-  }, {
-    "@id": "#t0011",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "type-coerced type",
-    "input": "normalize-0011-in.jsonld",
-    "expect": "normalize-0011-out.nq"
-  }, {
-    "@id": "#t0012",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "type-coerced type, remove duplicate reference",
-    "input": "normalize-0012-in.jsonld",
-    "expect": "normalize-0012-out.nq"
-  }, {
-    "@id": "#t0013",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "type-coerced type, cycle",
-    "input": "normalize-0013-in.jsonld",
-    "expect": "normalize-0013-out.nq"
-  }, {
-    "@id": "#t0014",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "check types",
-    "input": "normalize-0014-in.jsonld",
-    "expect": "normalize-0014-out.nq"
-  }, {
-    "@id": "#t0015",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "top level context",
-    "input": "normalize-0015-in.jsonld",
-    "expect": "normalize-0015-out.nq"
-  }, {
-    "@id": "#t0016",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - dual link - embed",
-    "input": "normalize-0016-in.jsonld",
-    "expect": "normalize-0016-out.nq"
-  }, {
-    "@id": "#t0017",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - dual link - non-embed",
-    "input": "normalize-0017-in.jsonld",
-    "expect": "normalize-0017-out.nq"
-  }, {
-    "@id": "#t0018",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - self link",
-    "input": "normalize-0018-in.jsonld",
-    "expect": "normalize-0018-out.nq"
-  }, {
-    "@id": "#t0019",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - disjoint self links",
-    "input": "normalize-0019-in.jsonld",
-    "expect": "normalize-0019-out.nq"
-  }, {
-    "@id": "#t0020",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - diamond",
-    "input": "normalize-0020-in.jsonld",
-    "expect": "normalize-0020-out.nq"
-  }, {
-    "@id": "#t0021",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - circle of 2",
-    "input": "normalize-0021-in.jsonld",
-    "expect": "normalize-0021-out.nq"
-  }, {
-    "@id": "#t0022",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 2",
-    "input": "normalize-0022-in.jsonld",
-    "expect": "normalize-0022-out.nq"
-  }, {
-    "@id": "#t0023",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - circle of 3",
-    "input": "normalize-0023-in.jsonld",
-    "expect": "normalize-0023-out.nq"
-  }, {
-    "@id": "#t0024",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (1-2-3)",
-    "input": "normalize-0024-in.jsonld",
-    "expect": "normalize-0024-out.nq"
-  }, {
-    "@id": "#t0025",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (1-3-2)",
-    "input": "normalize-0025-in.jsonld",
-    "expect": "normalize-0025-out.nq"
-  }, {
-    "@id": "#t0026",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (2-1-3)",
-    "input": "normalize-0026-in.jsonld",
-    "expect": "normalize-0026-out.nq"
-  }, {
-    "@id": "#t0027",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (2-3-1)",
-    "input": "normalize-0027-in.jsonld",
-    "expect": "normalize-0027-out.nq"
-  }, {
-    "@id": "#t0028",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (3-2-1)",
-    "input": "normalize-0028-in.jsonld",
-    "expect": "normalize-0028-out.nq"
-  }, {
-    "@id": "#t0029",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - double circle of 3 (3-1-2)",
-    "input": "normalize-0029-in.jsonld",
-    "expect": "normalize-0029-out.nq"
-  }, {
-    "@id": "#t0030",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "blank node - point at circle of 3",
-    "input": "normalize-0030-in.jsonld",
-    "expect": "normalize-0030-out.nq"
-  }, {
-    "@id": "#t0031",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "bnode (1)",
-    "input": "normalize-0031-in.jsonld",
-    "expect": "normalize-0031-out.nq"
-  }, {
-    "@id": "#t0032",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "bnode (2)",
-    "input": "normalize-0032-in.jsonld",
-    "expect": "normalize-0032-out.nq"
-  }, {
-    "@id": "#t0033",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "disjoint identical subgraphs (1)",
-    "input": "normalize-0033-in.jsonld",
-    "expect": "normalize-0033-out.nq"
-  }, {
-    "@id": "#t0034",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "disjoint identical subgraphs (2)",
-    "input": "normalize-0034-in.jsonld",
-    "expect": "normalize-0034-out.nq"
-  }, {
-    "@id": "#t0035",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered w/strings (1)",
-    "input": "normalize-0035-in.jsonld",
-    "expect": "normalize-0035-out.nq"
-  }, {
-    "@id": "#t0036",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered w/strings (2)",
-    "input": "normalize-0036-in.jsonld",
-    "expect": "normalize-0036-out.nq"
-  }, {
-    "@id": "#t0037",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered w/strings (3)",
-    "input": "normalize-0037-in.jsonld",
-    "expect": "normalize-0037-out.nq"
-  }, {
-    "@id": "#t0038",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered 4 bnodes, reordered 2 properties (1)",
-    "input": "normalize-0038-in.jsonld",
-    "expect": "normalize-0038-out.nq"
-  }, {
-    "@id": "#t0039",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered 4 bnodes, reordered 2 properties (2)",
-    "input": "normalize-0039-in.jsonld",
-    "expect": "normalize-0039-out.nq"
-  }, {
-    "@id": "#t0040",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered 6 bnodes (1)",
-    "input": "normalize-0040-in.jsonld",
-    "expect": "normalize-0040-out.nq"
-  }, {
-    "@id": "#t0041",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered 6 bnodes (2)",
-    "input": "normalize-0041-in.jsonld",
-    "expect": "normalize-0041-out.nq"
-  }, {
-    "@id": "#t0042",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "reordered 6 bnodes (3)",
-    "input": "normalize-0042-in.jsonld",
-    "expect": "normalize-0042-out.nq"
-  }, {
-    "@id": "#t0043",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "literal with language",
-    "input": "normalize-0043-in.jsonld",
-    "expect": "normalize-0043-out.nq"
-  }, {
-    "@id": "#t0044",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "evil (1)",
-    "input": "normalize-0044-in.jsonld",
-    "expect": "normalize-0044-out.nq"
-  }, {
-    "@id": "#t0045",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "evil (2)",
-    "input": "normalize-0045-in.jsonld",
-    "expect": "normalize-0045-out.nq"
-  }, {
-    "@id": "#t0046",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "evil (3)",
-    "input": "normalize-0046-in.jsonld",
-    "expect": "normalize-0046-out.nq"
-  }, {
-    "@id": "#t0047",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "deep diff (1)",
-    "input": "normalize-0047-in.jsonld",
-    "expect": "normalize-0047-out.nq"
-  }, {
-    "@id": "#t0048",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "deep diff (2)",
-    "input": "normalize-0048-in.jsonld",
-    "expect": "normalize-0048-out.nq"
-  }, {
-    "@id": "#t0049",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "remove null",
-    "input": "normalize-0049-in.jsonld",
-    "expect": "normalize-0049-out.nq"
-  }, {
-    "@id": "#t0050",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "nulls",
-    "input": "normalize-0050-in.jsonld",
-    "expect": "normalize-0050-out.nq"
-  }, {
-    "@id": "#t0051",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "merging subjects",
-    "input": "normalize-0051-in.jsonld",
-    "expect": "normalize-0051-out.nq"
-  }, {
-    "@id": "#t0052",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "alias keywords",
-    "input": "normalize-0052-in.jsonld",
-    "expect": "normalize-0052-out.nq"
-  }, {
-    "@id": "#t0053",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "@list",
-    "input": "normalize-0053-in.jsonld",
-    "expect": "normalize-0053-out.nq"
-  }, {
-    "@id": "#t0054",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "t-graph",
-    "input": "normalize-0054-in.jsonld",
-    "expect": "normalize-0054-out.nq"
-  }, {
-    "@id": "#t0055",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "simple reorder (1)",
-    "input": "normalize-0055-in.jsonld",
-    "expect": "normalize-0055-out.nq"
-  }, {
-    "@id": "#t0056",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "simple reorder (2)",
-    "input": "normalize-0056-in.jsonld",
-    "expect": "normalize-0056-out.nq"
-  }, {
-    "@id": "#t0057",
-    "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
-    "name": "unnamed graph",
-    "input": "normalize-0057-in.jsonld",
-    "expect": "normalize-0057-out.nq"
-  }]
+  "sequence": [
+    {
+      "@id": "#t0001",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "simple id",
+      "input": "normalize-0001-in.jsonld",
+      "expect": "normalize-0001-out.nq"
+    }, {
+      "@id": "#t0002",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "duplicate property iri values",
+      "input": "normalize-0002-in.jsonld",
+      "expect": "normalize-0002-out.nq"
+    }, {
+      "@id": "#t0003",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "bnode",
+      "input": "normalize-0003-in.jsonld",
+      "expect": "normalize-0003-out.nq"
+    }, {
+      "@id": "#t0004",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "bnode plus embed w/subject",
+      "input": "normalize-0004-in.jsonld",
+      "expect": "normalize-0004-out.nq"
+    }, {
+      "@id": "#t0005",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "bnode embed",
+      "input": "normalize-0005-in.jsonld",
+      "expect": "normalize-0005-out.nq"
+    }, {
+      "@id": "#t0006",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "multiple rdf types",
+      "input": "normalize-0006-in.jsonld",
+      "expect": "normalize-0006-out.nq"
+    }, {
+      "@id": "#t0007",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "coerce CURIE value",
+      "input": "normalize-0007-in.jsonld",
+      "expect": "normalize-0007-out.nq"
+    }, {
+      "@id": "#t0008",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "single subject complex",
+      "input": "normalize-0008-in.jsonld",
+      "expect": "normalize-0008-out.nq"
+    }, {
+      "@id": "#t0009",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "multiple subjects - complex",
+      "input": "normalize-0009-in.jsonld",
+      "expect": "normalize-0009-out.nq"
+    }, {
+      "@id": "#t0010",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "type",
+      "input": "normalize-0010-in.jsonld",
+      "expect": "normalize-0010-out.nq"
+    }, {
+      "@id": "#t0011",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "type-coerced type",
+      "input": "normalize-0011-in.jsonld",
+      "expect": "normalize-0011-out.nq"
+    }, {
+      "@id": "#t0012",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "type-coerced type, remove duplicate reference",
+      "input": "normalize-0012-in.jsonld",
+      "expect": "normalize-0012-out.nq"
+    }, {
+      "@id": "#t0013",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "type-coerced type, cycle",
+      "input": "normalize-0013-in.jsonld",
+      "expect": "normalize-0013-out.nq"
+    }, {
+      "@id": "#t0014",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "check types",
+      "input": "normalize-0014-in.jsonld",
+      "expect": "normalize-0014-out.nq"
+    }, {
+      "@id": "#t0015",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "top level context",
+      "input": "normalize-0015-in.jsonld",
+      "expect": "normalize-0015-out.nq"
+    }, {
+      "@id": "#t0016",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - dual link - embed",
+      "input": "normalize-0016-in.jsonld",
+      "expect": "normalize-0016-out.nq"
+    }, {
+      "@id": "#t0017",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - dual link - non-embed",
+      "input": "normalize-0017-in.jsonld",
+      "expect": "normalize-0017-out.nq"
+    }, {
+      "@id": "#t0018",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - self link",
+      "input": "normalize-0018-in.jsonld",
+      "expect": "normalize-0018-out.nq"
+    }, {
+      "@id": "#t0019",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - disjoint self links",
+      "input": "normalize-0019-in.jsonld",
+      "expect": "normalize-0019-out.nq"
+    }, {
+      "@id": "#t0020",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - diamond",
+      "input": "normalize-0020-in.jsonld",
+      "expect": "normalize-0020-out.nq"
+    }, {
+      "@id": "#t0021",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - circle of 2",
+      "input": "normalize-0021-in.jsonld",
+      "expect": "normalize-0021-out.nq"
+    }, {
+      "@id": "#t0022",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 2",
+      "input": "normalize-0022-in.jsonld",
+      "expect": "normalize-0022-out.nq"
+    }, {
+      "@id": "#t0023",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - circle of 3",
+      "input": "normalize-0023-in.jsonld",
+      "expect": "normalize-0023-out.nq"
+    }, {
+      "@id": "#t0024",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (1-2-3)",
+      "input": "normalize-0024-in.jsonld",
+      "expect": "normalize-0024-out.nq"
+    }, {
+      "@id": "#t0025",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (1-3-2)",
+      "input": "normalize-0025-in.jsonld",
+      "expect": "normalize-0025-out.nq"
+    }, {
+      "@id": "#t0026",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (2-1-3)",
+      "input": "normalize-0026-in.jsonld",
+      "expect": "normalize-0026-out.nq"
+    }, {
+      "@id": "#t0027",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (2-3-1)",
+      "input": "normalize-0027-in.jsonld",
+      "expect": "normalize-0027-out.nq"
+    }, {
+      "@id": "#t0028",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (3-2-1)",
+      "input": "normalize-0028-in.jsonld",
+      "expect": "normalize-0028-out.nq"
+    }, {
+      "@id": "#t0029",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - double circle of 3 (3-1-2)",
+      "input": "normalize-0029-in.jsonld",
+      "expect": "normalize-0029-out.nq"
+    }, {
+      "@id": "#t0030",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "blank node - point at circle of 3",
+      "input": "normalize-0030-in.jsonld",
+      "expect": "normalize-0030-out.nq"
+    }, {
+      "@id": "#t0031",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "bnode (1)",
+      "input": "normalize-0031-in.jsonld",
+      "expect": "normalize-0031-out.nq"
+    }, {
+      "@id": "#t0032",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "bnode (2)",
+      "input": "normalize-0032-in.jsonld",
+      "expect": "normalize-0032-out.nq"
+    }, {
+      "@id": "#t0033",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "disjoint identical subgraphs (1)",
+      "input": "normalize-0033-in.jsonld",
+      "expect": "normalize-0033-out.nq"
+    }, {
+      "@id": "#t0034",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "disjoint identical subgraphs (2)",
+      "input": "normalize-0034-in.jsonld",
+      "expect": "normalize-0034-out.nq"
+    }, {
+      "@id": "#t0035",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered w/strings (1)",
+      "input": "normalize-0035-in.jsonld",
+      "expect": "normalize-0035-out.nq"
+    }, {
+      "@id": "#t0036",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered w/strings (2)",
+      "input": "normalize-0036-in.jsonld",
+      "expect": "normalize-0036-out.nq"
+    }, {
+      "@id": "#t0037",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered w/strings (3)",
+      "input": "normalize-0037-in.jsonld",
+      "expect": "normalize-0037-out.nq"
+    }, {
+      "@id": "#t0038",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered 4 bnodes, reordered 2 properties (1)",
+      "input": "normalize-0038-in.jsonld",
+      "expect": "normalize-0038-out.nq"
+    }, {
+      "@id": "#t0039",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered 4 bnodes, reordered 2 properties (2)",
+      "input": "normalize-0039-in.jsonld",
+      "expect": "normalize-0039-out.nq"
+    }, {
+      "@id": "#t0040",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered 6 bnodes (1)",
+      "input": "normalize-0040-in.jsonld",
+      "expect": "normalize-0040-out.nq"
+    }, {
+      "@id": "#t0041",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered 6 bnodes (2)",
+      "input": "normalize-0041-in.jsonld",
+      "expect": "normalize-0041-out.nq"
+    }, {
+      "@id": "#t0042",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "reordered 6 bnodes (3)",
+      "input": "normalize-0042-in.jsonld",
+      "expect": "normalize-0042-out.nq"
+    }, {
+      "@id": "#t0043",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "literal with language",
+      "input": "normalize-0043-in.jsonld",
+      "expect": "normalize-0043-out.nq"
+    }, {
+      "@id": "#t0044",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "evil (1)",
+      "input": "normalize-0044-in.jsonld",
+      "expect": "normalize-0044-out.nq"
+    }, {
+      "@id": "#t0045",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "evil (2)",
+      "input": "normalize-0045-in.jsonld",
+      "expect": "normalize-0045-out.nq"
+    }, {
+      "@id": "#t0046",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "evil (3)",
+      "input": "normalize-0046-in.jsonld",
+      "expect": "normalize-0046-out.nq"
+    }, {
+      "@id": "#t0047",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "deep diff (1)",
+      "input": "normalize-0047-in.jsonld",
+      "expect": "normalize-0047-out.nq"
+    }, {
+      "@id": "#t0048",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "deep diff (2)",
+      "input": "normalize-0048-in.jsonld",
+      "expect": "normalize-0048-out.nq"
+    }, {
+      "@id": "#t0049",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "remove null",
+      "input": "normalize-0049-in.jsonld",
+      "expect": "normalize-0049-out.nq"
+    }, {
+      "@id": "#t0050",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "nulls",
+      "input": "normalize-0050-in.jsonld",
+      "expect": "normalize-0050-out.nq"
+    }, {
+      "@id": "#t0051",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "merging subjects",
+      "input": "normalize-0051-in.jsonld",
+      "expect": "normalize-0051-out.nq"
+    }, {
+      "@id": "#t0052",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "alias keywords",
+      "input": "normalize-0052-in.jsonld",
+      "expect": "normalize-0052-out.nq"
+    }, {
+      "@id": "#t0053",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "@list",
+      "input": "normalize-0053-in.jsonld",
+      "expect": "normalize-0053-out.nq"
+    }, {
+      "@id": "#t0054",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "t-graph",
+      "input": "normalize-0054-in.jsonld",
+      "expect": "normalize-0054-out.nq"
+    }, {
+      "@id": "#t0055",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "simple reorder (1)",
+      "input": "normalize-0055-in.jsonld",
+      "expect": "normalize-0055-out.nq"
+    }, {
+      "@id": "#t0056",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "simple reorder (2)",
+      "input": "normalize-0056-in.jsonld",
+      "expect": "normalize-0056-out.nq"
+    }, {
+      "@id": "#t0057",
+      "@type": ["jld:PositiveEvaluationTest", "jld:NormalizeTest"],
+      "name": "unnamed graph",
+      "input": "normalize-0057-in.jsonld",
+      "expect": "normalize-0057-out.nq"
+    }
+  ]
 }

--- a/test-suite/tests/toRdf-manifest.jsonld	Wed Jun 05 18:01:14 2013 +0200
+++ b/test-suite/tests/toRdf-manifest.jsonld	Wed Jun 05 18:08:52 2013 +0200
@@ -147,91 +147,91 @@
       "input": "toRdf-0020-in.jsonld",
       "expect": "toRdf-0020-out.nq"
     }, {
-      "@id": "#t0021",
+      "@id": "#t0022",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Test coercion of double value",
       "purpose": "Tests that a decimal value generates a xsd:double typed literal;.",
       "input": "toRdf-0022-in.jsonld",
       "expect": "toRdf-0022-out.nq"
     }, {
-      "@id": "#t0022",
+      "@id": "#t0023",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Test coercion of integer value",
       "purpose": "Tests that a decimal value generates a xsd:integer typed literal.",
       "input": "toRdf-0023-in.jsonld",
       "expect": "toRdf-0023-out.nq"
     }, {
-      "@id": "#t0023",
+      "@id": "#t0024",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Test coercion of boolean value",
       "purpose": "Tests that a decimal value generates a xsd:boolean typed literal.",
       "input": "toRdf-0024-in.jsonld",
       "expect": "toRdf-0024-out.nq"
     }, {
-      "@id": "#t0024",
+      "@id": "#t0025",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Test list coercion with single element",
       "purpose": "Tests that an array with a single element on a property with @list coercion creates an RDF Collection.",
       "input": "toRdf-0025-in.jsonld",
       "expect": "toRdf-0025-out.nq"
     }, {
-      "@id": "#t0025",
+      "@id": "#t0026",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Test creation of multiple types",
       "purpose": "Tests that @type with an array of types creates multiple types.",
       "input": "toRdf-0026-in.jsonld",
       "expect": "toRdf-0026-out.nq"
     }, {
-      "@id": "#t0026",
+      "@id": "#t0027",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Simple named graph (Wikidata)",
       "purpose": "Using @graph with other keys places triples in a named graph.",
       "input": "toRdf-0027-in.jsonld",
       "expect": "toRdf-0027-out.nq"
     }, {
-      "@id": "#t0027",
+      "@id": "#t0028",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Simple named graph",
       "purpose": "Signing a graph.",
       "input": "toRdf-0028-in.jsonld",
       "expect": "toRdf-0028-out.nq"
     }, {
-      "@id": "#t0028",
+      "@id": "#t0029",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "named graph with embedded named graph",
       "purpose": "Tests that named graphs containing named graphs flatten to single level of graph naming.",
       "input": "toRdf-0029-in.jsonld",
       "expect": "toRdf-0029-out.nq"
     }, {
-      "@id": "#t0029",
+      "@id": "#t0030",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "top-level graph with string subject reference",
       "purpose": "Tests graphs containing subject references as strings.",
       "input": "toRdf-0030-in.jsonld",
       "expect": "toRdf-0030-out.nq"
     }, {
-      "@id": "#t0030",
+      "@id": "#t0031",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "Reverse property",
       "purpose": "Tests conversion of reverse properties.",
       "input": "toRdf-0031-in.jsonld",
       "expect": "toRdf-0031-out.nq"
     }, {
-      "@id": "#t0031",
+      "@id": "#t0032",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "@context reordering",
       "purpose": "Tests that generated triples do not depend on order of @context.",
       "input": "toRdf-0032-in.jsonld",
       "expect": "toRdf-0032-out.nq"
     }, {
-      "@id": "#t0032",
+      "@id": "#t0033",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "@id reordering",
       "purpose": "Tests that generated triples do not depend on order of @id.",
       "input": "toRdf-0033-in.jsonld",
       "expect": "toRdf-0033-out.nq"
     }, {
-      "@id": "#t0033",
+      "@id": "#t0034",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
       "name": "context properties reordering",
       "purpose": "Tests that generated triples do not depend on order of properties inside @context.",