diff --git a/tests/content/fn_rkeys.json b/tests/content/fn_rkeys.json
index 6307b89..2079b8f 100644
--- a/tests/content/fn_rkeys.json
+++ b/tests/content/fn_rkeys.json
@@ -24,8 +24,12 @@
       "title": "get reference key",
       "view": {
         "resource": "Observation",
-        "forEach": "basedOn",
-        "select": [{ "alias": "rid", "path": "getReferenceKey()" }]
+        "select": [
+          {
+            "forEach": "basedOn",
+            "select": [{ "alias": "rid", "path": "getReferenceKey()" }]
+          }
+        ]
       },
       "expectCount": 3
     },
@@ -33,8 +37,12 @@
       "title": "get reference key with resource param",
       "view": {
         "resource": "Observation",
-        "forEach": "basedOn.where(getReferenceKey('CarePlan').exists())",
-        "select": [{ "alias": "rid", "path": "getReferenceKey()" }]
+        "select": [
+          {
+            "forEach": "basedOn.where(getReferenceKey('CarePlan').exists())",
+            "select": [{ "alias": "rid", "path": "getReferenceKey()" }]
+          }
+        ]
       },
       "expectCount": 1
     }
diff --git a/tests/content/where.json b/tests/content/where.json
index b1cc29c..0220d6f 100644
--- a/tests/content/where.json
+++ b/tests/content/where.json
@@ -67,7 +67,7 @@
       "view": {
         "resource": "Observation",
         "select": [{ "path": "id" }],
-        "where": [{ "path": "where(value > 11).exists()" }]
+        "where": [{ "path": "where(value.ofType(integer) > 11).exists()" }]
       },
       "expect": [{ "id": "o1" }]
     },
@@ -76,7 +76,7 @@
       "view": {
         "resource": "Observation",
         "select": [{ "path": "id" }],
-        "where": [{ "path": "where(value < 11).exists()" }]
+        "where": [{ "path": "where(value.ofType(integer) < 11).exists()" }]
       },
       "expect": [{ "id": "o2" }]
     },
diff --git a/tests/tests.schema.json b/tests/tests.schema.json
index e35bf5a..05b421c 100644
--- a/tests/tests.schema.json
+++ b/tests/tests.schema.json
@@ -4,6 +4,7 @@
   "description": "Schema for tests",
   "type": "object",
   "required": ["title", "resources", "tests"],
+  "additionalProperties": false,
   "properties": {
     "title": {
       "type": "string"
@@ -127,6 +128,7 @@
     },
     "view": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
         "name": {
           "type": "string"