Remove property generator tests from test suite
authorMarkus Lanthaler <mark_lanthaler@gmx.net>
Wed, 06 Mar 2013 17:50:29 +0100
changeset 1381 9bdb9eafb545
parent 1380 b5462e33f298
child 1382 10a457f7b664
Remove property generator tests from test suite

This addresses #142.
test-suite/tests/compact-0031-context.jsonld
test-suite/tests/compact-0031-in.jsonld
test-suite/tests/compact-0031-out.jsonld
test-suite/tests/compact-0032-context.jsonld
test-suite/tests/compact-0032-in.jsonld
test-suite/tests/compact-0032-out.jsonld
test-suite/tests/compact-0033-context.jsonld
test-suite/tests/compact-0033-in.jsonld
test-suite/tests/compact-0033-out.jsonld
test-suite/tests/compact-0034-context.jsonld
test-suite/tests/compact-0034-in.jsonld
test-suite/tests/compact-0034-out.jsonld
test-suite/tests/compact-0035-context.jsonld
test-suite/tests/compact-0035-in.jsonld
test-suite/tests/compact-0035-out.jsonld
test-suite/tests/compact-0036-context.jsonld
test-suite/tests/compact-0036-in.jsonld
test-suite/tests/compact-0036-out.jsonld
test-suite/tests/compact-0037-context.jsonld
test-suite/tests/compact-0037-in.jsonld
test-suite/tests/compact-0037-out.jsonld
test-suite/tests/compact-0044-context.jsonld
test-suite/tests/compact-0044-in.jsonld
test-suite/tests/compact-0044-out.jsonld
test-suite/tests/compact-0046-context.jsonld
test-suite/tests/compact-0046-in.jsonld
test-suite/tests/compact-0046-out.jsonld
test-suite/tests/compact-0047-context.jsonld
test-suite/tests/compact-0047-in.jsonld
test-suite/tests/compact-0047-out.jsonld
test-suite/tests/compact-0050-context.jsonld
test-suite/tests/compact-0050-in.jsonld
test-suite/tests/compact-0050-out.jsonld
test-suite/tests/compact-manifest.jsonld
test-suite/tests/expand-0037-in.jsonld
test-suite/tests/expand-0037-out.jsonld
test-suite/tests/expand-0039-in.jsonld
test-suite/tests/expand-0039-out.jsonld
test-suite/tests/expand-0042-in.jsonld
test-suite/tests/expand-0042-out.jsonld
test-suite/tests/expand-0043-in.jsonld
test-suite/tests/expand-0043-out.jsonld
test-suite/tests/expand-0049-in.jsonld
test-suite/tests/expand-0049-out.jsonld
test-suite/tests/expand-manifest.jsonld
test-suite/tests/flatten-0037-in.jsonld
test-suite/tests/flatten-0037-out.jsonld
test-suite/tests/flatten-0039-in.jsonld
test-suite/tests/flatten-0039-out.jsonld
test-suite/tests/flatten-manifest.jsonld
--- a/test-suite/tests/compact-0031-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  }
-}
--- a/test-suite/tests/compact-0031-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[{
-   "@id": "http://example.com/node/1",
-   "http://example.com/vocab/field_related": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }],
-   "http://schema.org/about": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }, {
-      "@id": "http://example.com/term/this-is-a-tag"
-   }],
-   "http://example.com/vocab/field_tags": [{
-      "@id": "http://example.com/term/this-is-a-tag"
-   }]
-}]
--- a/test-suite/tests/compact-0031-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  },
-  "@id": "site:node/1",
-  "field_tags": [
-    { "@id": "site:term/this-is-a-tag" }
-  ],
-  "field_related": {
-    "@id": "site:node/this-is-related-news"
-  }
-}
--- a/test-suite/tests/compact-0032-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-{
-  "@context": {
-    "vocab": "http://example.com/vocab/",
-    "sharedTerm": "http://www.example.org/shared/term",
-    "@language": "de",
-    "propGenA": {
-      "@id": [ "vocab:propGenA", "sharedTerm" ]
-    },
-    "propGenB": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@container": "@list"
-    },
-    "propGenC": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ]
-    }
-  }
-}
--- a/test-suite/tests/compact-0032-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,748 +0,0 @@
-[
-  {
-    "@id": "http://ex.com/root",
-    "http://example.com/vocab/propGenA": [
-      {
-        "@value": "propGenA.coll.1",
-        "@language": "de"
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ]
-      },
-      {
-        "@id": "http://ex.com/propA.1"
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propA.2",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t0"
-      },
-      {
-        "@value": "propA.3",
-        "@language": "de"
-      },
-      {
-        "@id": "http://ex.com/propA.4"
-      },
-      {
-        "http://example.com/vocab/nested": [
-          {
-            "http://example.com/vocab/nested": [
-              {
-                "@value": 10510
-              },
-              {
-                "@value": "propA.5.1.1",
-                "@language": "de"
-              },
-              {
-                "@id": "http://ex.com/propA.5.1.2"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propA.5.1.3",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t3"
-              }
-            ],
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propA.5.1",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t2"
-          },
-          {
-            "@id": "http://ex.com/propA.5.2",
-            "http://example.com/vocab/nested": [
-              {
-                "@value": "propA.5.2.1",
-                "@language": "de"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propA.5.2.2",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t4"
-              },
-              {
-                "@id": "http://ex.com/propA.5.2.3"
-              },
-              {
-                "@value": 10524
-              }
-            ]
-          }
-        ],
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propA.5",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t1"
-      },
-      {
-        "@value": 10600
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t5"
-      }
-    ],
-    "http://example.com/vocab/propGenB": [
-      {
-        "@value": "propGenB.coll.1",
-        "@language": "de"
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ]
-      },
-      {
-        "@list": [
-          {
-            "@value": 20000,
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "@value": "propB.1",
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "collission",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t6"
-          },
-          {
-            "@id": "http://ex.com/propB.2",
-            "http://example.com/vocab/nested": [
-              {
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": 20110
-                  },
-                  {
-                    "@value": "propB.2.1.1",
-                    "@language": "de"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.1.2"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t8"
-                  }
-                ],
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propB.2.1",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t7"
-              },
-              {
-                "@id": "http://ex.com/propB.2.2",
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": "propB.2.2.1",
-                    "@language": "de"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t9"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.2.3"
-                  },
-                  {
-                    "@value": 20224
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propB.3",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t10"
-          }
-        ]
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t11"
-      },
-      {
-        "@value": "propC.2",
-        "@language": "en"
-      },
-      {
-        "@value": 30300
-      },
-      {
-        "@id": "http://ex.com/propC.4"
-      },
-      {
-        "http://example.com/vocab/nested": [
-          {
-            "http://example.com/vocab/nested": [
-              {
-                "@value": 10510
-              },
-              {
-                "@value": "propC.5.1.1",
-                "@language": "de"
-              },
-              {
-                "@id": "http://ex.com/propC.5.1.2"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.1.3",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t14"
-              }
-            ],
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propC.5.1",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t13"
-          },
-          {
-            "@id": "http://ex.com/propC.5.2",
-            "http://example.com/vocab/nested": [
-              {
-                "@value": "propC.5.2.1",
-                "@language": "de"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.2.2",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t15"
-              },
-              {
-                "@id": "http://ex.com/propC.5.2.3"
-              },
-              {
-                "@value": 10524
-              }
-            ]
-          }
-        ],
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propC.5",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t12"
-      }
-    ],
-    "http://www.example.org/shared/term": [
-      {
-        "@id": "http://ex.com/propA.1"
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propA.2",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t0"
-      },
-      {
-        "@value": "propA.3",
-        "@language": "de"
-      },
-      {
-        "@id": "http://ex.com/propA.4"
-      },
-      {
-        "http://example.com/vocab/nested": [
-          {
-            "http://example.com/vocab/nested": [
-              {
-                "@value": 10510
-              },
-              {
-                "@value": "propA.5.1.1",
-                "@language": "de"
-              },
-              {
-                "@id": "http://ex.com/propA.5.1.2"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propA.5.1.3",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t3"
-              }
-            ],
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propA.5.1",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t2"
-          },
-          {
-            "@id": "http://ex.com/propA.5.2",
-            "http://example.com/vocab/nested": [
-              {
-                "@value": "propA.5.2.1",
-                "@language": "de"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propA.5.2.2",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t4"
-              },
-              {
-                "@id": "http://ex.com/propA.5.2.3"
-              },
-              {
-                "@value": 10524
-              }
-            ]
-          }
-        ],
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propA.5",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t1"
-      },
-      {
-        "@value": 10600
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t5"
-      },
-      {
-        "@list": [
-          {
-            "@value": 20000,
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "@value": "propB.1",
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "collission",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t6"
-          },
-          {
-            "@id": "http://ex.com/propB.2",
-            "http://example.com/vocab/nested": [
-              {
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": 20110
-                  },
-                  {
-                    "@value": "propB.2.1.1",
-                    "@language": "de"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.1.2"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t8"
-                  }
-                ],
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propB.2.1",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t7"
-              },
-              {
-                "@id": "http://ex.com/propB.2.2",
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": "propB.2.2.1",
-                    "@language": "de"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t9"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.2.3"
-                  },
-                  {
-                    "@value": 20224
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propB.3",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t10"
-          }
-        ]
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t11"
-      },
-      {
-        "@value": "propC.2",
-        "@language": "en"
-      },
-      {
-        "@value": 30300
-      },
-      {
-        "@id": "http://ex.com/propC.4"
-      },
-      {
-        "http://example.com/vocab/nested": [
-          {
-            "http://example.com/vocab/nested": [
-              {
-                "@value": 10510
-              },
-              {
-                "@value": "propC.5.1.1",
-                "@language": "de"
-              },
-              {
-                "@id": "http://ex.com/propC.5.1.2"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.1.3",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t14"
-              }
-            ],
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propC.5.1",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t13"
-          },
-          {
-            "@id": "http://ex.com/propC.5.2",
-            "http://example.com/vocab/nested": [
-              {
-                "@value": "propC.5.2.1",
-                "@language": "de"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.2.2",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t15"
-              },
-              {
-                "@id": "http://ex.com/propC.5.2.3"
-              },
-              {
-                "@value": 10524
-              }
-            ]
-          }
-        ],
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propC.5",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t12"
-      }
-    ],
-    "http://example.com/somethingElse": [
-      {
-        "@list": [
-          {
-            "@value": 20000,
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "@value": "propB.1",
-            "@type": "http://datatype.example.org/type"
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "collission",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t6"
-          },
-          {
-            "@id": "http://ex.com/propB.2",
-            "http://example.com/vocab/nested": [
-              {
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": 20110
-                  },
-                  {
-                    "@value": "propB.2.1.1",
-                    "@language": "de"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.1.2"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t8"
-                  }
-                ],
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propB.2.1",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t7"
-              },
-              {
-                "@id": "http://ex.com/propB.2.2",
-                "http://example.com/vocab/nested": [
-                  {
-                    "@value": "propB.2.2.1",
-                    "@language": "de"
-                  },
-                  {
-                    "http://example.com/vocab/term": [
-                      {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                      }
-                    ],
-                    "@id": "_:t9"
-                  },
-                  {
-                    "@id": "http://ex.com/propB.2.2.3"
-                  },
-                  {
-                    "@value": 20224
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propB.3",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t10"
-          }
-        ]
-      },
-      {
-        "http://example.com/vocab/term": [
-          {
-            "@value": "collission",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t11"
-      },
-      {
-        "@value": "propC.2",
-        "@language": "en"
-      },
-      {
-        "@value": 30300
-      },
-      {
-        "@id": "http://ex.com/propC.4"
-      },
-      {
-        "http://example.com/vocab/nested": [
-          {
-            "http://example.com/vocab/nested": [
-              {
-                "@value": 10510
-              },
-              {
-                "@value": "propC.5.1.1",
-                "@language": "de"
-              },
-              {
-                "@id": "http://ex.com/propC.5.1.2"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.1.3",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t14"
-              }
-            ],
-            "http://example.com/vocab/term": [
-              {
-                "@value": "http://ex.com/propC.5.1",
-                "@language": "de"
-              }
-            ],
-            "@id": "_:t13"
-          },
-          {
-            "@id": "http://ex.com/propC.5.2",
-            "http://example.com/vocab/nested": [
-              {
-                "@value": "propC.5.2.1",
-                "@language": "de"
-              },
-              {
-                "http://example.com/vocab/term": [
-                  {
-                    "@value": "http://ex.com/propC.5.2.2",
-                    "@language": "de"
-                  }
-                ],
-                "@id": "_:t15"
-              },
-              {
-                "@id": "http://ex.com/propC.5.2.3"
-              },
-              {
-                "@value": 10524
-              }
-            ]
-          }
-        ],
-        "http://example.com/vocab/term": [
-          {
-            "@value": "http://ex.com/propC.5",
-            "@language": "de"
-          }
-        ],
-        "@id": "_:t12"
-      }
-    ]
-  }
-]
--- a/test-suite/tests/compact-0032-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-{
-  "@context": {
-    "vocab": "http://example.com/vocab/",
-    "sharedTerm": "http://www.example.org/shared/term",
-    "@language": "de",
-    "propGenA": {
-      "@id": [ "vocab:propGenA", "sharedTerm" ]
-    },
-    "propGenB": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@container": "@list"
-    },
-    "propGenC": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ]
-    }
-  },
-  "@id": "http://ex.com/root",
-  "propGenA": [
-    {
-      "@id": "http://ex.com/propA.1"
-    },
-    {
-      "@id": "_:b10",
-      "vocab:term": "http://ex.com/propA.2"
-    },
-    "propA.3",
-    {
-      "@id": "http://ex.com/propA.4"
-    },
-    {
-      "@id": "_:b11",
-      "vocab:term": "http://ex.com/propA.5",
-      "vocab:nested": [
-        {
-          "@id": "_:b12",
-          "vocab:term": "http://ex.com/propA.5.1",
-          "vocab:nested": [
-            10510,
-            "propA.5.1.1",
-            {
-              "@id": "http://ex.com/propA.5.1.2"
-            },
-            {
-              "@id": "_:b13",
-              "vocab:term": "http://ex.com/propA.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propA.5.2",
-          "vocab:nested": [
-            "propA.5.2.1",
-            {
-              "@id": "_:b14",
-              "vocab:term": "http://ex.com/propA.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propA.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    },
-    10600,
-    {
-      "@id": "_:b15",
-      "vocab:term": "collission"
-    }
-  ],
-  "propGenB": [
-    {
-      "@value": 20000,
-      "@type": "http://datatype.example.org/type"
-    },
-    {
-      "@value": "propB.1",
-      "@type": "http://datatype.example.org/type"
-    },
-    {
-      "@id": "_:b0",
-      "vocab:term": "collission"
-    },
-    {
-      "@id": "http://ex.com/propB.2",
-      "vocab:nested": [
-        {
-         "@id": "_:b1",
-          "vocab:term": "http://ex.com/propB.2.1",
-          "vocab:nested": [
-            20110,
-            "propB.2.1.1",
-            {
-              "@id": "http://ex.com/propB.2.1.2"
-            },
-            {
-              "@id": "_:b2",
-              "vocab:term": "http://ex.com/propB.2.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propB.2.2",
-          "vocab:nested": [
-            "propB.2.2.1",
-            {
-              "@id": "_:b3",
-              "vocab:term": "http://ex.com/propB.2.2.2"
-            },
-            {
-              "@id": "http://ex.com/propB.2.2.3"
-            },
-            20224
-          ]
-        }
-      ]
-    },
-    {
-      "@id": "_:b4",
-      "vocab:term": "http://ex.com/propB.3"
-    }
-  ],
-  "propGenC": [
-    {
-      "@id": "_:b5",
-      "vocab:term": "collission"
-    },
-    {
-      "@value": "propC.2",
-      "@language": "en"
-    },
-    30300,
-    {
-      "@id": "http://ex.com/propC.4"
-    },
-    {
-      "@id": "_:b6",
-      "vocab:term": "http://ex.com/propC.5",
-      "vocab:nested": [
-        {
-         "@id": "_:b7",
-          "vocab:term": "http://ex.com/propC.5.1",
-          "vocab:nested": [
-            10510,
-            "propC.5.1.1",
-            {
-              "@id": "http://ex.com/propC.5.1.2"
-            },
-            {
-              "@id": "_:b8",
-              "vocab:term": "http://ex.com/propC.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propC.5.2",
-          "vocab:nested": [
-            "propC.5.2.1",
-            {
-              "@id": "_:b9",
-              "vocab:term": "http://ex.com/propC.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propC.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    }
-  ],
-  "vocab:propGenA": [
-    "propGenA.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ],
-  "vocab:propGenB": [
-    "propGenB.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ]
-}
--- a/test-suite/tests/compact-0033-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "z_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "z_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  }
-}
--- a/test-suite/tests/compact-0033-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[{
-   "@id": "http://example.com/node/1",
-   "http://example.com/vocab/field_related": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }],
-   "http://schema.org/about": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }, {
-      "@id": "http://example.com/term/this-is-a-tag"
-   }],
-   "http://example.com/vocab/field_tags": [{
-      "@id": "http://example.com/term/this-is-a-tag"
-   }]
-}]
--- a/test-suite/tests/compact-0033-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "z_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ],
-      "@container": "@set"
-    },
-    "z_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  },
-  "@id": "site:node/1",
-  "z_tags": [
-    { "@id": "site:term/this-is-a-tag" }
-  ],
-  "z_related": {
-    "@id": "site:node/this-is-related-news"
-  }
-}
--- a/test-suite/tests/compact-0034-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags_nc": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ] },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ], "@container": "@set", "@type": "@id" },
-    "field_related_nc": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ] },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@set" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list", "@language": "en" }
-  }
-}
--- a/test-suite/tests/compact-0034-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[
-   {
-      "@id": "http://example.com/node/1",
-      "http://example.com/vocab/field_related": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         }
-      ],
-      "http://schema.org/about": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         },
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ],
-      "http://example.com/vocab/field_tags": [
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ]
-   }
-]
--- a/test-suite/tests/compact-0034-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags_nc": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ] },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ], "@container": "@set", "@type": "@id" },
-    "field_related_nc": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ] },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@set" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ], "@container": "@list", "@language": "en" }
-  },
-  "@id": "site:node/1",
-  "field_tags_set_id": [
-    "site:term/this-is-a-tag"
-  ],
-  "field_related_list": [
-    {
-      "@id": "site:node/this-is-related-news"
-    },
-    {
-      "@value": "This is a related string",
-      "@language": "en"
-    }
-  ]
-}
--- a/test-suite/tests/compact-0035-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "doesntExist": "http://example.com/doesntExistInInputData",
-    "field_tags_this_matches_all_iris": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ] },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set", "@type": "@id" },
-    "field_related_this_matches_all_iris": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ] },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@language": "en" }
-  }
-}
--- a/test-suite/tests/compact-0035-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[
-   {
-      "@id": "http://example.com/node/1",
-      "http://example.com/vocab/field_related": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         }
-      ],
-      "http://schema.org/about": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         },
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ],
-      "http://example.com/vocab/field_tags": [
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ]
-   }
-]
--- a/test-suite/tests/compact-0035-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "doesntExist": "http://example.com/doesntExistInInputData",
-    "field_tags_this_matches_all_iris": { "@id": [ "site:vocab/field_tags", "http://schema.org/about" ] },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set", "@type": "@id" },
-    "field_related_this_matches_all_iris": { "@id": [ "site:vocab/field_related", "http://schema.org/about" ] },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@language": "en" }
-  },
-  "@id": "site:node/1",
-  "field_tags_this_matches_all_iris": {
-      "@id": "site:term/this-is-a-tag"
-  },
-  "field_related_this_matches_all_iris": {
-    "@list": [
-      {
-        "@id": "site:node/this-is-related-news"
-      },
-      {
-        "@value": "This is a related string",
-        "@language": "en"
-      }
-    ]
-  }
-}
--- a/test-suite/tests/compact-0036-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "doesntExist": "http://example.com/doesntExistInInputData",
-    "schema": "http://schema.org/",
-    "field_tags_term_set": { "@id": "site:vocab/field_tags", "@container": "@set" },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set", "@type": "@id" },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_related_term_list": { "@id": "site:vocab/field_related", "@container": "@list" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@language": "en" }
-  }
-}
--- a/test-suite/tests/compact-0036-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[
-   {
-      "@id": "http://example.com/node/1",
-      "http://example.com/vocab/field_related": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         }
-      ],
-      "http://schema.org/about": [
-         {
-            "@list": [
-               {
-                  "@id": "http://example.com/node/this-is-related-news"
-               },
-               {
-                  "@value": "This is a related string",
-                  "@language": "en"
-               }
-            ]
-         },
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ],
-      "http://example.com/vocab/field_tags": [
-         {
-            "@id": "http://example.com/term/this-is-a-tag"
-         }
-      ]
-   }
-]
--- a/test-suite/tests/compact-0036-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "doesntExist": "http://example.com/doesntExistInInputData",
-    "schema": "http://schema.org/",
-    "field_tags_term_set": { "@id": "site:vocab/field_tags", "@container": "@set" },
-    "field_tags_set": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_tags_set_id": { "@id": [ "site:vocab/field_tags", "http://schema.org/about", "doesntExist" ], "@container": "@set", "@type": "@id" },
-    "field_related_set": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@set" },
-    "field_related_term_list": { "@id": "site:vocab/field_related", "@container": "@list" },
-    "field_related_list": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list" },
-    "field_related_list_id": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@type": "@id" },
-    "field_related_list_lang": { "@id": [ "site:vocab/field_related", "http://schema.org/about", "doesntExist" ], "@container": "@list", "@language": "en" }
-  },
-  "@id": "site:node/1",
-  "field_tags_term_set": [
-    {
-        "@id": "site:term/this-is-a-tag"
-    }
-  ],
-  "field_related_term_list": [
-    {
-      "@id": "site:node/this-is-related-news"
-    },
-    {
-      "@value": "This is a related string",
-      "@language": "en"
-    }
-  ],
-  "schema:about": [
-     {
-        "@list": [
-           {
-              "@id": "site:node/this-is-related-news"
-           },
-           {
-              "@value": "This is a related string",
-              "@language": "en"
-           }
-        ]
-     },
-     {
-        "@id": "site:term/this-is-a-tag"
-     }
-  ]
-}
--- a/test-suite/tests/compact-0037-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "site-syn": "site:site-schema/syndication/",
-    "schema": "http://schema.org/",
-    "title": {
-      "@id": [ "site-syn:node/article/title", "schema:name" ],
-      "@container": "@set"
-    },
-    "body_value": {
-      "@id": [ "site-syn:node/article/body/value", "schema:articleBody" ],
-      "@container": "@set"
-    },
-    "body_summary": {
-      "@id": [ "site-syn:node/article/body/summary", "schema:description" ],
-      "@container": "@set"
-    },
-    "field_tags": {
-      "@id": [ "site-syn:node/article/field_tags", "schema:about" ],
-      "@container": "@set"
-    }
-  }
-}
--- a/test-suite/tests/compact-0037-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "site-syn": "site:site-schema/syndication/",
-    "schema": "http://schema.org/",
-    "title": {
-      "@id": [ "site-syn:node/article/title", "schema:name" ],
-      "@container": "@set"
-    },
-    "body_value": {
-      "@id": [ "site-syn:node/article/body/value", "schema:articleBody" ],
-      "@container": "@set"
-    },
-    "body_summary": {
-      "@id": [ "site-syn:node/article/body/summary", "schema:description" ],
-      "@container": "@set"
-    },
-    "field_tags": {
-      "@id": [ "site-syn:node/article/field_tags", "schema:about" ],
-      "@container": "@set"
-    }
-  },
-  "title": [
-    "This is the title in English"
-  ],
-  "body_value": [
-    "This is the body value in English."
-  ],
-  "body_summary": [
-    "This is the teaser for the body value."
-  ],
-  "field_tags": [
-    {
-      "@id": "site:taxonomy/term/1"
-    }
-  ]
-}
--- a/test-suite/tests/compact-0037-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "site-syn": "site:site-schema/syndication/",
-    "schema": "http://schema.org/",
-    "title": {
-      "@id": [ "site-syn:node/article/title", "schema:name" ],
-      "@container": "@set"
-    },
-    "body_value": {
-      "@id": [ "site-syn:node/article/body/value", "schema:articleBody" ],
-      "@container": "@set"
-    },
-    "body_summary": {
-      "@id": [ "site-syn:node/article/body/summary", "schema:description" ],
-      "@container": "@set"
-    },
-    "field_tags": {
-      "@id": [ "site-syn:node/article/field_tags", "schema:about" ],
-      "@container": "@set"
-    }
-  },
-  "title": [
-    "This is the title in English"
-  ],
-  "body_value": [
-    "This is the body value in English."
-  ],
-  "body_summary": [
-    "This is the teaser for the body value."
-  ],
-  "field_tags": [
-    {
-      "@id": "site:taxonomy/term/1"
-    }
-  ]
-}
--- a/test-suite/tests/compact-0044-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-{
-  "@context": {
-    "prop": "http://example.com/prop/",
-    "propGen": {
-      "@id": [ "prop:1", "prop:2", "prop:3" ]
-    },
-    "propGenMismatch": {
-      "@id": [ "prop:4", "prop:5", "prop:6" ]
-    }
-  }
-}
--- a/test-suite/tests/compact-0044-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[
-  {
-    "http://example.com/prop/1": [],
-    "http://example.com/prop/2": [],
-    "http://example.com/prop/3": [],
-    "http://example.com/prop/4": [],
-    "http://example.com/prop/5": []
-  }
-]
--- a/test-suite/tests/compact-0044-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-{
-  "@context": {
-    "prop": "http://example.com/prop/",
-    "propGen": {
-      "@id": [ "prop:1", "prop:2", "prop:3" ]
-    },
-    "propGenMismatch": {
-      "@id": [ "prop:4", "prop:5", "prop:6" ]
-    }
-  },
-  "propGen": [],
-  "prop:4": [],
-  "prop:5": []
-}
--- a/test-suite/tests/compact-0046-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-{
-  "@context": {
-    "name": { "@id": ["http://xmlns.com/foaf/0.1/name", "http://schema.org/name"] }
-  }
-}
--- a/test-suite/tests/compact-0046-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-{
-  "@context": {
-    "name": { "@id": ["http://xmlns.com/foaf/0.1/name", "http://schema.org/name"] }
-  },
-  "@id": "http://me.markus-lanthaler.com/",
-  "name": [],
-  "http://xmlns.com/foaf/0.1/name": "Markus Lanthaler"
-}
--- a/test-suite/tests/compact-0046-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-{
-  "@context": {
-    "name": { "@id": ["http://xmlns.com/foaf/0.1/name", "http://schema.org/name"] }
-  },
-  "@id": "http://me.markus-lanthaler.com/",
-  "name": [],
-  "http://xmlns.com/foaf/0.1/name": "Markus Lanthaler"
-}
--- a/test-suite/tests/compact-0047-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-{
-  "@context": {
-    "prop1": { "@id": [ "http://example.com/iri-shared", "http://example.com/iri1"] },
-    "prop2": { "@id": [ "http://example.com/iri-shared", "http://example.com/iri2"] }
-  }
-}
--- a/test-suite/tests/compact-0047-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[
-    {
-      "http://example.com/iri1": [ { "@value": "a" } ],
-      "http://example.com/iri-shared": [
-        { "@value": "b" },
-        { "@value": "c" }
-      ],
-      "http://example.com/iri2": [ { "@value": "d" } ]
-    }
-]
--- a/test-suite/tests/compact-0047-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-{
-   "@context": {
-      "prop1": {
-         "@id": ["http://example.com/iri-shared", "http://example.com/iri1"]
-      },
-      "prop2": {
-         "@id": ["http://example.com/iri-shared", "http://example.com/iri2"]
-      }
-   },
-   "http://example.com/iri-shared": ["b", "c"],
-   "http://example.com/iri1": "a",
-   "http://example.com/iri2": "d"
-}
--- a/test-suite/tests/compact-0050-context.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-{
-  "@context": {
-    "propertyA": "http://example.org/A",
-    "propertyB": "http://example.org/B",
-    "gen": { "@id": [ "http://example.org/A", "http://example.org/B" ] }
-  }
-}
--- a/test-suite/tests/compact-0050-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-{
-  "http://example.org/A": "A",
-  "http://example.org/B": "B"
-}
--- a/test-suite/tests/compact-0050-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-{
-  "@context": {
-    "propertyA": "http://example.org/A",
-    "propertyB": "http://example.org/B",
-    "gen": { "@id": [ "http://example.org/A", "http://example.org/B" ] }
-  },
-  "propertyA": "A",
-  "propertyB": "B"
-}
--- a/test-suite/tests/compact-manifest.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ b/test-suite/tests/compact-manifest.jsonld	Wed Mar 06 17:50:29 2013 +0100
@@ -188,48 +188,6 @@
       "expect": "compact-0030-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Compacting property generators (no type coercions, language mappings etc.)",
