diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0484573f..77b774e6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Run tests
         run: |
           ./xp3.sh testing/HARDFAIL-XPROC3-HOUSE-RULES.xpl
-          ./xp3.sh testing/BATCH-XSPEC-JUNIT.xpl
+          ./xp3.sh testing/RUN_XSPEC-JUNIT_BATCH.xpl
         id: exec_tests
       - name: Upload test results
         if: always()
diff --git a/smoketest/SMOKETEST-SCHEMATRON.xpl b/smoketest/SMOKETEST-SCHEMATRON.xpl
index 9ec19e52..a0cf3da1 100644
--- a/smoketest/SMOKETEST-SCHEMATRON.xpl
+++ b/smoketest/SMOKETEST-SCHEMATRON.xpl
@@ -9,7 +9,7 @@
    see https://spec.xproc.org/master/head/validation/#c.validate-with-schematron
    -->
    <p:validate-with-schematron assert-valid="true">
-      <p:with-input port="schema" href="doing-well.sch"/>
+      <p:with-input port="schema" href="src/doing-well.sch"/>
       <p:with-input port="source">
          <p:inline>
             <CONGRATULATIONS>Schematron runs under XProc 3.0.</CONGRATULATIONS>
diff --git a/smoketest/SMOKETEST-XSLT.xpl b/smoketest/SMOKETEST-XSLT.xpl
index a3882004..cfe32d31 100644
--- a/smoketest/SMOKETEST-XSLT.xpl
+++ b/smoketest/SMOKETEST-XSLT.xpl
@@ -12,7 +12,7 @@
          </p:inline>
       </p:with-input>
       <!-- inline XSLTs don't apparently work so well inside Morgana? -->
-      <p:with-input port="stylesheet" href="congratulations.xsl"/>
+      <p:with-input port="stylesheet" href="src/congratulations.xsl"/>
    </p:xslt>
 
    <p:namespace-delete prefixes="ox"/>
diff --git a/smoketest/SMOKETEST-XSPEC.xpl b/smoketest/SMOKETEST-XSPEC.xpl
index 0132d962..cf0e47b8 100644
--- a/smoketest/SMOKETEST-XSPEC.xpl
+++ b/smoketest/SMOKETEST-XSPEC.xpl
@@ -6,7 +6,7 @@
    <p:import href="../xspec/xspec-execute.xpl"/>
    
    <p:input port="source">
-     <p:document content-type="application/xml" href="congratulations-xslt.xspec"/>
+     <p:document content-type="application/xml" href="src/congratulations-xslt.xspec"/>
    </p:input>
    
    <p:identity message="[SMOKETEST-XSPEC] Testing XSpec by running ./congratulations-xslt.xspec"/>
