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 390056de9..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,169 +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">
+   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-COMPOSED.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-COMPOSED.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-COMPOSED.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-COMPOSED.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-COMPOSED.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-COMPOSED.xml b/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
deleted file mode 100644
index 6f0e831fe..000000000
--- a/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema-COMPOSED.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            abstract="no"
-            module="oscal-value-testing-mini"
-            _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml">
-   <INFO info-type="objects-used">Seeing assembly#oscal-value-testing-mini:root, field#oscal-value-testing-mini:unconstrained, field#oscal-value-testing-mini:constrained-open, field#oscal-value-testing-mini:constrained-closed, field#oscal-value-testing-mini:constrained-narrow, field#oscal-value-testing-mini:constrained-sortof</INFO>
-   <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 _metaschema-xml-id="/assembly/oscal-value-testing-mini/root"
-                    _metaschema-json-id="/assembly/oscal-value-testing-mini/root"
-                    scope="global"
-                    name="root"
-                    module="oscal-value-testing-mini"
-                    _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                    _key-name="oscal-value-testing-mini:root"
-                    _using-root-name="root">
-      <formal-name>Root</formal-name>
-      <description>Root root root.</description>
-      <root-name>root</root-name>
-      <model>
-         <field _step="unconstrained"
-                _key="unconstrained"
-                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/unconstrained"
-                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/unconstrained"
-                max-occurs="1"
-                min-occurs="0"
-                ref="unconstrained"
-                _key-ref="oscal-value-testing-mini:unconstrained"
-                _using-name="unconstrained"
-                _in-xml-name="unconstrained"
-                _in-json-name="unconstrained"/>
-         <field _step="constrained-open"
-                _key="constrained-open"
-                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-open"
-                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-open"
-                max-occurs="1"
-                min-occurs="0"
-                ref="constrained-open"
-                _key-ref="oscal-value-testing-mini:constrained-open"
-                _using-name="constrained-open"
-                _in-xml-name="constrained-open"
-                _in-json-name="constrained-open"/>
-         <field _step="constrained-closed"
-                _key="constrained-closed"
-                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
-                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-closed"
-                max-occurs="1"
-                min-occurs="0"
-                ref="constrained-closed"
-                _key-ref="oscal-value-testing-mini:constrained-closed"
-                _using-name="constrained-closed"
-                _in-xml-name="constrained-closed"
-                _in-json-name="constrained-closed"/>
-         <field _step="constrained-narrow"
-                _key="constrained-narrow"
-                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
-                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-narrow"
-                max-occurs="1"
-                min-occurs="0"
-                ref="constrained-narrow"
-                _key-ref="oscal-value-testing-mini:constrained-narrow"
-                _using-name="constrained-narrow"
-                _in-xml-name="constrained-narrow"
-                _in-json-name="constrained-narrow"/>
-         <field _step="constrained-sortof"
-                _key="constrained-sortof"
-                _metaschema-xml-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
-                _metaschema-json-id="/assembly/oscal-value-testing-mini/root/constrained-sortof"
-                max-occurs="1"
-                min-occurs="0"
-                ref="constrained-sortof"
-                _key-ref="oscal-value-testing-mini:constrained-sortof"
-                _using-name="constrained-sortof"
-                _in-xml-name="constrained-sortof"
-                _in-json-name="constrained-sortof"/>
-      </model>
-   </define-assembly>
-   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained"
-                 _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained"
-                 collapsible="no"
-                 as-type="token"
-                 scope="global"
-                 name="unconstrained"
-                 module="oscal-value-testing-mini"
-                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                 _key-name="oscal-value-testing-mini: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 _step="some"
-                   _key="some"
-                   _metaschema-xml-id="/field/oscal-value-testing-mini/unconstrained/some"
-                   _metaschema-json-id="/field/oscal-value-testing-mini/unconstrained/some"
-                   required="no"
-                   as-type="string"
-                   name="some"
-                   _using-name="some"
-                   _in-xml-name="some"
-                   _in-json-name="some">
-         <formal-name>Some Flag</formal-name>
-         <description>Some flag some flag some flag.</description>
-      </define-flag>
-   </define-field>
-   <define-field _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open"
-                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open"
-                 collapsible="no"
-                 as-type="token"
-                 scope="global"
-                 name="constrained-open"
-                 module="oscal-value-testing-mini"
-                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                 _key-name="oscal-value-testing-mini: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 _step="some"
-                   _key="some"
-                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-open/some"
-                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-open/some"
-                   required="no"
-                   as-type="string"
-                   name="some"
-                   _using-name="some"
-                   _in-xml-name="some"
-                   _in-json-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 _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed"
-                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed"
-                 collapsible="no"
-                 as-type="token"
-                 scope="global"
-                 name="constrained-closed"
-                 module="oscal-value-testing-mini"
-                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                 _key-name="oscal-value-testing-mini: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 _step="some"
-                   _key="some"
-                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-closed/some"
-                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-closed/some"
-                   required="no"
-                   as-type="string"
-                   name="some"
-                   _using-name="some"
-                   _in-xml-name="some"
-                   _in-json-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 _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow"
-                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow"
-                 collapsible="no"
-                 as-type="token"
-                 scope="global"
-                 name="constrained-narrow"
-                 module="oscal-value-testing-mini"
-                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                 _key-name="oscal-value-testing-mini: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 _step="some"
-                   _key="some"
-                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-narrow/some"
-                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-narrow/some"
-                   required="no"
-                   as-type="string"
-                   name="some"
-                   _using-name="some"
-                   _in-xml-name="some"
-                   _in-json-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 _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof"
-                 _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof"
-                 collapsible="no"
-                 as-type="token"
-                 scope="global"
-                 name="constrained-sortof"
-                 module="oscal-value-testing-mini"
-                 _base-uri="file:/C:/Users/wap1/Documents/usnistgov/metaschema/test-suite/metaschema-xspec/json-schema-gen/json-value-testing-mini-metaschema.xml"
-                 _key-name="oscal-value-testing-mini: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 _step="some"
-                   _key="some"
-                   _metaschema-xml-id="/field/oscal-value-testing-mini/constrained-sortof/some"
-                   _metaschema-json-id="/field/oscal-value-testing-mini/constrained-sortof/some"
-                   required="no"
-                   as-type="string"
-                   name="some"
-                   _using-name="some"
-                   _in-xml-name="some"
-                   _in-json-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-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>
diff --git a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
index ff22c30fe..a36d62c9a 100644
--- a/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
+++ b/toolchains/xslt-M4/schema-gen/make-json-schema-metamap.xsl
@@ -2,49 +2,51 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:math="http://www.w3.org/2005/xpath-functions/math" exclude-result-prefixes="xs math"
+    xmlns:nm="http://csrc.nist.gov/ns/metaschema"
     version="3.0" xmlns="http://www.w3.org/2005/xpath-functions"
     xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0" expand-text="true">
 