-      "input": "compact-0031-in.jsonld",
-      "context": "compact-0031-context.jsonld",
-      "expect": "compact-0031-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Complex property generator test case with multiple colliding IRIs",
-      "input": "compact-0032-in.jsonld",
-      "context": "compact-0032-context.jsonld",
-      "expect": "compact-0032-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Use shortest property generator term",
-      "input": "compact-0033-in.jsonld",
-      "context": "compact-0033-context.jsonld",
-      "expect": "compact-0033-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Choose most specific property generator",
-      "input": "compact-0034-in.jsonld",
-      "context": "compact-0034-context.jsonld",
-      "expect": "compact-0034-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Fall back to more generic property generators",
-      "input": "compact-0035-in.jsonld",
-      "context": "compact-0035-context.jsonld",
-      "expect": "compact-0035-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Fall back to terms if no property generator matches",
-      "input": "compact-0036-in.jsonld",
-      "context": "compact-0036-context.jsonld",
-      "expect": "compact-0036-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Property generator round-tripping (Drupal content syndication)",
-      "input": "compact-0037-in.jsonld",
-      "context": "compact-0037-context.jsonld",
-      "expect": "compact-0037-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
       "name": "Index map round-tripping (Drupal content deployment)",
       "input": "compact-0038-in.jsonld",
       "context": "compact-0038-context.jsonld",