diff --git a/smoketest/congratulations-xslt.xspec b/smoketest/src/congratulations-xslt.xspec
similarity index 100%
rename from smoketest/congratulations-xslt.xspec
rename to smoketest/src/congratulations-xslt.xspec
diff --git a/smoketest/congratulations.xsl b/smoketest/src/congratulations.xsl
similarity index 100%
rename from smoketest/congratulations.xsl
rename to smoketest/src/congratulations.xsl
diff --git a/smoketest/doing-well-schematron.xspec b/smoketest/src/doing-well-schematron.xspec
similarity index 100%
rename from smoketest/doing-well-schematron.xspec
rename to smoketest/src/doing-well-schematron.xspec
diff --git a/smoketest/doing-well.sch b/smoketest/src/doing-well.sch
similarity index 100%
rename from smoketest/doing-well.sch
rename to smoketest/src/doing-well.sch
diff --git a/smoketest/src/shout-function.xqm b/smoketest/src/shout-function.xqm
new file mode 100644
index 00000000..9a8bfe71
--- /dev/null
+++ b/smoketest/src/shout-function.xqm
@@ -0,0 +1,6 @@
+module namespace ox = "http://csrc.nist.gov/ns/oscal-xproc3";
+
+(: Simple function providing string manipulation :)
+declare function ox:SHOUT ($s as xs:string?) as xs:string? { upper-case($s) || '!!!' };
+
+(: ox:SHOUT('Hey world') :)
\ No newline at end of file
diff --git a/smoketest/src/shout-xquery.xspec b/smoketest/src/shout-xquery.xspec
new file mode 100644
index 00000000..dd265176
--- /dev/null
+++ b/smoketest/src/shout-xquery.xspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+   xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
+   query="http://csrc.nist.gov/ns/oscal-xproc3" query-at="shout-function.xqm">
+
+   <!--  Inspired by https://github.com/xspec/xspec/blob/master/tutorial/xquery-tutorial.xspec -->
+
+   <x:scenario label="Calling function capitalize-first">
+      <x:call function="ox:SHOUT">
+         <x:param select="'hello'"/>
+      </x:call>
+      <x:expect label="Appears in UPPER CASE!!!, with GRATUITOUS EXCLAMATION POINTS!!!" select="'HELLO!!!'"/>
+      <x:expect label="Exclaims quite loudly (whatever it says)" test="ends-with($x:result,'!!!')"/>
+   </x:scenario>
+
+</x:description>
diff --git a/testing/BATCH-SCH-XSPEC.xpl b/testing/BATCH-SCH-XSPEC.xpl
deleted file mode 100644
index 7f85cb11..00000000
--- a/testing/BATCH-SCH-XSPEC.xpl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-   xmlns:c="http://www.w3.org/ns/xproc-step" version="3.0"
-   xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
-   type="ox:BATCH-SCH-XSPEC"
-   name="BATCH-SCH-XSPEC"
-   >
-
-   <p:import href="../xspec/xspec-execute.xpl"/>
-   
-   <!-- Executes available XSpecs -->
-   <p:input port="source" sequence="true">
-      <!-- We need content type because xspec suffix throws off the parser -->
-      <p:document href="../smoketest/doing-well-schematron.xspec" content-type="application/xml"/>
-      
-   </p:input>
-   
-   <p:variable name="repo-root" select="resolve-uri('.. ',static-base-uri())  => replace('^file:///','file:/')"/>
-   
-   <p:variable name="outdir" select="'xspec-reports' => resolve-uri(static-base-uri())"/>
-   
-   <p:for-each>
-      <!-- Remember that each input node is a root for its own tree - hence XPath context -->
-      <p:variable name="xspec-filename" select="base-uri(/*)"/>
-      <p:variable name="relative-path" select="substring-after($xspec-filename,$repo-root)"/>
-      <p:variable name="html-report-path"  select="replace($relative-path,'\.xspec$','') || '_report.html' "/>
-      <p:variable name="junit-report-path" select="replace($relative-path,'\.xspec$','') || '_junit.xml' "/>
-
-      <ox:schematron-xspec-execute name="execute-xspec"/>
-      
-      <p:store message="[BATCH-SCH-XSPEC] storing HTML report in {$outdir}/{$html-report-path}"   href="{$outdir}/{$html-report-path}">
-         <p:with-input port="source" pipe="xspec-html-report@execute-xspec"/>
-      </p:store>
-      <p:store message="[BATCH-SCH-XSPEC] storing JUnit report in {$outdir}/{$junit-report-path}" href="{$outdir}/{$junit-report-path}">
-         <p:with-input port="source" pipe="xspec-junit-report@execute-xspec"/>
-      </p:store>
-      <p:sink/>
-   </p:for-each>
-      
-</p:declare-step>
-
diff --git a/testing/FILESET_XPROC3_HOUSE-RULES.xpl b/testing/FILESET_XPROC3_HOUSE-RULES.xpl
index e9ebd904..a3dc8bc1 100644
--- a/testing/FILESET_XPROC3_HOUSE-RULES.xpl
+++ b/testing/FILESET_XPROC3_HOUSE-RULES.xpl
@@ -13,14 +13,13 @@
       <p:document href="../lib/GRAB-SCHXSLT.xpl"/>
       <p:document href="../lib/GRAB-XSPEC.xpl"/>
       
-      <p:document href="BATCH-XSLT-XSPEC.xpl"/>
-      <p:document href="BATCH-SCH-XSPEC.xpl"/>
-      <p:document href="BATCH-XSPEC-JUNIT.xpl"/>
-      <p:document href="BATCH-XPROC3-HOUSE-RULES.xpl"/>
+      <p:document href="RUN_XSPEC_BATCH.xpl"/>
+      <p:document href="RUN_XSPEC-JUNIT_BATCH.xpl"/>
+      <p:document href="RUN_XPROC3-HOUSE-RULES_BATCH.xpl"/>
       <p:document href="HARDFAIL-XPROC3-HOUSE-RULES.xpl"/>
       <p:document href="REPO-XPROC3-HOUSE-RULES.xpl"/>
       <p:document href="FILESET_XPROC3_HOUSE-RULES.xpl"/>
