--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/expand-0061-in.jsonld	Wed Jun 05 18:01:14 2013 +0200
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "property": {
+      "@id": "http://example.com/property",
+      "@type": "http://example.com/datatype"
+    }
+  },
+  "property": [ 1, true, false, 5.1 ]
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-suite/tests/expand-0061-out.jsonld	Wed Jun 05 18:01:14 2013 +0200
@@ -0,0 +1,10 @@
+[
+  {
+    "http://example.com/property": [
+      { "@value": 1, "@type": "http://example.com/datatype" },
+      { "@value": true, "@type": "http://example.com/datatype" },
+      { "@value": false, "@type": "http://example.com/datatype" },
+      { "@value": 5.1, "@type": "http://example.com/datatype" }
+    ]
+  }
+]

--- a/test-suite/tests/expand-manifest.jsonld	Fri May 31 23:21:08 2013 +0200
+++ b/test-suite/tests/expand-manifest.jsonld	Wed Jun 05 18:01:14 2013 +0200
@@ -369,41 +369,47 @@
     }, {
       "@id": "#t0061",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Coercing native types to arbitrary datatypes",
+      "input": "expand-0061-in.jsonld",
+      "expect": "expand-0061-out.jsonld"
+    }, {
+      "@id": "#t0061",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Various relative IRIs with with @base",
-      "input": "expand-0062-in.jsonld",
-      "expect": "expand-0062-out.jsonld"
+      "input": "expand-0061-in.jsonld",
+      "expect": "expand-0061-out.jsonld"
     }, {
-      "@id": "#t0062",
+      "@id": "#t0063",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Expand a reverse property with an index-container",
       "input": "expand-0063-in.jsonld",
       "expect": "expand-0063-out.jsonld"
     }, {
-      "@id": "#t0063",
+      "@id": "#t0064",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Expand reverse property whose values are unlabeled blank nodes",
       "input": "expand-0064-in.jsonld",
       "expect": "expand-0064-out.jsonld"
     }, {
-      "@id": "#t0064",
+      "@id": "#t0065",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Keys that are not mapped to an IRI in a reverse-map are dropped",
       "input": "expand-0065-in.jsonld",
       "expect": "expand-0065-out.jsonld"
     }, {
-      "@id": "#t0065",
+      "@id": "#t0066",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "Use @vocab to expand keys in reverse-maps",
       "input": "expand-0066-in.jsonld",
       "expect": "expand-0066-out.jsonld"
     }, {
-      "@id": "#t0066",
+      "@id": "#t0067",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "prefix:suffix values are not interpreted as compact IRIs if suffix begins with two slashes",
       "input": "expand-0067-in.jsonld",
       "expect": "expand-0067-out.jsonld"
     }, {
-      "@id": "#t0067",
+      "@id": "#t0068",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
       "name": "prefix:suffix values are not interpreted as compact IRIs if prefix is an underscore",
       "input": "expand-0068-in.jsonld",