@@ -266,30 +224,12 @@
       "expect": "compact-0043-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Keep empty arrays in property generators",
-      "input": "compact-0044-in.jsonld",
-      "context": "compact-0044-context.jsonld",
-      "expect": "compact-0044-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
       "name": "Values of @id are transformed to relative IRIs, terms are ignored",
       "input": "compact-0045-in.jsonld",
       "context": "compact-0045-context.jsonld",
       "expect": "compact-0045-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Property generator empty array round-tripping",
-      "input": "compact-0046-in.jsonld",
-      "context": "compact-0046-context.jsonld",
-      "expect": "compact-0046-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "Property generators match IRIs but not data",
-      "input": "compact-0047-in.jsonld",
-      "context": "compact-0047-context.jsonld",
-      "expect": "compact-0047-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
       "name": "Prefer terms with a language mapping set to null over terms without language-mapping for non-strings",
       "input": "compact-0048-in.jsonld",
       "context": "compact-0048-context.jsonld",
@@ -302,12 +242,6 @@
       "expect": "compact-0049-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:CompactTest"],
-      "name": "If property generator doesn't match, fall back to term",
-      "input": "compact-0050-in.jsonld",
-      "context": "compact-0050-context.jsonld",
-      "expect": "compact-0050-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:CompactTest"],
       "name": "Round tripping @list with scalar",
       "input": "compact-0051-in.jsonld",
       "context": "compact-0051-context.jsonld",