-      <p:document href="FILESET_XSLT-XSPEC.xpl"/>
+      <p:document href="FILESET_XSPEC.xpl"/>
 
       <p:document href="../template/GRAB-RESOURCES.xpl"/>
 
diff --git a/testing/FILESET_XSLT-XSPEC.xpl b/testing/FILESET_XSPEC.xpl
similarity index 66%
rename from testing/FILESET_XSLT-XSPEC.xpl
rename to testing/FILESET_XSPEC.xpl
index 5e4fcfd3..1094aa88 100644
--- a/testing/FILESET_XSLT-XSPEC.xpl
+++ b/testing/FILESET_XSPEC.xpl
@@ -2,8 +2,8 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
    xmlns:c="http://www.w3.org/ns/xproc-step" version="3.0"
    xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
-   type="ox:FILESET_XSLT-XSPEC"
-   name="FILESET_XSLT-XSPEC">
+   type="ox:FILESET_XSPEC"
+   name="FILESET_XSPEC">
 
    <!-- Pipeline to be called as subpipeline, delivering a sequence of XSpec files, parsed as XML -->
 
@@ -12,7 +12,9 @@
 
    <p:input port="source" sequence="true">
       <!-- We need content type because xspec suffix throws off the parser -->
-      <p:document href="../smoketest/congratulations-xslt.xspec" content-type="application/xml"/>
+      <p:document href="../smoketest/src/congratulations-xslt.xspec" content-type="application/xml"/>
+      <p:document href="../smoketest/src/doing-well-schematron.xspec" content-type="application/xml"/>
+      <p:document href="../smoketest/src/shout-xquery.xspec" content-type="application/xml"/>
       
    </p:input>
  
diff --git a/testing/BATCH-XPROC3-HOUSE-RULES.xpl b/testing/RUN_XPROC3-HOUSE-RULES_BATCH.xpl
similarity index 84%
rename from testing/BATCH-XPROC3-HOUSE-RULES.xpl
rename to testing/RUN_XPROC3-HOUSE-RULES_BATCH.xpl
index 73a306c5..ce0c136a 100644
--- a/testing/BATCH-XPROC3-HOUSE-RULES.xpl
+++ b/testing/RUN_XPROC3-HOUSE-RULES_BATCH.xpl
@@ -2,8 +2,8 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
    xmlns:c="http://www.w3.org/ns/xproc-step" version="3.0"
    xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
-   type="ox:BATCH-XPROC3-HOUSE-RULES"
-   name="BATCH-XPROC3-HOUSE-RULES"
+   type="ox:RUN_XPROC3-HOUSE-RULES_BATCH"
+   name="RUN_XPROC3-HOUSE-RULES_BATCH"
    >
 
    <!-- Note: this doesn't run without an available copy of SchXSLT -
@@ -24,7 +24,7 @@
          <p:group name="validation">
             <p:variable name="base" select="base-uri(/*)"/>
             <!-- assert-valid='true' presents c:errors results when validation fails as 'no failed assertions or successful reports' -->
-            <p:validate-with-schematron assert-valid="true"  message="[BATCH-XPROC3-HOUSE-RULES] Validating { $base } against { $schematron-path }">
+            <p:validate-with-schematron assert-valid="true" message="[RUN_XPROC3-HOUSE-RULES_BATCH] Validating { $base } against { $schematron-path }">
                <p:with-input port="schema" href="{$schematron-path}"/>
             </p:validate-with-schematron>
             
@@ -41,11 +41,11 @@
       
    <p:wrap-sequence name="wrapup" wrapper="ALL-REPORTS"/>
       
-   <p:xslt name="assessment" message="[BATCH-XPROC3-HOUSE-RULES] Assessing ...">
+   <p:xslt name="assessment" message="[RUN_XPROC3-HOUSE-RULES_BATCH] Assessing ...">
       <p:with-input port="stylesheet" href="src/validation-screener.xsl"/>
    </p:xslt>
    