-<!-- Purpose: Produce an XPath-JSON document representing JSON Schema declarations from Metaschema source data.
-     The results are conformant to the rules for the XPath 3.1 definition of an XML format capable of being cast
-     (using the xml-to-json() function) into JSON. -->
-    
-<!-- Note: this XSLT will only be used on its own for development and debugging.
-     It is however imported by `produce-json-converter.xsl` and possibly other stylesheets. -->
+    <!-- Purpose: Produce an XPath-JSON document representing JSON Schema declarations from Metaschema source data.
+        The results are conformant to the rules for the XPath 3.1 definition of an XML format capable of being cast
+        (using the xml-to-json() function) into JSON. -->
+        
+    <!-- Note: this XSLT will only be used on its own for development and debugging.
+        It is however imported by `produce-json-converter.xsl` and possibly other stylesheets. -->
     
     <xsl:strip-space elements="METASCHEMA define-assembly define-field model"/>
     
     <xsl:output indent="yes" method="xml"/>
     
+    <xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
+    
+    <!-- This parameter controls whether this transform will compose the source metaschema as part of running this
+         stylesheet in standalone mode for debugging. In the CI and CD pipelines for production, this is unusual and
+         not desired, so this parameter is not enabled by default and set to false(). For unit testing and local debug
+         scenarios, you will want this so you do not save intermediate "composed" metaschemas needed for JSON Schema
+         generation, so with Oxygen, Saxon on the CLI, or Saxon via API you would set this to `true()`. -->
+    <xsl:param name="compose-metaschema-first" select="true()"/>
+    <xsl:variable name="composed-metaschema" select="if ($compose-metaschema-first) then nm:compose-metaschema(/) else /" />
+
     <xsl:template match="/" priority="2">
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
     </xsl:template>
     