--- a/test-suite/tests/expand-0037-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  },
-  "@id": "site:node/1",
-  "field_tags": [
-    { "@id": "site:term/this-is-a-tag" }
-  ],
-  "field_related": [
-    { "@id": "site:node/this-is-related-news" }
-  ]
-}
--- a/test-suite/tests/expand-0037-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[{
-   "@id": "http://example.com/node/1",
-   "http://example.com/vocab/field_related": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }],
-   "http://schema.org/about": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }, {
-      "@id": "http://example.com/term/this-is-a-tag"
-   }],
-   "http://example.com/vocab/field_tags": [{
-      "@id": "http://example.com/term/this-is-a-tag"
-   }]
-}]
--- a/test-suite/tests/expand-0039-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-{
-  "@context": {
-    "vocab": "http://example.com/vocab/",
-    "sharedTerm": "http://www.example.org/shared/term",
-    "@language": "de",
-    "propGenA": {
-      "@id": [ "vocab:propGenA", "sharedTerm" ]
-    },
-    "propGenB": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@type": "http://datatype.example.org/type",
-      "@container": "@list"
-    },
-    "propGenC": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@language": "en"
-    }
-  },
-  "@id": "http://ex.com/root",
-  "propGenA": [
-    {
-      "@id": "http://ex.com/propA.1"
-    },
-    {
-      "vocab:term": "http://ex.com/propA.2"
-    },
-    "propA.3",
-    {
-      "@id": "http://ex.com/propA.4"
-    },
-    {
-      "vocab:term": "http://ex.com/propA.5",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propA.5.1",
-          "vocab:nested": [
-            10510,
-            "propA.5.1.1",
-            {
-              "@id": "http://ex.com/propA.5.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propA.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propA.5.2",
-          "vocab:nested": [
-            "propA.5.2.1",
-            {
-              "vocab:term": "http://ex.com/propA.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propA.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    },
-    10600,
-    {
-      "vocab:term": "collission"
-    }
-  ],
-  "propGenB": [
-    20000,
-    "propB.1",
-    {
-      "vocab:term": "collission"
-    },
-    {
-      "@id": "http://ex.com/propB.2",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propB.2.1",
-          "vocab:nested": [
-            20110,
-            "propB.2.1.1",
-            {
-              "@id": "http://ex.com/propB.2.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propB.2.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propB.2.2",
-          "vocab:nested": [
-            "propB.2.2.1",
-            {
-              "vocab:term": "http://ex.com/propB.2.2.2"
-            },
-            {
-              "@id": "http://ex.com/propB.2.2.3"
-            },
-            20224
-          ]
-        }
-      ]
-    },
-    {
-      "vocab:term": "http://ex.com/propB.3"
-    }
-  ],
-  "propGenC": [
-    {
-      "vocab:term": "collission"
-    },
-    "propC.2",
-    30300,
-    {
-      "@id": "http://ex.com/propC.4"
-    },
-    {
-      "vocab:term": "http://ex.com/propC.5",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propC.5.1",
-          "vocab:nested": [
-            10510,
-            "propC.5.1.1",
-            {
-              "@id": "http://ex.com/propC.5.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propC.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propC.5.2",
-          "vocab:nested": [
-            "propC.5.2.1",
-            {
-              "vocab:term": "http://ex.com/propC.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propC.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    }
-  ],
-  "http://example.com/vocab/propGenA": [
-    "propGenA.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ],
-  "http://example.com/vocab/propGenB": [
-    "propGenB.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ]
-}
--- a/test-suite/tests/expand-0039-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,496 +0,0 @@
-[{
-   "@id": "http://ex.com/root",
-   "http://example.com/vocab/propGenA": [{
-      "@value": "propGenA.coll.1",
-      "@language": "de"
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }]
-   }, {
-      "@id": "http://ex.com/propA.1"
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propA.2",
-         "@language": "de"
-      }],
-      "@id": "_:b0"
-   }, {
-      "@value": "propA.3",
-      "@language": "de"
-   }, {
-      "@id": "http://ex.com/propA.4"
-   }, {
-      "http://example.com/vocab/nested": [{
-         "http://example.com/vocab/nested": [{
-            "@value": 10510
-         }, {
-            "@value": "propA.5.1.1",
-            "@language": "de"
-         }, {
-            "@id": "http://ex.com/propA.5.1.2"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propA.5.1.3",
-               "@language": "de"
-            }],
-            "@id": "_:b3"
-         }],
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propA.5.1",
-            "@language": "de"
-         }],
-         "@id": "_:b2"
-      }, {
-         "@id": "http://ex.com/propA.5.2",
-         "http://example.com/vocab/nested": [{
-            "@value": "propA.5.2.1",
-            "@language": "de"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propA.5.2.2",
-               "@language": "de"
-            }],
-            "@id": "_:b4"
-         }, {
-            "@id": "http://ex.com/propA.5.2.3"
-         }, {
-            "@value": 10524
-         }]
-      }],
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propA.5",
-         "@language": "de"
-      }],
-      "@id": "_:b1"
-   }, {
-      "@value": 10600
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }],
-      "@id": "_:b5"
-   }],
-   "http://example.com/vocab/propGenB": [{
-      "@value": "propGenB.coll.1",
-      "@language": "de"
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }]
-   }, {
-      "@list": [{
-         "@value": 20000,
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "@value": "propB.1",
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "collission",
-            "@language": "de"
-         }],
-         "@id": "_:b6"
-      }, {
-         "@id": "http://ex.com/propB.2",
-         "http://example.com/vocab/nested": [{
-            "http://example.com/vocab/nested": [{
-               "@value": 20110
-            }, {
-               "@value": "propB.2.1.1",
-               "@language": "de"
-            }, {
-               "@id": "http://ex.com/propB.2.1.2"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.1.3",
-                  "@language": "de"
-               }],
-               "@id": "_:b8"
-            }],
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propB.2.1",
-               "@language": "de"
-            }],
-            "@id": "_:b7"
-         }, {
-            "@id": "http://ex.com/propB.2.2",
-            "http://example.com/vocab/nested": [{
-               "@value": "propB.2.2.1",
-               "@language": "de"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.2.2",
-                  "@language": "de"
-               }],
-               "@id": "_:b9"
-            }, {
-               "@id": "http://ex.com/propB.2.2.3"
-            }, {
-               "@value": 20224
-            }]
-         }]
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propB.3",
-            "@language": "de"
-         }],
-         "@id": "_:b10"
-      }]
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }],
-      "@id": "_:b11"
-   }, {
-      "@value": "propC.2",
-      "@language": "en"
-   }, {
-      "@value": 30300
-   }, {
-      "@id": "http://ex.com/propC.4"
-   }, {
-      "http://example.com/vocab/nested": [{
-         "http://example.com/vocab/nested": [{
-            "@value": 10510
-         }, {
-            "@value": "propC.5.1.1",
-            "@language": "de"
-         }, {
-            "@id": "http://ex.com/propC.5.1.2"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.1.3",
-               "@language": "de"
-            }],
-            "@id": "_:b14"
-         }],
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propC.5.1",
-            "@language": "de"
-         }],
-         "@id": "_:b13"
-      }, {
-         "@id": "http://ex.com/propC.5.2",
-         "http://example.com/vocab/nested": [{
-            "@value": "propC.5.2.1",
-            "@language": "de"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.2.2",
-               "@language": "de"
-            }],
-            "@id": "_:b15"
-         }, {
-            "@id": "http://ex.com/propC.5.2.3"
-         }, {
-            "@value": 10524
-         }]
-      }],
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propC.5",
-         "@language": "de"
-      }],
-      "@id": "_:b12"
-   }],
-   "http://www.example.org/shared/term": [{
-      "@id": "http://ex.com/propA.1"
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propA.2",
-         "@language": "de"
-      }],
-      "@id": "_:b0"
-   }, {
-      "@value": "propA.3",
-      "@language": "de"
-   }, {
-      "@id": "http://ex.com/propA.4"
-   }, {
-      "http://example.com/vocab/nested": [{
-         "http://example.com/vocab/nested": [{
-            "@value": 10510
-         }, {
-            "@value": "propA.5.1.1",
-            "@language": "de"
-         }, {
-            "@id": "http://ex.com/propA.5.1.2"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propA.5.1.3",
-               "@language": "de"
-            }],
-            "@id": "_:b3"
-         }],
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propA.5.1",
-            "@language": "de"
-         }],
-         "@id": "_:b2"
-      }, {
-         "@id": "http://ex.com/propA.5.2",
-         "http://example.com/vocab/nested": [{
-            "@value": "propA.5.2.1",
-            "@language": "de"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propA.5.2.2",
-               "@language": "de"
-            }],
-            "@id": "_:b4"
-         }, {
-            "@id": "http://ex.com/propA.5.2.3"
-         }, {
-            "@value": 10524
-         }]
-      }],
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propA.5",
-         "@language": "de"
-      }],
-      "@id": "_:b1"
-   }, {
-      "@value": 10600
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }],
-      "@id": "_:b5"
-   }, {
-      "@list": [{
-         "@value": 20000,
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "@value": "propB.1",
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "collission",
-            "@language": "de"
-         }],
-         "@id": "_:b6"
-      }, {
-         "@id": "http://ex.com/propB.2",
-         "http://example.com/vocab/nested": [{
-            "http://example.com/vocab/nested": [{
-               "@value": 20110
-            }, {
-               "@value": "propB.2.1.1",
-               "@language": "de"
-            }, {
-               "@id": "http://ex.com/propB.2.1.2"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.1.3",
-                  "@language": "de"
-               }],
-               "@id": "_:b8"
-            }],
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propB.2.1",
-               "@language": "de"
-            }],
-            "@id": "_:b7"
-         }, {
-            "@id": "http://ex.com/propB.2.2",
-            "http://example.com/vocab/nested": [{
-               "@value": "propB.2.2.1",
-               "@language": "de"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.2.2",
-                  "@language": "de"
-               }],
-               "@id": "_:b9"
-            }, {
-               "@id": "http://ex.com/propB.2.2.3"
-            }, {
-               "@value": 20224
-            }]
-         }]
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propB.3",
-            "@language": "de"
-         }],
-         "@id": "_:b10"
-      }]
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }],
-      "@id": "_:b11"
-   }, {
-      "@value": "propC.2",
-      "@language": "en"
-   }, {
-      "@value": 30300
-   }, {
-      "@id": "http://ex.com/propC.4"
-   }, {
-      "http://example.com/vocab/nested": [{
-         "http://example.com/vocab/nested": [{
-            "@value": 10510
-         }, {
-            "@value": "propC.5.1.1",
-            "@language": "de"
-         }, {
-            "@id": "http://ex.com/propC.5.1.2"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.1.3",
-               "@language": "de"
-            }],
-            "@id": "_:b14"
-         }],
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propC.5.1",
-            "@language": "de"
-         }],
-         "@id": "_:b13"
-      }, {
-         "@id": "http://ex.com/propC.5.2",
-         "http://example.com/vocab/nested": [{
-            "@value": "propC.5.2.1",
-            "@language": "de"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.2.2",
-               "@language": "de"
-            }],
-            "@id": "_:b15"
-         }, {
-            "@id": "http://ex.com/propC.5.2.3"
-         }, {
-            "@value": 10524
-         }]
-      }],
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propC.5",
-         "@language": "de"
-      }],
-      "@id": "_:b12"
-   }],
-   "http://example.com/somethingElse": [{
-      "@list": [{
-         "@value": 20000,
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "@value": "propB.1",
-         "@type": "http://datatype.example.org/type"
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "collission",
-            "@language": "de"
-         }],
-         "@id": "_:b6"
-      }, {
-         "@id": "http://ex.com/propB.2",
-         "http://example.com/vocab/nested": [{
-            "http://example.com/vocab/nested": [{
-               "@value": 20110
-            }, {
-               "@value": "propB.2.1.1",
-               "@language": "de"
-            }, {
-               "@id": "http://ex.com/propB.2.1.2"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.1.3",
-                  "@language": "de"
-               }],
-               "@id": "_:b8"
-            }],
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propB.2.1",
-               "@language": "de"
-            }],
-            "@id": "_:b7"
-         }, {
-            "@id": "http://ex.com/propB.2.2",
-            "http://example.com/vocab/nested": [{
-               "@value": "propB.2.2.1",
-               "@language": "de"
-            }, {
-               "http://example.com/vocab/term": [{
-                  "@value": "http://ex.com/propB.2.2.2",
-                  "@language": "de"
-               }],
-               "@id": "_:b9"
-            }, {
-               "@id": "http://ex.com/propB.2.2.3"
-            }, {
-               "@value": 20224
-            }]
-         }]
-      }, {
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propB.3",
-            "@language": "de"
-         }],
-         "@id": "_:b10"
-      }]
-   }, {
-      "http://example.com/vocab/term": [{
-         "@value": "collission",
-         "@language": "de"
-      }],
-      "@id": "_:b11"
-   }, {
-      "@value": "propC.2",
-      "@language": "en"
-   }, {
-      "@value": 30300
-   }, {
-      "@id": "http://ex.com/propC.4"
-   }, {
-      "http://example.com/vocab/nested": [{
-         "http://example.com/vocab/nested": [{
-            "@value": 10510
-         }, {
-            "@value": "propC.5.1.1",
-            "@language": "de"
-         }, {
-            "@id": "http://ex.com/propC.5.1.2"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.1.3",
-               "@language": "de"
-            }],
-            "@id": "_:b14"
-         }],
-         "http://example.com/vocab/term": [{
-            "@value": "http://ex.com/propC.5.1",
-            "@language": "de"
-         }],
-         "@id": "_:b13"
-      }, {
-         "@id": "http://ex.com/propC.5.2",
-         "http://example.com/vocab/nested": [{
-            "@value": "propC.5.2.1",
-            "@language": "de"
-         }, {
-            "http://example.com/vocab/term": [{
-               "@value": "http://ex.com/propC.5.2.2",
-               "@language": "de"
-            }],
-            "@id": "_:b15"
-         }, {
-            "@id": "http://ex.com/propC.5.2.3"
-         }, {
-            "@value": 10524
-         }]
-      }],
-      "http://example.com/vocab/term": [{
-         "@value": "http://ex.com/propC.5",
-         "@language": "de"
-      }],
-      "@id": "_:b12"
-   }]
-}]
--- a/test-suite/tests/expand-0042-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-{
-  "@context": {
-    "prop": "http://example.com/prop/",
-    "property_generator": {
-      "@id": [ "prop:1", "prop:2", "prop:3" ]
-    }
-  },
-  "property_generator": []
-}
--- a/test-suite/tests/expand-0042-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[
-  {
-    "http://example.com/prop/1": [],
-    "http://example.com/prop/2": [],
-    "http://example.com/prop/3": []
-  }
-]
--- a/test-suite/tests/expand-0043-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  },
-  "@graph": {
-    "@id": "site:node/1",
-    "field_tags": [
-      { "@id": "site:term/this-is-a-tag" }
-    ],
-    "field_related": [
-      { "@id": "site:node/this-is-related-news" }
-    ]
-  }
-}
--- a/test-suite/tests/expand-0043-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[{
-   "@id": "http://example.com/node/1",
-   "http://example.com/vocab/field_related": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }],
-   "http://schema.org/about": [{
-      "@id": "http://example.com/node/this-is-related-news"
-   }, {
-      "@id": "http://example.com/term/this-is-a-tag"
-   }],
-   "http://example.com/vocab/field_tags": [{
-      "@id": "http://example.com/term/this-is-a-tag"
-   }]
-}]
--- a/test-suite/tests/expand-0049-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    },
-    "value": "site:vocab/value"
-  },
-  "@id": "site:node/1",
-  "field_tags": [
-    { "@id": "site:term/this-is-a-tag", "value": {"@value": "foo"} }
-  ],
-  "field_related": [
-    { "@id": "site:node/this-is-related-news", "value": {"@value": "bar"} }
-  ]
-}
--- a/test-suite/tests/expand-0049-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-[{
-   "@id": "http://example.com/node/1",
-   "http://example.com/vocab/field_related": [{
-      "@id": "http://example.com/node/this-is-related-news",
-      "http://example.com/vocab/value": [{"@value": "bar"}]
-   }],
-   "http://schema.org/about": [{
-      "@id": "http://example.com/node/this-is-related-news",
-      "http://example.com/vocab/value": [{"@value": "bar"}]
-   }, {
-      "@id": "http://example.com/term/this-is-a-tag",
-      "http://example.com/vocab/value": [{"@value": "foo"}]
-   }],
-   "http://example.com/vocab/field_tags": [{
-      "@id": "http://example.com/term/this-is-a-tag",
-      "http://example.com/vocab/value": [{"@value": "foo"}]
-   }]
-}]
--- a/test-suite/tests/expand-manifest.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ b/test-suite/tests/expand-manifest.jsonld	Wed Mar 06 17:50:29 2013 +0100
@@ -188,21 +188,11 @@
       "expect": "expand-0036-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:ExpandTest"],