-   <p:xslt name="summary" message="[BATCH-XPROC3-HOUSE-RULES] Summarizing ...">
+   <p:xslt name="summary" message="[RUN_XPROC3-HOUSE-RULES_BATCH] Summarizing ...">
       <p:with-input port="stylesheet" href="src/validation-summarizer.xsl"/>
    </p:xslt>
    
diff --git a/testing/BATCH-XSPEC-JUNIT.xpl b/testing/RUN_XSPEC-JUNIT_BATCH.xpl
similarity index 78%
rename from testing/BATCH-XSPEC-JUNIT.xpl
rename to testing/RUN_XSPEC-JUNIT_BATCH.xpl
index b7d183db..dff4e79e 100644
--- a/testing/BATCH-XSPEC-JUNIT.xpl
+++ b/testing/RUN_XSPEC-JUNIT_BATCH.xpl
@@ -2,12 +2,12 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
    xmlns:c="http://www.w3.org/ns/xproc-step" version="3.0"
    xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
-   type="ox:BATCH-XSPEC"
-   name="BATCH-XSPEC-JUNIT">
+   type="ox:RUN_XSPEC-JUNIT_BATCH"
+   name="RUN_XSPEC-JUNIT_BATCH">
 
    <!-- Executes available XSpecs writing only JUnit results -->
    
-   <p:import href="FILESET_XSLT-XSPEC.xpl"/>
+   <p:import href="FILESET_XSPEC.xpl"/>
    
    <p:import href="../xspec/xspec-execute.xpl"/>
    
@@ -15,7 +15,7 @@
    
    <p:variable name="outdir" select="'xspec-reports' => resolve-uri(static-base-uri())"/>
    
-   <ox:FILESET_XSLT-XSPEC name="test-set"/>
+   <ox:FILESET_XSPEC name="test-set"/>
    
    <p:for-each>
       <p:with-input pipe="xspec-files@test-set"/>
@@ -25,9 +25,9 @@
       <p:variable name="html-report-path"  select="replace($relative-path,'\.xspec$','') || '_report.html' "/>
       <p:variable name="junit-report-path" select="replace($relative-path,'\.xspec$','') || '_junit.xml' "/>
       
-      <ox:xslt-xspec-execute name="execute-xspec"/>
+      <ox:xspec-execute name="execute-xspec"/>
       
-      <p:store message="[BATCH-XSPEC-JUNIT] storing JUnit report in {$outdir}/{$junit-report-path}" href="{$outdir}/{$junit-report-path}">
+      <p:store message="[RUN_XSPEC-JUNIT_BATCH] storing JUnit report in {$outdir}/{$junit-report-path}" href="{$outdir}/{$junit-report-path}">
          <p:with-input port="source" pipe="xspec-junit-report@execute-xspec"/>
       </p:store>
       <p:sink/>
diff --git a/testing/BATCH-XSLT-XSPEC.xpl b/testing/RUN_XSPEC_BATCH.xpl
similarity index 77%
rename from testing/BATCH-XSLT-XSPEC.xpl
rename to testing/RUN_XSPEC_BATCH.xpl
index da74a49b..14707834 100644
--- a/testing/BATCH-XSLT-XSPEC.xpl
+++ b/testing/RUN_XSPEC_BATCH.xpl
@@ -2,13 +2,13 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
    xmlns:c="http://www.w3.org/ns/xproc-step" version="3.0"
    xmlns:ox="http://csrc.nist.gov/ns/oscal-xproc3"
-   type="ox:BATCH-XSLT-XSPEC"
-   name="BATCH-XSLT-XSPEC"
+   type="ox:RUN_XSPEC_BATCH"
+   name="RUN_XSPEC_BATCH"
    >
 
    <!-- Executes available XSpecs -->
    
-   <p:import href="FILESET_XSLT-XSPEC.xpl"/>
+   <p:import href="FILESET_XSPEC.xpl"/>
    
    <p:import href="../xspec/xspec-execute.xpl"/>
    
@@ -16,7 +16,7 @@
    
    <p:variable name="outdir" select="'xspec-reports' => resolve-uri(static-base-uri())"/>
    
-   <ox:FILESET_XSLT-XSPEC name="test-set"/>
+   <ox:FILESET_XSPEC name="test-set"/>
    
    <p:for-each>
       <p:with-input pipe="xspec-files@test-set"/>
