diff --git a/index.html b/index.html
index 2609dd91..42d3995e 100644
--- a/index.html
+++ b/index.html
@@ -2240,8 +2240,7 @@ <h3>Algorithm</h3>
                         and <a data-link-for="JsonLdOptions">ordered</a> flags</span>.</li>
                     <li>For each <var>item</var> in <var>index value</var>:
                       <ol class="algorithm changed">
-                        <li>If <var>container mapping</var> includes <code>@graph</code>
-                          and if <var>item</var> is not a <a>graph object</a>,
+                        <li>If <var>container mapping</var> includes <code>@graph</code>,
                           set <var>item</var> to a new <a>map</a> containing the key-value pair
                           <code>@graph</code>-<var>item</var>,
                           ensuring that the value is represented using an <a>array</a>.</li>
diff --git a/tests/expand-manifest.jsonld b/tests/expand-manifest.jsonld
index c21ada68..83122c42 100644
--- a/tests/expand-manifest.jsonld
+++ b/tests/expand-manifest.jsonld
@@ -580,7 +580,7 @@
     }, {
       "@id": "#t0081",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Does not create an @graph container if value is a graph",
+      "name": "Creates an @graph container if value is a graph",
       "purpose": "Don't double-expand an already expanded graph",
       "input": "expand/0081-in.jsonld",
       "expect": "expand/0081-out.jsonld",
diff --git a/tests/expand/0081-out.jsonld b/tests/expand/0081-out.jsonld
index e01c12ee..abbd8271 100644
--- a/tests/expand/0081-out.jsonld
+++ b/tests/expand/0081-out.jsonld
@@ -1,7 +1,9 @@
 [{
   "http://example.org/input": [{
     "@graph": [{
-      "http://example.org/value": [{"@value": "x"}]
+      "@graph": [{
+        "http://example.org/value": [{"@value": "x"}]
+      }]
     }]
   }]
 }]
\ No newline at end of file
diff --git a/tests/toRdf-manifest.jsonld b/tests/toRdf-manifest.jsonld
index 447234f8..ed4c48f5 100644
--- a/tests/toRdf-manifest.jsonld
+++ b/tests/toRdf-manifest.jsonld
@@ -974,7 +974,7 @@
     }, {
       "@id": "#te081",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Does not create an @graph container if value is a graph",
+      "name": "Creates an @graph container if value is a graph",
       "purpose": "Don't double-expand an already expanded graph",
       "input": "toRdf/e081-in.jsonld",
       "expect": "toRdf/e081-out.nq",
@@ -1090,7 +1090,7 @@
     }, {
       "@id": "#te095",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Does not create an @graph container if value is a graph (multiple objects)",
+      "name": "Creates an @graph container if value is a graph (multiple objects)",
       "purpose": "Don't double-expand an already expanded graph",
       "input": "toRdf/e095-in.jsonld",
       "expect": "toRdf/e095-out.nq",
@@ -1146,7 +1146,7 @@
     }, {
       "@id": "#te102",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Do not expand @graph container if value is a graph (multiple objects)",
+      "name": "Expand @graph container if value is a graph (multiple objects)",
       "purpose": "Does not create a new graph object if indexed value is already a graph object",
       "input": "toRdf/e102-in.jsonld",
       "expect": "toRdf/e102-out.nq",
@@ -1154,7 +1154,7 @@
     }, {
       "@id": "#te103",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Do not expand @graph container if value is a graph (multiple graphs)",
+      "name": "Expand @graph container if value is a graph (multiple graphs)",
       "purpose": "Does not create a new graph object if indexed value is already a graph object",
       "input": "toRdf/e103-in.jsonld",
       "expect": "toRdf/e103-out.nq",
@@ -1162,7 +1162,7 @@
     }, {
       "@id": "#te104",
       "@type": ["jld:PositiveEvaluationTest", "jld:ToRDFTest"],
-      "name": "Does not create an @graph container if value is a graph (mixed graph and object)",
+      "name": "Creates an @graph container if value is a graph (mixed graph and object)",
       "purpose": "Don't double-expand an already expanded graph",
       "input": "toRdf/e104-in.jsonld",
       "expect": "toRdf/e104-out.nq",
diff --git a/tests/toRdf/e081-out.nq b/tests/toRdf/e081-out.nq
index 592093b4..a02a6aa4 100644
--- a/tests/toRdf/e081-out.nq
+++ b/tests/toRdf/e081-out.nq
@@ -1,2 +1,2 @@
 _:b0 <http://example.org/input> _:b1 .
-_:b2 <http://example.org/value> "x" _:b1 .
+_:b3 <http://example.org/value> "x" _:b2 .
diff --git a/tests/toRdf/e095-out.nq b/tests/toRdf/e095-out.nq
index 94d78231..dde94a1a 100644
--- a/tests/toRdf/e095-out.nq
+++ b/tests/toRdf/e095-out.nq
@@ -1,4 +1,4 @@
-_:b4 <http://example.org/value> "y" _:b3 .
-_:b0 <http://example.org/input> _:b3 .
 _:b0 <http://example.org/input> _:b1 .
-_:b2 <http://example.org/value> "x" _:b1 .
+_:b0 <http://example.org/input> _:b4 .
+_:b3 <http://example.org/value> "x" _:b2 .
+_:b6 <http://example.org/value> "y" _:b5 .
diff --git a/tests/toRdf/e102-out.nq b/tests/toRdf/e102-out.nq
index ebbe635b..51bc427a 100644
--- a/tests/toRdf/e102-out.nq
+++ b/tests/toRdf/e102-out.nq
@@ -1,3 +1,3 @@
 _:b0 <http://example.org/input> _:b1 .
-_:b3 <http://example.org/value> "y" _:b1 .
-_:b2 <http://example.org/value> "x" _:b1 .
+_:b3 <http://example.org/value> "x" _:b2 .
+_:b4 <http://example.org/value> "y" _:b2 .
diff --git a/tests/toRdf/e103-out.nq b/tests/toRdf/e103-out.nq
index 94d78231..dde94a1a 100644
--- a/tests/toRdf/e103-out.nq
+++ b/tests/toRdf/e103-out.nq
@@ -1,4 +1,4 @@
-_:b4 <http://example.org/value> "y" _:b3 .
-_:b0 <http://example.org/input> _:b3 .
 _:b0 <http://example.org/input> _:b1 .
-_:b2 <http://example.org/value> "x" _:b1 .
+_:b0 <http://example.org/input> _:b4 .
+_:b3 <http://example.org/value> "x" _:b2 .
+_:b6 <http://example.org/value> "y" _:b5 .
diff --git a/tests/toRdf/e104-out.nq b/tests/toRdf/e104-out.nq
index 94d78231..08bafa71 100644
--- a/tests/toRdf/e104-out.nq
+++ b/tests/toRdf/e104-out.nq
@@ -1,4 +1,4 @@
-_:b4 <http://example.org/value> "y" _:b3 .
-_:b0 <http://example.org/input> _:b3 .
+_:b3 <http://example.org/value> "x" _:b2 .
+_:b5 <http://example.org/value> "y" _:b4 .
+_:b0 <http://example.org/input> _:b4 .
 _:b0 <http://example.org/input> _:b1 .
-_:b2 <http://example.org/value> "x" _:b1 .