-      "name": "Expanding property generators (no type coercions, language mappings etc.)",
-      "input": "expand-0037-in.jsonld",
-      "expect": "expand-0037-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:ExpandTest"],
       "name": "Ensure all blank nodes are relabeled during expansion.",
       "input": "expand-0038-in.jsonld",
       "expect": "expand-0038-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:ExpandTest"],
-      "name": "Complex property generator test case with multiple colliding IRIs (this document wouldn't roundtrip cleanly)",
-      "input": "expand-0039-in.jsonld",
-      "expect": "expand-0039-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:ExpandTest"],
       "name": "Only invoke language and index map expansion if the value is a JSON object",
       "input": "expand-0040-in.jsonld",
       "expect": "expand-0040-out.jsonld"
@@ -213,16 +203,6 @@
       "expect": "expand-0041-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:ExpandTest"],
-      "name": "Keep empty arrays when expanding property generators",
-      "input": "expand-0042-in.jsonld",
-      "expect": "expand-0042-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:ExpandTest"],
-      "name": "Property generator works with @graph key",
-      "input": "expand-0043-in.jsonld",
-      "expect": "expand-0043-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:ExpandTest"],
       "name": "Ensure index maps use language mapping",
       "input": "expand-0044-in.jsonld",
       "expect": "expand-0044-out.jsonld"