@@ -28,10 +28,10 @@
       
       <ox:xslt-xspec-execute name="execute-xspec"/>
       
-      <p:store message="[BATCH-XSLT-XSPEC] storing HTML report in {$outdir}/{$html-report-path}"   href="{$outdir}/{$html-report-path}">
+      <p:store message="[RUN_XSPEC_BATCH] storing HTML report in {$outdir}/{$html-report-path}"   href="{$outdir}/{$html-report-path}">
          <p:with-input port="source" pipe="xspec-html-report@execute-xspec"/>
       </p:store>
-      <p:store message="[BATCH-XSLT-XSPEC] storing JUnit report in {$outdir}/{$junit-report-path}" href="{$outdir}/{$junit-report-path}">
+      <p:store message="[RUN_XSPEC_BATCH] storing JUnit report in {$outdir}/{$junit-report-path}" href="{$outdir}/{$junit-report-path}">
          <p:with-input port="source" pipe="xspec-junit-report@execute-xspec"/>
       </p:store>
       <p:sink/>
diff --git a/testing/xproc3-house-rules.sch b/testing/xproc3-house-rules.sch
index 944e6963..1af1059c 100644
--- a/testing/xproc3-house-rules.sch
+++ b/testing/xproc3-house-rules.sch
@@ -102,9 +102,9 @@
          <sch:let name="type-uri" value="namespace-uri-for-prefix($type-prefix, .)"/>
          <sch:let name="typename-given" value="@type/tokenize(., ':')[last()]"/>
          
-         <sch:assert sqf:fix="sqf-repair-step-type" test="contains($basename, $typename-given) or contains($typename-given, $basename)">Unexpected declared type <sch:value-of select="$typename-given"/> for the file named <sch:value-of select="$filename"/></sch:assert>
+         <sch:assert sqf:fix="sqf-repair-step-type" test="contains($basename, $typename-given) or contains($typename-given, $basename) or exists(/p:library)">Unexpected declared type <sch:value-of select="$typename-given"/> for the file named <sch:value-of select="$filename"/></sch:assert>
          <sch:assert sqf:fix="sqf-repair-step-type" test="$type-uri = 'http://csrc.nist.gov/ns/oscal-xproc3'">XProc step @type is not given in namespace 'http://csrc.nist.gov/ns/oscal-xproc3'</sch:assert>
-         <sch:assert sqf:fix="sqf-repair-step-name" test="(@name = $basename) or not(. is /*)">XProc step @name does not match the file name '<sch:value-of select="$filename"/>'</sch:assert>
+         <sch:assert sqf:fix="sqf-repair-step-name" test="(@name = $basename) or exists(/p:library)">XProc step @name does not match the file name '<sch:value-of select="$filename"/>'</sch:assert>
       </sch:rule>
       
      <sch:rule context="p:load | p:store">
diff --git a/xspec/xspec-execute.xpl b/xspec/xspec-execute.xpl
index ca094f8c..41dfd656 100644
--- a/xspec/xspec-execute.xpl
+++ b/xspec/xspec-execute.xpl
@@ -22,20 +22,18 @@
       
       <!-- These paths are sensitive to the XSpec distribution at $xspec-home - take care -->
       <p:variable name="compiler-xslt"  select="$xspec-home || 'src/compiler/compile-xslt-tests.xsl'"/>
-      <p:variable name="formatter-xslt" select="$xspec-home || 'src/reporter/format-xspec-report.xsl'"/>
-      <p:variable name="junit-xslt"     select="$xspec-home || 'src/reporter/junit-report.xsl'"/>
-
+      
       <p:variable name="xspec-file-path" select="base-uri(/)"/>
       
       <p:xslt name="compile-xspec">
          <p:with-input port="stylesheet" href="{ $compiler-xslt }"/>
       </p:xslt>
-
+      
       <!-- A small adjustment to the compiled XSLT wakes up the 'secondary' port where we can see it ...  -->
       <p:add-attribute name="adjusted-runtime"
          match="/*/xsl:template[@name='Q{{http://www.jenitennison.com/xslt/xspec}}main']/xsl:result-document"
          attribute-name="href" attribute-value="report" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"/>
-
+      
       <!-- run the XSLT -->
       <p:xslt name="execute-xspec" message="[xslt-xspec-execute] Executing XSPec { base-uri(/) } testing XSLT { /*/@stylesheet }">
          <p:with-input port="source">
