diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
index ae5dac3dc..0dbb8f096 100644
--- a/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-schema-gen.xspec
@@ -1,171 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- autogenerated 2021-12-14T16:02:57.305-05:00 following model in example-set.xspec-->
 <x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    xmlns:j="http://www.w3.org/2005/xpath-functions"
-   stylesheet="../../../toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl"
-   run-as="external" xmlns:ov="http://csrc.nist.gov/ns/oscal/test/variable">
-
-   <!--<x:param name="compose-metaschema-first">true()</x:param>-->
+   stylesheet="../../../toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl" run-as="external">
 
    <x:scenario label="When generating a JSON schema from composed Metaschema definitions">
       <x:scenario label="if it has a defined field with no constraint and no allowed-values">
-         <x:context href="json-value-testing-mini-metaschema.xml"
-            select="/*/m:define-field[@name='unconstrained']"/>
-         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
-            <map key="oscal-value-testing-mini-oscal-value-testing-mini:unconstrained">
-               <string key="title">Unconstrained</string>
-               <string key="description">A field whose value is constrained only by its nominal datatype, 'token'.</string>
-               <string key="$id">#field_oscal-value-testing-mini_unconstrained</string>
-               <string key="type">object</string>
-               <map key="properties">
-                  <map key="some">
-                     <string key="title">Some Flag</string>
-                     <string key="description">Some flag some flag some flag.</string>
-                     <string key="$ref">#/definitions/StringDatatype</string>
-                  </map>
-                  <map key="token-value">
-                     <string key="$ref">#/definitions/TokenDatatype</string>
-                  </map>
-               </map>
-               <array key="required">
-                  <string>token-value</string>
-               </array>
-               <boolean key="additionalProperties">false</boolean>
-            </map>
-         </x:expect>
+         <x:context href="json-value_unconstrained_metaschema.xml"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." 
+            test="$x:result => j:json-to-xml()" select="'../json-value_unconstrained.json' => j:unparsed-text() => j:json-to-xml()"/>
       </x:scenario>
       
       <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target of '.'">
-         <x:context href="json-value-testing-mini-metaschema.xml"
-            select="/*/m:define-field[@name='constrained-closed']"/>
-         <x:expect label="the resulting JSON Schema should have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
-            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-closed">
-               <string key="title">Constrained closed</string>
-               <string key="description">Because allow-other is 'no' an enumeration can be given in the JSON Schema.</string>
-               <string key="$id">#field_oscal-value-testing-mini_constrained-closed</string>
-               <string key="type">object</string>
-               <map key="properties">
-                  <map key="some">
-                     <string key="title">Some Flag</string>
-                     <string key="description">Some flag some flag some flag.</string>
-                     <string key="$ref">#/definitions/StringDatatype</string>
-                  </map>
-                  <map key="token-value">
-                     <array key="allOf">
-                        <map>
-                           <string key="$ref">#/definitions/TokenDatatype</string>
-                        </map>
-                        <map>
-                           <array key="enum">
-                              <string>one</string>
-                              <string>two</string>
-                              <string>three</string>
-                              <string>four</string>
-                           </array>
-                        </map>
-                     </array>
-                  </map>
-               </map>
-               <array key="required">
-                  <string>token-value</string>
-               </array>
-               <boolean key="additionalProperties">false</boolean>
-            </map>
-         </x:expect>
+         <x:context href="json-value_constrained-closed_metaschema.xml"/>
+         <x:expect label="the resulting JSON Schema should have an enum to enforce it."
+            test="$x:result => j:json-to-xml()" select="'../json-value_constrained-closed.json' => j:unparsed-text() => j:json-to-xml()"/> 
       </x:scenario>
    
       <x:scenario label="if it has a defined field with a constraint, allowed-values, no explicit target, and permissive enforcement of allow-other='yes'">