-    <xsl:variable name="home" select="/"/>
-    
     <xsl:variable name="string-value-label">STRVALUE</xsl:variable>
     <xsl:variable name="markdown-value-label">RICHTEXT</xsl:variable>
     <xsl:variable name="markdown-multiline-label">PROSE</xsl:variable>
     
     <xsl:key name="assembly-definition-by-name" match="METASCHEMA/define-assembly" use="@_key-name"/>
     <xsl:key name="field-definition-by-name"    match="METASCHEMA/define-field"    use="@_key-name"/>
-    <xsl:key name="flag-definition-by-name"     match="METASCHEMA/define-flag"     use="@_key-name"/>
-    
-    <xsl:import href="../nist-metaschema-COMPOSE.xsl"/>
-    <xsl:variable name="composed-metaschema" select="/"/> 
-    
+    <xsl:key name="flag-definition-by-name"     match="METASCHEMA/define-flag"     use="@_key-name"/>   
    
     <xsl:template match="/METASCHEMA" expand-text="true">
-        
         <map>
-            <!--<xsl:variable name="wanted-atomic-types" "$datatypes//*:string[@key='$ref']"/>-->
             <string key="$schema">http://json-schema.org/draft-07/schema#</string>
             <string key="$id">{ json-base-uri }/{ schema-version }/{ short-name }-schema.json</string>
             <xsl:for-each select="schema-name">
                 <string key="$comment">{ . }: JSON Schema</string>
             </xsl:for-each>
             
-            <!--<xsl:apply-templates select="schema-version"/>-->
             <string key="type">object</string>
             <map key="definitions">
                 <xsl:apply-templates select="define-assembly | define-field"/>
@@ -95,10 +97,7 @@
     <xsl:template match="METASCHEMA/remarks"/>
     <xsl:template match="METASCHEMA/namespace"/>
     
-    <xsl:template match="METASCHEMA/schema-version" expand-text="true">
-        <!--property not permitted by JSON Schema v7 -->
-        <!--<string key="version">{ . }</string>-->
-    </xsl:template>
+    <xsl:template match="METASCHEMA/schema-version" expand-text="true"/>
     
     <!-- Flag declarations are all handled at the point of invocation -->
     <xsl:template match="define-flag"/>
@@ -124,7 +123,6 @@
 
     <xsl:template priority="100" match="METASCHEMA/define-assembly">
         <map key="{ $composed-metaschema/*/short-name }-{ @_key-name }">
-            <!--<string key="xslt-lineno">123</string>-->
             <xsl:next-match/>
         </map>
     </xsl:template>
@@ -157,8 +155,6 @@
                 </map>
             </xsl:where-populated>
             <xsl:call-template name="require-or-allow"/>
-            
-
     </xsl:template>
     
     <xsl:template match="define-field[exists(json-value-key-flag/@flag-ref)]">
@@ -256,7 +252,6 @@
                 <xsl:otherwise>string</xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
-        <!--<xsl:copy-of select="$type-declaration"/>-->
         <xsl:element namespace="http://www.w3.org/2005/xpath-functions" name="{$nominal-type}">
             <xsl:apply-templates select="@value"/>
         </xsl:element>
@@ -325,16 +320,10 @@
     <!-- properties of an assembly include its flags and assemblies and fields in its model -->
     <xsl:template match="define-assembly" mode="properties">
         <xsl:apply-templates mode="define" select="flag | define-flag | model"/>