@@ -44,31 +42,68 @@
          <p:with-input port="stylesheet" pipe="result@adjusted-runtime"/>
          <p:with-option name="template-name" select="'Q{http://www.jenitennison.com/xslt/xspec}main'"/>
       </p:xslt>
-
+      
+      <!-- Picking up this result and putting it back on the primary port. -->
       <p:identity name="xspec-report">
          <p:with-input port="source" pipe="secondary@execute-xspec"/>
       </p:identity>
-
+      
       <!-- A report looks like:
          <x:report stylesheet="bogus.xsl" xspec="dummy.xspec"
           date="2024-04-01T16:26:29.142753100-04:00"/> -->
-
-      <p:xslt name="html-report">
-         <p:with-input port="stylesheet" href="{ $formatter-xslt }"/>
-         <p:with-option name="parameters" select="map { 'inline-css': 'true' }"/>
-      </p:xslt>
-
-      <p:string-replace match="text()" replace="translate(., '', '&lt;&gt;')"/>
-
+      
+      <ox:produce-html-report name="html-report"/>
+      
       <p:sink/>
-
-      <p:xslt name="junit-report">
+      
+      <ox:produce-junit-report name="junit-report">
          <p:with-input port="source" pipe="result@xspec-report"/>
-         <p:with-input port="stylesheet" href="{ $junit-xslt }"/>
+      </ox:produce-junit-report>
+      
+   </p:declare-step>
+   
+   <p:declare-step name="xquery-xspec-execute" type="ox:xquery-xspec-execute">      
+      <p:input port="xspec-source" primary="true" content-types="application/xml"/>
+      
+      <p:output port="xspec-html-report" primary="true" pipe="result@html-report"/>
+      <p:output port="xspec-junit-report" primary="false" pipe="result@junit-report"/>
+      
+      <!--<p:output port="peek" primary="true" pipe="result@peeking"/>-->
+      
+      <!-- These paths are sensitive to the XSpec distribution at $xspec-home - take care -->
+      <p:variable name="compiler-xslt"  select="$xspec-home || 'src/compiler/compile-xquery-tests.xsl'"/>
+      <!--<p:variable name="formatter-xslt" select="$xspec-home || 'src/reporter/format-xspec-report.xsl'"/>
+      <p:variable name="junit-xslt"     select="$xspec-home || 'src/reporter/junit-report.xsl'"/>-->
+      
+      <p:variable name="xspec-file-path" select="base-uri(/)"/>
+      <p:variable name="xquery-target-path" select="resolve-uri(/*/@query-at,$xspec-file-path)"/>
+      
+      <p:xslt name="compiled-xspec">
+         <p:with-input port="source" pipe="xspec-source@xquery-xspec-execute"/>
+         <p:with-input port="stylesheet" href="{$compiler-xslt}"/>
+         <p:with-option name="parameters" select="map { 'query-at': $xquery-target-path }"/>
       </p:xslt>
-
+      
+      <p:xquery>
+         <p:with-input port="query" pipe="result@compiled-xspec"/>
+      </p:xquery>
+      
+      <p:identity name="xspec-report" message="[xquery-xspec-execute] Executing XQuery XSpec - no runtime messages, sorry"/>
+      
+      <!-- A report looks like:
+         <x:report stylesheet="bogus.xsl" xspec="dummy.xspec"
+          date="2024-04-01T16:26:29.142753100-04:00"/> -->
+      
+      <ox:produce-html-report name="html-report"/>
+      
+      <p:sink/>
+      
+      <ox:produce-junit-report name="junit-report">
+         <p:with-input port="source" pipe="result@xspec-report"/>
+      </ox:produce-junit-report>
+      
    </p:declare-step>
-
+   
    <p:declare-step name="schematron-xspec-execute" type="ox:schematron-xspec-execute">      
       <p:input port="xspec-source" primary="true" content-types="application/xml"/>
       
@@ -78,8 +113,8 @@
       <!-- These paths are sensitive to the XSpec distribution at $xspec-home - take care -->
       <p:variable name="schematron-xspec-reducer-xslt"  select="$xspec-home || 'src/schematron/schut-to-xspec.xsl'"/>
       <p:variable name="compiler-xslt"  select="$xspec-home || 'src/compiler/compile-xslt-tests.xsl'"/>