-         <x:context href="json-value-testing-mini-metaschema.xml"
-            select="/*/m:define-field[@name='constrained-open']"/>
-         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
-            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-open">
-               <string key="title">Constrained open</string>
-               <string key="description">Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</string>
-               <string key="$id">#field_oscal-value-testing-mini_constrained-open</string>
-               <string key="type">object</string>
-               <map key="properties">
-                  <map key="some">
-                     <string key="title">Some Flag</string>
-                     <string key="description">Some flag some flag some flag.</string>
-                     <string key="$ref">#/definitions/StringDatatype</string>
-                  </map>
-                  <map key="token-value">
-                     <array key="anyOf">
-                        <map>
-                           <string key="$ref">#/definitions/TokenDatatype</string>
-                        </map>
-                        <map>
-                           <array key="enum">
-                              <string>one</string>
-                              <string>two</string>
-                              <string>three</string>
-                              <string>four</string>
-                           </array>
-                        </map>
-                     </array>
-                  </map>
-               </map>
-               <array key="required">
-                  <string>token-value</string>
-               </array>
-               <boolean key="additionalProperties">false</boolean>
-            </map>
-         </x:expect>
+         <x:context href="json-value_constrained-open_metaschema.xml"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it."
+            test="$x:result => j:json-to-xml()" select="'../json-value_constrained-open.json' => j:unparsed-text() => j:json-to-xml()"/>
       </x:scenario>
 
       <x:scenario label="if it has a defined field with a constraint, allowed-values, strict enforcement of allow-other='no' and explicit target other than '.'">
-         <x:context href="json-value-testing-mini-metaschema.xml"
-            select="/*/m:define-field[@name='constrained-narrow']"/>
-         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
-            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-narrow">
-               <string key="title">Constrained narrow</string>
-               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
-               <string key="$id">#field_oscal-value-testing-mini_constrained-narrow</string>
-               <string key="type">object</string>
-               <map key="properties">
-                  <map key="some">
-                     <string key="title">Some Flag</string>
-                     <string key="description">Some flag some flag some flag.</string>
-                     <string key="$ref">#/definitions/StringDatatype</string>
-                  </map>
-                  <map key="token-value">
-                     <string key="$ref">#/definitions/TokenDatatype</string>
-                  </map>
-               </map>
-               <array key="required">
-                  <string>token-value</string>
-               </array>
-               <boolean key="additionalProperties">false</boolean>
-            </map>
-         </x:expect>
+         <x:context href="json-value_constrained-narrow_metaschema.xml"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it."
+            test="$x:result => j:json-to-xml()" select="'../json-value_constrained-narrow.json' => j:unparsed-text() => j:json-to-xml()"/>
       </x:scenario>
    
       <x:scenario label="if it has a defined field with a constraint, allowed-values, permissive enforcement of allow-other='yes' and explicit target other than '.'">
-         <x:context href="json-value-testing-mini-metaschema.xml"
-            select="/*/m:define-field[@name='constrained-sortof']"/>
-         <x:expect label="the resulting JSON Schema should not have an enum to enforce it." xmlns="http://www.w3.org/2005/xpath-functions">
-            <map key="oscal-value-testing-mini-oscal-value-testing-mini:constrained-sortof">
-               <string key="title">Constrained, sort of</string>
-               <string key="description">Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</string>
-               <string key="$id">#field_oscal-value-testing-mini_constrained-sortof</string>
-               <string key="type">object</string>
-               <map key="properties">
-                  <map key="some">
-                     <string key="title">Some Flag</string>
-                     <string key="description">Some flag some flag some flag.</string>
-                     <string key="$ref">#/definitions/StringDatatype</string>
-                  </map>
-                  <map key="token-value">
-                     <string key="$ref">#/definitions/TokenDatatype</string>
-                  </map>
-               </map>
-               <array key="required">
-                  <string>token-value</string>
-               </array>
-               <boolean key="additionalProperties">false</boolean>
-            </map>
-         </x:expect>
+         <x:context href="json-value_constrained-sortof_metaschema.xml"/>
+         <x:expect label="the resulting JSON Schema should not have an enum to enforce it."
+            test="$x:result => j:json-to-xml()" select="'../json-value_constrained-sortof.json' => j:unparsed-text() => j:json-to-xml()"/>
       </x:scenario>
    </x:scenario>
 </x:description>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