-        <!-- to be excluded, flags assigned to be keys -->
-        <!--<xsl:variable name="json-key-flag" select="json-key/@flag-ref"/>
-        <xsl:apply-templates mode="declaration"
-            select="flag[not(@ref = $json-key-flag)], define-flag[not(@name = $json-key-flag)], model"/>-->
     </xsl:template>
 
     <!-- not having a model, the properties of a field are its flags and its value -->
     <xsl:template match="define-field" mode="properties">
-        <!--<xsl:variable name="json-key-flag" select="json-key/@flag-ref"/>
-        <xsl:apply-templates mode="declaration" select="flag[not(@ref = $json-key-flag)], define-flag[not(@name = $json-key-flag)]"/>-->
         <xsl:apply-templates mode="define" select="flag | define-flag"/>
         <xsl:variable name="this-key" as="xs:string?">
             <xsl:apply-templates select="." mode="value-key"/>
@@ -579,7 +568,6 @@
     
     <xsl:template priority="2" match="*[@as-type='integer']" mode="object-type">
         <string key="type">integer</string>
-        <!--<number key="multipleOf">1.0</number>-->
     </xsl:template>
 
     <xsl:template priority="2" match="*[@as-type='positiveInteger']" mode="object-type">
@@ -600,47 +588,20 @@
     
     <xsl:template priority="2.1" match="*[@as-type = $datatype-map/@as-type]" mode="object-type">
         <xsl:variable name="assigned-type" select="$datatype-map[(@as-type|@prefer)=current()/@as-type]/string(.)"/>
-        <!--"$ref" : "#/definitions/UUIDDatatype"-->
-        <string key="$ref">#/definitions/{$assigned-type}</string><!--
-        <xsl:message expand-text="true">@as-type: { @as-type } assigns type { $assigned-type }</xsl:message>
-        <xsl:variable name="makesTypes" select="key('datatypes-by-name',$assigned-type,$datatypes)/*"/>
-        <xsl:message expand-text="true">{ serialize($makesTypes) } </xsl:message>
-        <xsl:apply-templates mode="acquire-types" select="$makesTypes"/>-->
+        <string key="$ref">#/definitions/{$assigned-type}</string>
     </xsl:template>
     
     <xsl:mode name="acquire-types" on-no-match="shallow-copy"/>
     
-    <xsl:template mode="acquire-types" xpath-default-namespace="http://www.w3.org/2005/xpath-functions" match="string[@key='description']">
-      <!--<string key="datatype-description">
-          <xsl:apply-templates/>
-      </string>  -->  
-    </xsl:template>
+    <xsl:template mode="acquire-types" xpath-default-namespace="http://www.w3.org/2005/xpath-functions" match="string[@key='description']"/>
     
     <xsl:key name="datatypes-by-name" xpath-default-namespace="http://www.w3.org/2005/xpath-functions"
         match="map" use="@key"/>
-    
-    <!--<xsl:variable name="datatypes" expand-text="false">
-        <dummy/>
-    </xsl:variable>-->
         
     <xsl:variable name="json-datatypes-path" as="xs:string">../../../schema/json/metaschema-datatypes.json</xsl:variable>
     
 
     <xsl:variable name="datatypes" expand-text="false">
         <xsl:copy-of xpath-default-namespace="http://www.w3.org/2005/xpath-functions" select="( unparsed-text($json-datatypes-path) => json-to-xml() )/map/map[@key='definitions']/map"/>
-        <map key="dateTime"><!-- DateTimeDatatype -->
-            <string key="type">string</string>
-            <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})?$</string>
-        </map>
-        <map key="dateTime-with-timezone">
-            <string key="type">string</string>
-            <string key="format">date-time</string>
-            <string key="pattern">^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-][0-9]{2}:[0-9]{2})$</string>
-        </map>
-        <map key="email">
-            <string key="type">string</string>
-            <string key="format">email</string>
-            <string key="pattern">^.+@.+$</string>
-        </map>
     </xsl:variable>
 </xsl:stylesheet>