@@ -248,11 +228,6 @@
       "expect": "expand-0048-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:ExpandTest"],
-      "name": "Do not add @id to @value objects when expanding property generators",
-      "input": "expand-0049-in.jsonld",
-      "expect": "expand-0049-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:ExpandTest"],
       "name": "Context definitions using compact IRIs don't inherit the definitions of the prefix",
       "input": "expand-0050-in.jsonld",
       "expect": "expand-0050-out.jsonld"
--- a/test-suite/tests/flatten-0037-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-{
-  "@context": {
-    "site": "http://example.com/",
-    "field_tags": {
-      "@id": [ "site:vocab/field_tags", "http://schema.org/about" ]
-    },
-    "field_related": {
-      "@id": [ "site:vocab/field_related", "http://schema.org/about" ]
-    }
-  },
-  "@id": "site:node/1",
-  "field_tags": [
-    { "@id": "site:term/this-is-a-tag" }
-  ],
-  "field_related": [
-    { "@id": "site:node/this-is-related-news" }
-  ]
-}
--- a/test-suite/tests/flatten-0037-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-[
-    {
-        "@id": "http://example.com/node/1",
-        "http://example.com/vocab/field_related": [
-            {
-                "@id": "http://example.com/node/this-is-related-news"
-            }
-        ],
-        "http://example.com/vocab/field_tags": [
-            {
-                "@id": "http://example.com/term/this-is-a-tag"
-            }
-        ],
-        "http://schema.org/about": [
-            {
-                "@id": "http://example.com/node/this-is-related-news"
-            },
-            {
-                "@id": "http://example.com/term/this-is-a-tag"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.com/node/this-is-related-news"
-    },
-    {
-        "@id": "http://example.com/term/this-is-a-tag"
-    }
-]
--- a/test-suite/tests/flatten-0039-in.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-{
-  "@context": {
-    "vocab": "http://example.com/vocab/",
-    "sharedTerm": "http://www.example.org/shared/term",
-    "@language": "de",
-    "propGenA": {
-      "@id": [ "vocab:propGenA", "sharedTerm" ]
-    },
-    "propGenB": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@type": "http://datatype.example.org/type",
-      "@container": "@list"
-    },
-    "propGenC": {
-      "@id": [ "sharedTerm", "vocab:propGenB", "http://example.com/somethingElse" ],
-      "@language": "en"
-    }
-  },
-  "@id": "http://ex.com/root",
-  "propGenA": [
-    {
-      "@id": "http://ex.com/propA.1"
-    },
-    {
-      "vocab:term": "http://ex.com/propA.2"
-    },
-    "propA.3",
-    {
-      "@id": "http://ex.com/propA.4"
-    },
-    {
-      "vocab:term": "http://ex.com/propA.5",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propA.5.1",
-          "vocab:nested": [
-            10510,
-            "propA.5.1.1",
-            {
-              "@id": "http://ex.com/propA.5.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propA.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propA.5.2",
-          "vocab:nested": [
-            "propA.5.2.1",
-            {
-              "vocab:term": "http://ex.com/propA.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propA.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    },
-    10600,
-    {
-      "vocab:term": "collission"
-    }
-  ],
-  "propGenB": [
-    20000,
-    "propB.1",
-    {
-      "vocab:term": "collission"
-    },
-    {
-      "@id": "http://ex.com/propB.2",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propB.2.1",
-          "vocab:nested": [
-            20110,
-            "propB.2.1.1",
-            {
-              "@id": "http://ex.com/propB.2.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propB.2.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propB.2.2",
-          "vocab:nested": [
-            "propB.2.2.1",
-            {
-              "vocab:term": "http://ex.com/propB.2.2.2"
-            },
-            {
-              "@id": "http://ex.com/propB.2.2.3"
-            },
-            20224
-          ]
-        }
-      ]
-    },
-    {
-      "vocab:term": "http://ex.com/propB.3"
-    }
-  ],
-  "propGenC": [
-    {
-      "vocab:term": "collission"
-    },
-    "propC.2",
-    30300,
-    {
-      "@id": "http://ex.com/propC.4"
-    },
-    {
-      "vocab:term": "http://ex.com/propC.5",
-      "vocab:nested": [
-        {
-          "vocab:term": "http://ex.com/propC.5.1",
-          "vocab:nested": [
-            10510,
-            "propC.5.1.1",
-            {
-              "@id": "http://ex.com/propC.5.1.2"
-            },
-            {
-              "vocab:term": "http://ex.com/propC.5.1.3"
-            }
-          ]
-        },
-        {
-          "@id": "http://ex.com/propC.5.2",
-          "vocab:nested": [
-            "propC.5.2.1",
-            {
-              "vocab:term": "http://ex.com/propC.5.2.2"
-            },
-            {
-              "@id": "http://ex.com/propC.5.2.3"
-            },
-            10524
-          ]
-        }
-      ]
-    }
-  ],
-  "http://example.com/vocab/propGenA": [
-    "propGenA.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ],
-  "http://example.com/vocab/propGenB": [
-    "propGenB.coll.1",
-    {
-      "vocab:term": "collission"
-    }
-  ]
-}
--- a/test-suite/tests/flatten-0039-out.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,612 +0,0 @@
-[
-    {
-        "@id": "_:b0",
-        "http://example.com/vocab/term": [
-
-        ]
-    },
-    {
-        "@id": "_:b1",
-        "http://example.com/vocab/nested": [
-
-        ],
-        "http://example.com/vocab/term": [
-
-        ]
-    },
-    {
-        "@id": "_:b10",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b11",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b12",
-        "http://example.com/vocab/nested": [
-            {
-                "@id": "_:b13"
-            },
-            {
-                "@id": "http://ex.com/propA.5.2"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b13",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": 10510
-            },
-            {
-                "@value": "propA.5.1.1",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propA.5.1.2"
-            },
-            {
-                "@id": "_:b14"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.1",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b14",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.1.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b15",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.2.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b16",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b17",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b2",
-        "http://example.com/vocab/term": [
-
-        ]
-    },
-    {
-        "@id": "_:b3",
-        "http://example.com/vocab/term": [
-
-        ]
-    },
-    {
-        "@id": "_:b4",
-        "http://example.com/vocab/term": [
-
-        ]
-    },
-    {
-        "@id": "_:b5",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b6",
-        "http://example.com/vocab/nested": [
-            {
-                "@id": "_:b7"
-            },
-            {
-                "@id": "http://ex.com/propC.5.2"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b7",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": 10510
-            },
-            {
-                "@value": "propC.5.1.1",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propC.5.1.2"
-            },
-            {
-                "@id": "_:b8"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.1",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b8",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.1.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:b9",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.2.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://datatype.example.org/type"
-    },
-    {
-        "@id": "http://ex.com/propA.1"
-    },
-    {
-        "@id": "http://ex.com/propA.4"
-    },
-    {
-        "@id": "http://ex.com/propA.5.1.2"
-    },
-    {
-        "@id": "http://ex.com/propA.5.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": "propA.5.2.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:b15"
-            },
-            {
-                "@id": "http://ex.com/propA.5.2.3"
-            },
-            {
-                "@value": 10524
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.5.2.3"
-    },
-    {
-        "@id": "http://ex.com/propB.2",
-        "http://example.com/vocab/nested": [
-
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2.1.2"
-    },
-    {
-        "@id": "http://ex.com/propB.2.2",
-        "http://example.com/vocab/nested": [
-
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2.2.3"
-    },
-    {
-        "@id": "http://ex.com/propC.4"
-    },
-    {
-        "@id": "http://ex.com/propC.5.1.2"
-    },
-    {
-        "@id": "http://ex.com/propC.5.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": "propC.5.2.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:b9"
-            },
-            {
-                "@id": "http://ex.com/propC.5.2.3"
-            },
-            {
-                "@value": 10524
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propC.5.2.3"
-    },
-    {
-        "@id": "http://ex.com/root",
-        "http://example.com/somethingElse": [
-            {
-                "@list": [
-                    {
-                        "@value": 20000,
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@value": "propB.1",
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@id": "_:b0"
-                    },
-                    {
-                        "@value": "collission",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2"
-                    },
-                    {
-                        "@id": "_:b1"
-                    },
-                    {
-                        "@value": 20110
-                    },
-                    {
-                        "@value": "propB.2.1.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.1.2"
-                    },
-                    {
-                        "@id": "_:b2"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2"
-                    },
-                    {
-                        "@value": "propB.2.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "_:b3"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2.3"
-                    },
-                    {
-                        "@value": 20224
-                    },
-                    {
-                        "@id": "_:b4"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.3",
-                        "@language": "de"
-                    }
-                ]
-            },
-            {
-                "@id": "_:b5"
-            },
-            {
-                "@value": "propC.2",
-                "@language": "en"
-            },
-            {
-                "@value": 30300
-            },
-            {
-                "@id": "http://ex.com/propC.4"
-            },
-            {
-                "@id": "_:b6"
-            }
-        ],
-        "http://example.com/vocab/propGenA": [
-            {
-                "@value": "propGenA.coll.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:b10"
-            },
-            {
-                "@id": "http://ex.com/propA.1"
-            },
-            {
-                "@id": "_:b11"
-            },
-            {
-                "@value": "propA.3",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propA.4"
-            },
-            {
-                "@id": "_:b12"
-            },
-            {
-                "@value": 10600
-            },
-            {
-                "@id": "_:b16"
-            }
-        ],
-        "http://example.com/vocab/propGenB": [
-            {
-                "@value": "propGenB.coll.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:b17"
-            },
-            {
-                "@list": [
-                    {
-                        "@value": 20000,
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@value": "propB.1",
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@id": "_:b0"
-                    },
-                    {
-                        "@value": "collission",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2"
-                    },
-                    {
-                        "@id": "_:b1"
-                    },
-                    {
-                        "@value": 20110
-                    },
-                    {
-                        "@value": "propB.2.1.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.1.2"
-                    },
-                    {
-                        "@id": "_:b2"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2"
-                    },
-                    {
-                        "@value": "propB.2.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "_:b3"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2.3"
-                    },
-                    {
-                        "@value": 20224
-                    },
-                    {
-                        "@id": "_:b4"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.3",
-                        "@language": "de"
-                    }
-                ]
-            },
-            {
-                "@id": "_:b5"
-            },
-            {
-                "@value": "propC.2",
-                "@language": "en"
-            },
-            {
-                "@value": 30300
-            },
-            {
-                "@id": "http://ex.com/propC.4"
-            },
-            {
-                "@id": "_:b6"
-            }
-        ],
-        "http://www.example.org/shared/term": [
-            {
-                "@id": "http://ex.com/propA.1"
-            },
-            {
-                "@id": "_:b11"
-            },
-            {
-                "@value": "propA.3",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propA.4"
-            },
-            {
-                "@id": "_:b12"
-            },
-            {
-                "@value": 10600
-            },
-            {
-                "@id": "_:b16"
-            },
-            {
-                "@list": [
-                    {
-                        "@value": 20000,
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@value": "propB.1",
-                        "@type": "http://datatype.example.org/type"
-                    },
-                    {
-                        "@id": "_:b0"
-                    },
-                    {
-                        "@value": "collission",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2"
-                    },
-                    {
-                        "@id": "_:b1"
-                    },
-                    {
-                        "@value": 20110
-                    },
-                    {
-                        "@value": "propB.2.1.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.1.2"
-                    },
-                    {
-                        "@id": "_:b2"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1.3",
-                        "@language": "de"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2"
-                    },
-                    {
-                        "@value": "propB.2.2.1",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "_:b3"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.2.2.2",
-                        "@language": "de"
-                    },
-                    {
-                        "@id": "http://ex.com/propB.2.2.3"
-                    },
-                    {
-                        "@value": 20224
-                    },
-                    {
-                        "@id": "_:b4"
-                    },
-                    {
-                        "@value": "http://ex.com/propB.3",
-                        "@language": "de"
-                    }
-                ]
-            },
-            {
-                "@id": "_:b5"
-            },
-            {
-                "@value": "propC.2",
-                "@language": "en"
-            },
-            {
-                "@value": 30300
-            },
-            {
-                "@id": "http://ex.com/propC.4"
-            },
-            {
-                "@id": "_:b6"
-            }
-        ]
-    }
-]
--- a/test-suite/tests/flatten-manifest.jsonld	Wed Mar 06 11:37:59 2013 -0500
+++ b/test-suite/tests/flatten-manifest.jsonld	Wed Mar 06 17:50:29 2013 +0100
@@ -188,21 +188,11 @@
       "expect": "flatten-0036-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:FlattenTest"],
-      "name": "Flattening property generators (no type coercions, language mappings etc.)",
-      "input": "flatten-0037-in.jsonld",
-      "expect": "flatten-0037-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:FlattenTest"],
       "name": "Ensure all blank nodes are relabeled when flattening.",
       "input": "flatten-0038-in.jsonld",
       "expect": "flatten-0038-out.jsonld"
     }, {
       "@type": ["test:TestCase", "jld:FlattenTest"],
-      "name": "Complex property generator test case with multiple colliding IRIs (this document wouldn't roundtrip cleanly)",
-      "input": "flatten-0039-in.jsonld",
-      "expect": "flatten-0039-out.jsonld"
-    }, {
-      "@type": ["test:TestCase", "jld:FlattenTest"],
       "name": "Only invoke language and index map expansion if the value is a JSON object",
       "input": "flatten-0040-in.jsonld",
       "expect": "flatten-0040-out.jsonld"