deleted file mode 100644
index b76d841e9..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
-<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
- xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
-    <schema-name>JSON value testing mini metaschema</schema-name>
-    <schema-version>0.1</schema-version>
-    <short-name>oscal-value-testing-mini</short-name>
-    <namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
-    <json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
-    <define-assembly name="root">
-        <formal-name>Root</formal-name>
-        <description>Root root root.</description>
-        <root-name>root</root-name>
-        <model>
-            <field ref="unconstrained"/>
-            <field ref="constrained-open"/>
-            <field ref="constrained-closed"/>
-            <field ref="constrained-narrow"/>
-            <field ref="constrained-sortof"/>
-        </model>
-    </define-assembly>
-    <define-field 
-        as-type="token"
-        name="unconstrained">
-        <formal-name>Unconstrained</formal-name>
-        <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-        </define-flag>
-    </define-field>
-    <define-field 
-        as-type="token"
-        name="constrained-open">
-        <formal-name>Constrained open</formal-name>
-        <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-        </define-flag>
-        <constraint>
-            <allowed-values target="." allow-other="yes">
-                <enum value="one"/>
-                <enum value="two"/>
-                <enum value="three"/>
-                <enum value="four"/>
-            </allowed-values>
-        </constraint>
-    </define-field>
-    <define-field 
-        as-type="token"
-        name="constrained-closed">
-        <formal-name>Constrained closed</formal-name>
-        <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-        </define-flag>
-        <constraint>
-            <allowed-values target="." allow-other="no">
-                <enum value="one"/>
-                <enum value="two"/>
-                <enum value="three"/>
-                <enum value="four"/>
-            </allowed-values>
-        </constraint>
-    </define-field>
-    <define-field 
-        as-type="token"
-        name="constrained-narrow">
-        <formal-name>Constrained narrow</formal-name>
-        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-        </define-flag>
-        <constraint>
-            <allowed-values target=".[not(false())]" allow-other="no">
-                <enum value="one"/>
-                <enum value="two"/>
-                <enum value="three"/>
-                <enum value="four"/>
-            </allowed-values>
-        </constraint>
-    </define-field>
-    <define-field 
-        as-type="token"
-        name="constrained-sortof">
-        <formal-name>Constrained, sort of</formal-name>
-        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
-        <json-value-key>token-value</json-value-key>
-        <define-flag name="some">
-            <formal-name>Some Flag</formal-name>
-            <description>Some flag some flag some flag.</description>
-        </define-flag>
-        <constraint>
-            <allowed-values target=".[not(false())]" allow-other="yes">
-                <enum value="one"/>
-                <enum value="two"/>
-                <enum value="three"/>
-                <enum value="four"/>
-            </allowed-values>
-        </constraint>
-    </define-field>
-</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed.json
new file mode 100644
index 000000000..60f2b2734
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed.json
@@ -0,0 +1,70 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-schema-value-test-constrained-closed-schema.json",
+  "$comment": "JSON value testing mini metaschema: JSON Schema",
+  "type": "object",
+  "definitions": {
+    "json-schema-value-test-constrained-closed-json-schema-value-test-constrained-closed:root": {
+      "title": "Root",
+      "description": "Root root root.",
+      "$id": "#assembly_json-schema-value-test-constrained-closed_root",
+      "type": "object",
+      "properties": {
+        "constrained-closed": {
+          "$ref": "#field_json-schema-value-test-constrained-closed_constrained-closed"
+        }
+      },
+      "additionalProperties": false
+    },
+    "json-schema-value-test-constrained-closed-json-schema-value-test-constrained-closed:constrained-closed": {
+      "title": "Constrained closed",
+      "description": "Because allow-other is 'no' an enumeration can be given in the JSON Schema.",
+      "$id": "#field_json-schema-value-test-constrained-closed_constrained-closed",
+      "type": "object",
+      "properties": {
+        "some": {
+          "title": "Some Flag",
+          "description": "Some flag some flag some flag.",
+          "$ref": "#/definitions/StringDatatype"
+        },
+        "token-value": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/TokenDatatype"
+            },
+            {
+              "enum": [
+                "one",
+                "two",
+                "three",
+                "four"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "token-value"
+      ],
+      "additionalProperties": false
+    },
+    "StringDatatype": {
+      "type": "string",
+      "pattern": "^\\S(.*\\S)?$"
+    },
+    "TokenDatatype": {
+      "type": "string",
+      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
+    }
+  },
+  "properties": {
+    "root": {
+      "$ref": "#assembly_json-schema-value-test-constrained-closed_root"
+    }
+  },
+  "required": [
+    "root"
+  ],
+  "additionalProperties": false,
+  "maxProperties": 1
+}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed_metaschema.xml
new file mode 100644
index 000000000..b7cf2f044
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-closed_metaschema.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>json-schema-value-test-constrained-closed</short-name>
+    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="constrained-closed"/>
+        </model>
+    </define-assembly>
+    <define-field 
+        as-type="token"
+        name="constrained-closed">
+        <formal-name>Constrained closed</formal-name>
+        <description>Because allow-other is 'no' an enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow.json
new file mode 100644
index 000000000..29a7bc7af
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-schema-value-test-constrained-narrow-schema.json",
+  "$comment": "JSON value testing mini metaschema: JSON Schema",
+  "type": "object",
+  "definitions": {
+    "json-schema-value-test-constrained-narrow-json-schema-value-test-constrained-narrow:root": {
+      "title": "Root",
+      "description": "Root root root.",
+      "$id": "#assembly_json-schema-value-test-constrained-narrow_root",
+      "type": "object",
+      "properties": {
+        "constrained-narrow": {
+          "$ref": "#field_json-schema-value-test-constrained-narrow_constrained-narrow"
+        }
+      },
+      "additionalProperties": false
+    },
+    "json-schema-value-test-constrained-narrow-json-schema-value-test-constrained-narrow:constrained-narrow": {
+      "title": "Constrained narrow",
+      "description": "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
+      "$id": "#field_json-schema-value-test-constrained-narrow_constrained-narrow",
+      "type": "object",
+      "properties": {
+        "some": {
+          "title": "Some Flag",
+          "description": "Some flag some flag some flag.",
+          "$ref": "#/definitions/StringDatatype"
+        },
+        "token-value": {
+          "$ref": "#/definitions/TokenDatatype"
+        }
+      },
+      "required": [
+        "token-value"
+      ],
+      "additionalProperties": false
+    },
+    "StringDatatype": {
+      "type": "string",
+      "pattern": "^\\S(.*\\S)?$"
+    },
+    "TokenDatatype": {
+      "type": "string",
+      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
+    }
+  },
+  "properties": {
+    "root": {
+      "$ref": "#assembly_json-schema-value-test-constrained-narrow_root"
+    }
+  },
+  "required": [
+    "root"
+  ],
+  "additionalProperties": false,
+  "maxProperties": 1
+}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow_metaschema.xml
new file mode 100644
index 000000000..dcb921049
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-narrow_metaschema.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>json-schema-value-test-constrained-narrow</short-name>
+    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="constrained-narrow"/>
+        </model>
+    </define-assembly>
+
+    <define-field 
+        as-type="token"
+        name="constrained-narrow">
+        <formal-name>Constrained narrow</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="no">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open.json
new file mode 100644
index 000000000..9c44e32d6
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open.json
@@ -0,0 +1,70 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-schema-value-test-constrained-open-schema.json",
+  "$comment": "JSON value testing mini metaschema: JSON Schema",
+  "type": "object",
+  "definitions": {
+    "json-schema-value-test-constrained-open-json-schema-value-test-constrained-open:root": {
+      "title": "Root",
+      "description": "Root root root.",
+      "$id": "#assembly_json-schema-value-test-constrained-open_root",
+      "type": "object",
+      "properties": {
+        "constrained-open": {
+          "$ref": "#field_json-schema-value-test-constrained-open_constrained-open"
+        }
+      },
+      "additionalProperties": false
+    },
+    "json-schema-value-test-constrained-open-json-schema-value-test-constrained-open:constrained-open": {
+      "title": "Constrained open",
+      "description": "Because allow-other is 'yes' no enumeration can be given in the JSON Schema.",
+      "$id": "#field_json-schema-value-test-constrained-open_constrained-open",
+      "type": "object",
+      "properties": {
+        "some": {
+          "title": "Some Flag",
+          "description": "Some flag some flag some flag.",
+          "$ref": "#/definitions/StringDatatype"
+        },
+        "token-value": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TokenDatatype"
+            },
+            {
+              "enum": [
+                "one",
+                "two",
+                "three",
+                "four"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "token-value"
+      ],
+      "additionalProperties": false
+    },
+    "StringDatatype": {
+      "type": "string",
+      "pattern": "^\\S(.*\\S)?$"
+    },
+    "TokenDatatype": {
+      "type": "string",
+      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
+    }
+  },
+  "properties": {
+    "root": {
+      "$ref": "#assembly_json-schema-value-test-constrained-open_root"
+    }
+  },
+  "required": [
+    "root"
+  ],
+  "additionalProperties": false,
+  "maxProperties": 1
+}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open_metaschema.xml
new file mode 100644
index 000000000..a2760aee7
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-open_metaschema.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>json-schema-value-test-constrained-open</short-name>
+    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="constrained-open"/>
+        </model>
+    </define-assembly>
+    <define-field 
+        as-type="token"
+        name="constrained-open">
+        <formal-name>Constrained open</formal-name>
+        <description>Because allow-other is 'yes' no enumeration can be given in the JSON Schema.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target="." allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof.json
new file mode 100644
index 000000000..e82778626
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-schema-value-test-constrained-sortof-schema.json",
+  "$comment": "JSON value testing mini metaschema: JSON Schema",
+  "type": "object",
+  "definitions": {
+    "json-schema-value-test-constrained-sortof-json-schema-value-test-constrained-sortof:root": {
+      "title": "Root",
+      "description": "Root root root.",
+      "$id": "#assembly_json-schema-value-test-constrained-sortof_root",
+      "type": "object",
+      "properties": {
+        "constrained-sortof": {
+          "$ref": "#field_json-schema-value-test-constrained-sortof_constrained-sortof"
+        }
+      },
+      "additionalProperties": false
+    },
+    "json-schema-value-test-constrained-sortof-json-schema-value-test-constrained-sortof:constrained-sortof": {
+      "title": "Constrained, sort of",
+      "description": "Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.",
+      "$id": "#field_json-schema-value-test-constrained-sortof_constrained-sortof",
+      "type": "object",
+      "properties": {
+        "some": {
+          "title": "Some Flag",
+          "description": "Some flag some flag some flag.",
+          "$ref": "#/definitions/StringDatatype"
+        },
+        "token-value": {
+          "$ref": "#/definitions/TokenDatatype"
+        }
+      },
+      "required": [
+        "token-value"
+      ],
+      "additionalProperties": false
+    },
+    "StringDatatype": {
+      "type": "string",
+      "pattern": "^\\S(.*\\S)?$"
+    },
+    "TokenDatatype": {
+      "type": "string",
+      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
+    }
+  },
+  "properties": {
+    "root": {
+      "$ref": "#assembly_json-schema-value-test-constrained-sortof_root"
+    }
+  },
+  "required": [
+    "root"
+  ],
+  "additionalProperties": false,
+  "maxProperties": 1
+}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof_metaschema.xml
new file mode 100644
index 000000000..7b28d4f01
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_constrained-sortof_metaschema.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>json-schema-value-test-constrained-sortof</short-name>
+    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="constrained-sortof"/>
+        </model>
+    </define-assembly>
+    <define-field 
+        as-type="token"
+        name="constrained-sortof">
+        <formal-name>Constrained, sort of</formal-name>
+        <description>Although allow-other is 'no' an enumeration can't be given in the JSON Schema since it targets a qualified set (only a subset) of the elements in scope.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+        <constraint>
+            <allowed-values target=".[not(false())]" allow-other="yes">
+                <enum value="one"/>
+                <enum value="two"/>
+                <enum value="three"/>
+                <enum value="four"/>
+            </allowed-values>
+        </constraint>
+    </define-field>
+</METASCHEMA>
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained.json b/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained.json
new file mode 100644
index 000000000..b2533606f
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://csrc.nist.gov/ns/metaschema-tests/0.1/json-schema-value-test-unconstrained-schema.json",
+  "$comment": "JSON value testing mini metaschema: JSON Schema",
+  "type": "object",
+  "definitions": {
+    "json-schema-value-test-unconstrained-json-schema-value-test-unconstrained:root": {
+      "title": "Root",
+      "description": "Root root root.",
+      "$id": "#assembly_json-schema-value-test-unconstrained_root",
+      "type": "object",
+      "properties": {
+        "unconstrained": {
+          "$ref": "#field_json-schema-value-test-unconstrained_unconstrained"
+        }
+      },
+      "additionalProperties": false
+    },
+    "json-schema-value-test-unconstrained-json-schema-value-test-unconstrained:unconstrained": {
+      "title": "Unconstrained",
+      "description": "A field whose value is constrained only by its nominal datatype, 'token'.",
+      "$id": "#field_json-schema-value-test-unconstrained_unconstrained",
+      "type": "object",
+      "properties": {
+        "some": {
+          "title": "Some Flag",
+          "description": "Some flag some flag some flag.",
+          "$ref": "#/definitions/StringDatatype"
+        },
+        "token-value": {
+          "$ref": "#/definitions/TokenDatatype"
+        }
+      },
+      "required": [
+        "token-value"
+      ],
+      "additionalProperties": false
+    },
+    "StringDatatype": {
+      "type": "string",
+      "pattern": "^\\S(.*\\S)?$"
+    },
+    "TokenDatatype": {
+      "type": "string",
+      "pattern": "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$"
+    }
+  },
+  "properties": {
+    "root": {
+      "$ref": "#assembly_json-schema-value-test-unconstrained_root"
+    }
+  },
+  "required": [
+    "root"
+  ],
+  "additionalProperties": false,
+  "maxProperties": 1
+}
\ No newline at end of file
diff --git a/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained_metaschema.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained_metaschema.xml
new file mode 100644
index 000000000..69d7ad4ce
--- /dev/null
+++ b/test-suite/metaschema-xspec/json-schema-gen/json-value_unconstrained_metaschema.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
+<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../../schema/xml/metaschema.xsd"
+ xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="no">
+    <schema-name>JSON value testing mini metaschema</schema-name>
+    <schema-version>0.1</schema-version>
+    <short-name>json-schema-value-test-unconstrained</short-name>
+    <namespace>http://csrc.nist.gov/ns/metaschema-tests/1.0</namespace>
+    <json-base-uri>http://csrc.nist.gov/ns/metaschema-tests</json-base-uri>
+    <define-assembly name="root">
+        <formal-name>Root</formal-name>
+        <description>Root root root.</description>
+        <root-name>root</root-name>
+        <model>
+            <field ref="unconstrained"/>
+        </model>
+    </define-assembly>
+    <define-field 
+        as-type="token"
+        name="unconstrained">
+        <formal-name>Unconstrained</formal-name>
+        <description>A field whose value is constrained only by its nominal datatype, 'token'.</description>
+        <json-value-key>token-value</json-value-key>
+        <define-flag name="some">
+            <formal-name>Some Flag</formal-name>
+            <description>Some flag some flag some flag.</description>
+        </define-flag>
+    </define-field>
+</METASCHEMA>