-      <p:variable name="formatter-xslt" select="$xspec-home || 'src/reporter/format-xspec-report.xsl'"/>
-      <p:variable name="junit-xslt"     select="$xspec-home || 'src/reporter/junit-report.xsl'"/>
+      
+      <!--<p:variable name="junit-xslt"     select="$xspec-home || 'src/reporter/junit-report.xsl'"/>-->
       
       <!-- Acquire and compile Schematron into XSLT for later combination, then sink-->
       
@@ -133,24 +168,77 @@
          <p:with-input port="source" pipe="secondary@execute-xspec"/>
       </p:identity>
       
+      
       <!-- A report looks like:
          <x:report stylesheet="bogus.xsl" xspec="dummy.xspec"
           date="2024-04-01T16:26:29.142753100-04:00"/> -->
       
+      <ox:produce-html-report name="html-report"/>
+      
+      <p:sink/>
+      
+      <ox:produce-junit-report name="junit-report">
+         <p:with-input port="source" pipe="result@xspec-report"/>
+      </ox:produce-junit-report>
+   </p:declare-step>
+   
+   <p:declare-step name="xspec-execute" type="ox:xspec-execute">
+      
+      <p:input port="xspec-source" primary="true" content-types="application/xml"/>
+      
+      <p:output port="xspec-html-report"  primary="true"  pipe="xspec-html-report@switcher"/>
+      <p:output port="xspec-junit-report" primary="false" pipe="xspec-junit-report@switcher"/>
+      
+      <p:choose name="switcher">
+         <p:when test="exists(/x:description/@schematron)">
+            <p:output port="xspec-html-report"  primary="true"  pipe="xspec-html-report@schematron-xspec-execute"/>
+            <p:output port="xspec-junit-report" primary="false" pipe="xspec-junit-report@schematron-xspec-execute"/>
+            
+            <ox:schematron-xspec-execute name="schematron-xspec-execute"/>
+            
+         </p:when>
+         <p:when test="exists(/x:description/@stylesheet)">
+            <p:output port="xspec-html-report"  primary="true"  pipe="xspec-html-report@xslt-xspec-execute"/>
+            <p:output port="xspec-junit-report" primary="false" pipe="xspec-junit-report@xslt-xspec-execute"/>
+            <ox:xslt-xspec-execute name="xslt-xspec-execute"/>
+            
+         </p:when>
+         <p:when test="exists(/x:description/@query)">
+            <p:output port="xspec-html-report"  primary="true"  pipe="xspec-html-report@xquery-xspec-execute"/>
+            <p:output port="xspec-junit-report" primary="false" pipe="xspec-junit-report@xquery-xspec-execute"/>
+            <ox:xquery-xspec-execute name="xquery-xspec-execute"/>
+            
+         </p:when>
+         <p:otherwise>
+            <p:output port="xspec-html-report"  primary="true"/>
+            <p:output port="xspec-junit-report" primary="false"/>
+            
+           <p:sink/>
+         </p:otherwise>
+      </p:choose>
+      
+  </p:declare-step>
+   
+   <p:declare-step name="produce-html-report" type="ox:produce-html-report">
+      <p:input  port="source" primary="true"/>
+      <p:output port="result"/>
+      <p:variable name="formatter-xslt" select="$xspec-home || 'src/reporter/format-xspec-report.xsl'"/>
+      
       <p:xslt name="html-report">
          <p:with-input port="stylesheet" href="{ $formatter-xslt }"/>
          <p:with-option name="parameters" select="map { 'inline-css': 'true' }"/>
       </p:xslt>
       
       <p:string-replace match="text()" replace="translate(., '', '&lt;&gt;')"/>
-      
-      <p:sink/>
-      
+   </p:declare-step>
+   
+   <p:declare-step name="produce-junit-report" type="ox:produce-junit-report">
+      <p:input  port="source" primary="true"/>
+      <p:output port="result"/>
+      <p:variable name="junit-xslt"     select="$xspec-home || 'src/reporter/junit-report.xsl'"/>
       <p:xslt name="junit-report">
-         <p:with-input port="source" pipe="result@xspec-report"/>
          <p:with-input port="stylesheet" href="{ $junit-xslt }"/>
       </p:xslt>
-      
    </p:declare-step>
    
 </p:library>