From a6bb23507e11277d07b06914fc9a5590401e22f7 Mon Sep 17 00:00:00 2001
From: Sandro Cirulli <sandro.cirulli@oup.com>
Date: Fri, 13 Jan 2017 22:06:25 +0000
Subject: [PATCH] remove old references to xspec.googlecode.com #56

---
 build.xml                                     |   1 -
 find-examples.xml                             |   6 -
 find-examples.xsl                             |   1 -
 src/compiler/generate-common-tests.xsl        |   1 -
 src/compiler/generate-query-helper.xsl        |   1 -
 src/compiler/generate-query-tests.xsl         |   1 -
 src/compiler/generate-query-utils.xql         |   1 -
 src/compiler/generate-tests-helper.xsl        |   1 -
 src/compiler/generate-tests-utils.xsl         |   1 -
 src/compiler/generate-xspec-tests.xsl         |   1 -
 .../basex/basex-server-xquery-harness.xproc   | 174 +++-----
 .../basex-standalone-xquery-harness.xproc     | 165 +++----
 .../exist/exist-xquery-harness.xproc          | 139 +++---
 src/harnesses/harness-lib.xpl                 | 418 ++++++++----------
 .../marklogic/ml-xquery-harness.xproc         | 143 +++---
 .../saxon/saxon-xquery-harness.xproc          | 111 ++---
 src/harnesses/saxon/saxon-xslt-harness.xproc  |  74 ++--
 .../zorba/zorba-xquery-harness.xproc          | 159 +++----
 src/reporter/coverage-report.xsl              |   1 -
 src/reporter/format-utils.xsl                 |   1 -
 src/reporter/format-xspec-report-folding.xsl  |   1 -
 src/reporter/format-xspec-report.xsl          |   1 -
 src/reporter/test-report.css                  |   1 -
 src/schemas/find-examples.rnc                 |   1 -
 test/Makefile                                 |   1 -
 test/generate-tests-utils.xspec               |   2 -
 test/generate-xspec-tests.xspec               |   1 -
 test/unit-expect-xsl.xspec                    |   5 +-
 test/xspec-focus-1.xspec                      |   1 -
 test/xspec-focus-2.xspec                      |   2 -
 test/xspec-function.xspec                     |   2 -
 test/xspec-import.xspec                       |   2 -
 test/xspec-imported.xspec                     |   2 -
 test/xspec-pending.xspec                      |   2 -
 test/xspec-rule.xspec                         |   2 -
 test/xspec-tested.xql                         |   1 -
 test/xspec-tested.xsl                         |   1 -
 test/xspec-variable.xspec                     |   2 -
 38 files changed, 556 insertions(+), 874 deletions(-)

diff --git a/build.xml b/build.xml
index 63cda7c13..059b81c46 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       build.xml                                                -->
 <!--  Author:     Jeni Tennison                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennison (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/find-examples.xml b/find-examples.xml
index 08e6d22aa..2b9c75eec 100644
--- a/find-examples.xml
+++ b/find-examples.xml
@@ -2,18 +2,12 @@
 <!-- ===================================================================== -->
 <!--  File:       find-examples.xml                                        -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<?oxygen RNGSchema="find-examples.rnc" type="compact"?>
 <x:scan xmlns:x="http://www.jenitennison.com/xslt/xspec">
   <x:collection>?select=*.xml&amp;recurse=yes&amp;strip-space=yes</x:collection>
 </x:scan>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/find-examples.xsl b/find-examples.xsl
index 6487cf9b0..706ad83f8 100644
--- a/find-examples.xsl
+++ b/find-examples.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       find-examples.xsl                                        -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-common-tests.xsl b/src/compiler/generate-common-tests.xsl
index 9b95cf844..a471bd947 100644
--- a/src/compiler/generate-common-tests.xsl
+++ b/src/compiler/generate-common-tests.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-common-tests.xsl                                -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-query-helper.xsl b/src/compiler/generate-query-helper.xsl
index 3851a09d2..bd2a05a73 100644
--- a/src/compiler/generate-query-helper.xsl
+++ b/src/compiler/generate-query-helper.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-query-helper.xsl                                -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-query-tests.xsl b/src/compiler/generate-query-tests.xsl
index 58088e175..00681009a 100644
--- a/src/compiler/generate-query-tests.xsl
+++ b/src/compiler/generate-query-tests.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-query-tests.xsl                                 -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-query-utils.xql b/src/compiler/generate-query-utils.xql
index 9dbf69a8d..e920976ba 100644
--- a/src/compiler/generate-query-utils.xql
+++ b/src/compiler/generate-query-utils.xql
@@ -3,7 +3,6 @@ module namespace test = "http://www.jenitennison.com/xslt/unit-test";
 (::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::)
 (:  File:       generate-query-utils.xql                                    :)
 (:  Author:     Jeni Tennsion                                               :)
-(:  URI:        http://xspec.googlecode.com/                                :)
 (:  Tags:                                                                   :)
 (:    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)             :)
 (: ------------------------------------------------------------------------ :)
diff --git a/src/compiler/generate-tests-helper.xsl b/src/compiler/generate-tests-helper.xsl
index c315b594e..6562357a8 100644
--- a/src/compiler/generate-tests-helper.xsl
+++ b/src/compiler/generate-tests-helper.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-tests-helper.xsl                                -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-tests-utils.xsl b/src/compiler/generate-tests-utils.xsl
index cbe69dfa6..973053ef2 100644
--- a/src/compiler/generate-tests-utils.xsl
+++ b/src/compiler/generate-tests-utils.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-tests-utils.xsl                                 -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/compiler/generate-xspec-tests.xsl b/src/compiler/generate-xspec-tests.xsl
index 2d31e4bc4..64bb40700 100644
--- a/src/compiler/generate-xspec-tests.xsl
+++ b/src/compiler/generate-xspec-tests.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       generate-xspec-tests.xsl                                 -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/harnesses/basex/basex-server-xquery-harness.xproc b/src/harnesses/basex/basex-server-xquery-harness.xproc
index d038cfb59..18714612d 100644
--- a/src/harnesses/basex/basex-server-xquery-harness.xproc
+++ b/src/harnesses/basex/basex-server-xquery-harness.xproc
@@ -3,29 +3,15 @@
 <!--  File:       basex-server-xquery-harness.xproc                        -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:rest="http://www.basex.org/rest"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/basex/harness/server/xquery.xproc"
-            name="basex-server-xquery-harness"
-            type="t:basex-server-xquery-harness"
-            version="1.0">
-
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite on a BaseX server instance.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The XQuery library module to test must already be on the BaseX instance
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:rest="http://www.basex.org/rest" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/basex/harness/server/xquery.xproc" name="basex-server-xquery-harness" type="t:basex-server-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite on a BaseX server instance.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The XQuery library module to test must already be on the BaseX instance
         (its URI is passed through the option 'query-at').  The instance endpoint
         is passed in the option 'endpoint'.  The runtime utils library (also known
         as generate-query-utils.xql) must also be on the instance (its location
@@ -33,88 +19,74 @@
         The dir where you unzipped the XSpec archive on your filesystem is passed
         in the option 'xspec-home'.  User credentials are passed through options
         'username' and 'password'.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="xspec-home" select="/c:param-set/c:param[@name eq 'xspec-home']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="query-at" select="/c:param-set/c:param[@name eq 'query-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="endpoint" select="/c:param-set/c:param[@name eq 'endpoint']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="username" select="/c:param-set/c:param[@name eq 'username']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="password" select="/c:param-set/c:param[@name eq 'password']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="auth-method" select="/c:param-set/c:param[@name eq 'auth-method']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery/>
-
-      <!-- escape the query as text -->
-      <p:escape-markup/>
-
-      <!-- construct the BaseX REST query element around the query itself -->
-      <p:rename new-name="rest:text" match="/*"/>
-      <p:wrap wrapper="rest:query" match="/*"/>
-      <!-- construct the HTTP request following BaseX REST interface -->
-      <p:wrap wrapper="c:body" match="/*"/>
-      <p:add-attribute attribute-name="content-type" attribute-value="application/xml" match="/*"/>
-      <p:wrap wrapper="c:request" match="/*"/>
-      <p:add-attribute attribute-name="method" attribute-value="POST" match="/*"/>
-      <!-- inject variable values -->
-      <p:add-attribute attribute-name="href" match="/*">
-         <p:with-option name="attribute-value" select="$endpoint"/>
-      </p:add-attribute>
-      <p:add-attribute attribute-name="username" match="/*">
-         <p:with-option name="attribute-value" select="$username"/>
-      </p:add-attribute>
-      <p:add-attribute attribute-name="password" match="/*">
-         <p:with-option name="attribute-value" select="$password"/>
-      </p:add-attribute>
-      <p:add-attribute attribute-name="auth-method" match="/*">
-         <p:with-option name="attribute-value" select="$auth-method"/>
-      </p:add-attribute>
-
-      <!-- log the HTTP request ? -->
-      <t:log if-set="log-http-request">
-         <p:input port="parameters">
-            <p:pipe step="params" port="parameters"/>
-         </p:input>
-      </t:log>
-
-      <!-- TODO: Check HTTP return code, etc.? (using @detailed = true) -->
-      <p:http-request name="run"/>
-
-      <!-- log the HTTP request ? -->
-      <t:log if-set="log-http-response">
-         <p:input port="parameters">
-            <p:pipe step="params" port="parameters"/>
-         </p:input>
-      </t:log>
-
-      <!-- format the report -->
-      <t:format-report>
-         <p:with-option name="xspec-home" select="$xspec-home"/>
-      </t:format-report>
-   </p:group>
-
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="xspec-home" select="/c:param-set/c:param[@name eq 'xspec-home']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="query-at" select="/c:param-set/c:param[@name eq 'query-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="endpoint" select="/c:param-set/c:param[@name eq 'endpoint']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="username" select="/c:param-set/c:param[@name eq 'username']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="password" select="/c:param-set/c:param[@name eq 'password']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="auth-method" select="/c:param-set/c:param[@name eq 'auth-method']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery/>
+    <!-- escape the query as text -->
+    <p:escape-markup/>
+    <!-- construct the BaseX REST query element around the query itself -->
+    <p:rename new-name="rest:text" match="/*"/>
+    <p:wrap wrapper="rest:query" match="/*"/>
+    <!-- construct the HTTP request following BaseX REST interface -->
+    <p:wrap wrapper="c:body" match="/*"/>
+    <p:add-attribute attribute-name="content-type" attribute-value="application/xml" match="/*"/>
+    <p:wrap wrapper="c:request" match="/*"/>
+    <p:add-attribute attribute-name="method" attribute-value="POST" match="/*"/>
+    <!-- inject variable values -->
+    <p:add-attribute attribute-name="href" match="/*">
+      <p:with-option name="attribute-value" select="$endpoint"/>
+    </p:add-attribute>
+    <p:add-attribute attribute-name="username" match="/*">
+      <p:with-option name="attribute-value" select="$username"/>
+    </p:add-attribute>
+    <p:add-attribute attribute-name="password" match="/*">
+      <p:with-option name="attribute-value" select="$password"/>
+    </p:add-attribute>
+    <p:add-attribute attribute-name="auth-method" match="/*">
+      <p:with-option name="attribute-value" select="$auth-method"/>
+    </p:add-attribute>
+    <!-- log the HTTP request ? -->
+    <t:log if-set="log-http-request">
+      <p:input port="parameters">
+        <p:pipe step="params" port="parameters"/>
+      </p:input>
+    </t:log>
+    <!-- TODO: Check HTTP return code, etc.? (using @detailed = true) -->
+    <p:http-request name="run"/>
+    <!-- log the HTTP request ? -->
+    <t:log if-set="log-http-response">
+      <p:input port="parameters">
+        <p:pipe step="params" port="parameters"/>
+      </p:input>
+    </t:log>
+    <!-- format the report -->
+    <t:format-report>
+      <p:with-option name="xspec-home" select="$xspec-home"/>
+    </t:format-report>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/basex/basex-standalone-xquery-harness.xproc b/src/harnesses/basex/basex-standalone-xquery-harness.xproc
index 663a5556c..3963f5b15 100644
--- a/src/harnesses/basex/basex-standalone-xquery-harness.xproc
+++ b/src/harnesses/basex/basex-standalone-xquery-harness.xproc
@@ -3,117 +3,76 @@
 <!--  File:       basex-standalone-xquery-harness.xproc                    -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:cx="http://xmlcalabash.com/ns/extensions"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/basex/harness/standalone/xquery.xproc"
-            name="basex-standalone-xquery-harness"
-            type="t:basex-standalone-xquery-harness"
-            version="1.0">
-
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite with BaseX standalone.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The dir where you unzipped the XSpec archive on your filesystem is passed
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:cx="http://xmlcalabash.com/ns/extensions" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/basex/harness/standalone/xquery.xproc" name="basex-standalone-xquery-harness" type="t:basex-standalone-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite with BaseX standalone.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The dir where you unzipped the XSpec archive on your filesystem is passed
         in the option 'xspec-home'.  The compiled test suite (the XQuery file to be
         actually evaluated) is saved on the filesystem to be passed to BaseX.  The
         name of this file is passed in the option 'compiled-file' (it defaults to a
         file in /tmp).  The BaseX JAR file is passed through 'basex-jar'.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="xspec-home" select="
-          /c:param-set/c:param[@name eq 'xspec-home']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="basex-jar" select="
-          /c:param-set/c:param[@name eq 'basex-jar']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <!-- TODO: Use a robust way to get a tmp file name from the OS... -->
-      <p:variable name="compiled-file" select="
-          ( /c:param-set/c:param[@name eq 'compiled-file']/@value,
-            'file:/tmp/xspec-basex-compiled-suite.xq' )[1]">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="utils-library-at" select="
-          /c:param-set/c:param[@name eq 'utils-library-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <!-- either no at location hint, or resolved from xspec-home if packaging not supported -->
-      <p:variable name="utils-lib" select="
-          if ( $utils-library-at ) then
-            $utils-library-at
-          else if ( $xspec-home ) then
-            resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home)
-          else
-            ''"/>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery>
-         <p:with-param  name="utils-library-at" select="$utils-lib"/>
-      </t:compile-xquery>
-
-      <!-- escape the query as text -->
-      <p:escape-markup name="escape"/>
-
-      <!-- store it on disk in order to pass it to BaseX -->
-      <p:store method="text" name="store">
-         <p:with-option name="href" select="$compiled-file"/>
-      </p:store>
-
-      <!-- run it on BaseX -->
-      <p:choose cx:depends-on="store">
-         <p:when test="p:value-available('basex-jar')">
-            <!-- use Java directly, rely on 'basex-jar' -->
-            <p:exec command="java">
-               <p:with-option name="args" select="
-                   string-join(
-                     ('-cp', $basex-jar, 'org.basex.BaseX', $compiled-file),
-                     ' ')"/>
-               <p:input port="source">
-                  <p:empty/>
-               </p:input>
-            </p:exec>
-         </p:when>
-         <p:otherwise>
-            <!-- rely on a script 'basex' being in the PATH -->
-            <p:exec command="basex">
-               <p:with-option name="args" select="$compiled-file"/>
-               <p:input port="source">
-                  <p:empty/>
-               </p:input>
-            </p:exec>
-         </p:otherwise>
-      </p:choose>
-
-      <!-- unwrap the exec step wrapper element -->
-      <p:unwrap match="/c:result"/>
-
-      <!-- format the report -->
-      <t:format-report/>
-   </p:group>
-
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="xspec-home" select="           /c:param-set/c:param[@name eq 'xspec-home']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="basex-jar" select="           /c:param-set/c:param[@name eq 'basex-jar']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- TODO: Use a robust way to get a tmp file name from the OS... -->
+    <p:variable name="compiled-file" select="           ( /c:param-set/c:param[@name eq 'compiled-file']/@value,             'file:/tmp/xspec-basex-compiled-suite.xq' )[1]">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="utils-library-at" select="           /c:param-set/c:param[@name eq 'utils-library-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- either no at location hint, or resolved from xspec-home if packaging not supported -->
+    <p:variable name="utils-lib" select="           if ( $utils-library-at ) then             $utils-library-at           else if ( $xspec-home ) then             resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home)           else             ''"/>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery>
+      <p:with-param name="utils-library-at" select="$utils-lib"/>
+    </t:compile-xquery>
+    <!-- escape the query as text -->
+    <p:escape-markup name="escape"/>
+    <!-- store it on disk in order to pass it to BaseX -->
+    <p:store method="text" name="store">
+      <p:with-option name="href" select="$compiled-file"/>
+    </p:store>
+    <!-- run it on BaseX -->
+    <p:choose cx:depends-on="store">
+      <p:when test="p:value-available('basex-jar')">
+        <!-- use Java directly, rely on 'basex-jar' -->
+        <p:exec command="java">
+          <p:with-option name="args" select="                    string-join(                      ('-cp', $basex-jar, 'org.basex.BaseX', $compiled-file),                      ' ')"/>
+          <p:input port="source">
+            <p:empty/>
+          </p:input>
+        </p:exec>
+      </p:when>
+      <p:otherwise>
+        <!-- rely on a script 'basex' being in the PATH -->
+        <p:exec command="basex">
+          <p:with-option name="args" select="$compiled-file"/>
+          <p:input port="source">
+            <p:empty/>
+          </p:input>
+        </p:exec>
+      </p:otherwise>
+    </p:choose>
+    <!-- unwrap the exec step wrapper element -->
+    <p:unwrap match="/c:result"/>
+    <!-- format the report -->
+    <t:format-report/>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/exist/exist-xquery-harness.xproc b/src/harnesses/exist/exist-xquery-harness.xproc
index c5b98d35a..828226077 100644
--- a/src/harnesses/exist/exist-xquery-harness.xproc
+++ b/src/harnesses/exist/exist-xquery-harness.xproc
@@ -3,104 +3,67 @@
 <!--  File:       exist-xquery-harness.xproc                               -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:exist="http://exist.sourceforge.net/NS/exist"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/exist/harness/xquery.xproc"
-            name="exist-xquery-harness"
-            type="t:exist-xquery-harness"
-            version="1.0">
-	
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite on an eXist instance.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The XQuery library module to test must already be on the eXist instance
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:exist="http://exist.sourceforge.net/NS/exist" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/exist/harness/xquery.xproc" name="exist-xquery-harness" type="t:exist-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite on an eXist instance.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The XQuery library module to test must already be on the eXist instance
         (its URI is passed through the option 'query-at').  The instance endpoint
         is passed in the option 'endpoint'.  The runtime utils library (also known
         as generate-query-utils.xql) must also be on the instance (its location
         hint, that is the 'at' clause to use) is passed in the option 'utils-lib'.
         The dir where you unzipped the XSpec archive on your filesystem is passed
         in the option 'xspec-home'.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:option name="project-dir" required="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="endpoint" select="/c:param-set/c:param[@name eq 'endpoint']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="query-at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="modules-re" select="/c:param-set/c:param[@name eq 'modules-re']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <!-- the tested module URI, relative to the project's src/ dir -->
-      <p:variable name="query-file" select="
-          substring-after(
-            resolve-uri(/t:description/@query-at, base-uri(/)),
-            resolve-uri('src/', $project-dir))"/>
-
-      <!-- the at location hint, given explicitly or through 'modules-re' -->
-      <p:variable name="query-at" select="
-          if ( $query-at-param ) then
-            $query-at-param
-          else
-            replace($query-file, '(.+)', $modules-re)"/>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery>
-         <p:with-param name="query-at" select="$query-at"/>
-      </t:compile-xquery>
-
-      <!-- escape the query as text -->
-      <p:escape-markup name="escape"/>
-
-      <!-- construct the eXist REST query element around the query itself -->
-      <p:rename new-name="exist:text" match="/*"/>
-      <p:wrap wrapper="exist:query" match="/*"/>
-      <!-- construct the HTTP request following eXist REST interface -->
-      <p:wrap wrapper="c:body" match="/*"/>
-      <p:add-attribute attribute-name="content-type" attribute-value="application/xml" match="/*"/>
-      <p:wrap wrapper="c:request" match="/*"/>
-      <p:add-attribute attribute-name="method" attribute-value="POST" match="/*"/>
-      <p:add-attribute attribute-name="href" match="/*">
-         <p:with-option name="attribute-value" select="$endpoint"/>
-      </p:add-attribute>
-
-      <!-- run it on eXist -->
-      <p:http-request name="run">
-         <p:log href="file:/tmp/xspec-exist.log" port="result"/>
-      </p:http-request>
-
-      <!-- unwrap the http-request step wrapper element -->
-      <p:unwrap name="unwrap" match="/exist:result"/>
-
-      <!-- format the report -->
-      <t:format-report/>
-   </p:group>
-
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:option name="project-dir" required="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="endpoint" select="/c:param-set/c:param[@name eq 'endpoint']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="query-at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="modules-re" select="/c:param-set/c:param[@name eq 'modules-re']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- the tested module URI, relative to the project's src/ dir -->
+    <p:variable name="query-file" select="           substring-after(             resolve-uri(/t:description/@query-at, base-uri(/)),             resolve-uri('src/', $project-dir))"/>
+    <!-- the at location hint, given explicitly or through 'modules-re' -->
+    <p:variable name="query-at" select="           if ( $query-at-param ) then             $query-at-param           else             replace($query-file, '(.+)', $modules-re)"/>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery>
+      <p:with-param name="query-at" select="$query-at"/>
+    </t:compile-xquery>
+    <!-- escape the query as text -->
+    <p:escape-markup name="escape"/>
+    <!-- construct the eXist REST query element around the query itself -->
+    <p:rename new-name="exist:text" match="/*"/>
+    <p:wrap wrapper="exist:query" match="/*"/>
+    <!-- construct the HTTP request following eXist REST interface -->
+    <p:wrap wrapper="c:body" match="/*"/>
+    <p:add-attribute attribute-name="content-type" attribute-value="application/xml" match="/*"/>
+    <p:wrap wrapper="c:request" match="/*"/>
+    <p:add-attribute attribute-name="method" attribute-value="POST" match="/*"/>
+    <p:add-attribute attribute-name="href" match="/*">
+      <p:with-option name="attribute-value" select="$endpoint"/>
+    </p:add-attribute>
+    <!-- run it on eXist -->
+    <p:http-request name="run">
+      <p:log href="file:/tmp/xspec-exist.log" port="result"/>
+    </p:http-request>
+    <!-- unwrap the http-request step wrapper element -->
+    <p:unwrap name="unwrap" match="/exist:result"/>
+    <!-- format the report -->
+    <t:format-report/>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/harness-lib.xpl b/src/harnesses/harness-lib.xpl
index 4e7f87cce..c0ad613d0 100644
--- a/src/harnesses/harness-lib.xpl
+++ b/src/harnesses/harness-lib.xpl
@@ -3,28 +3,18 @@
 <!--  File:       harness-lib.xpl                                          -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-11-08                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:library xmlns:p="http://www.w3.org/ns/xproc"
-           xmlns:c="http://www.w3.org/ns/xproc-step"
-           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-           xmlns:t="http://www.jenitennison.com/xslt/xspec"
-           xmlns:pkg="http://expath.org/ns/pkg"
-           pkg:import-uri="#none"
-           version="1.0">
-
-   <!--
+<p:library xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="#none" version="1.0">
+  <!--
        Ensure there is exactly one document on the input port.
        
        If this is the case, it behaves like p:identity, if not, it throws an error.
        
        TODO: Does not work as is...
    -->
-   <!--p:declare-step type="t:ensure-input">
+  <!--p:declare-step type="t:ensure-input">
       <p:input  port="source" primary="true"/>
       <p:output port="result" primary="true"/>
       <p:choose>
@@ -39,119 +29,107 @@
          </p:otherwise>
       </p:choose>
    </p:declare-step-->
-
-   <!--
+  <!--
        Short-cut for p:parameters which passes through input, with primary parameters input.
        
        Inspired from Geert Josten util library:
        https://github.com/grtjn/xproc-ebook-conv/blob/master/src/nl/grtjn/xproc/util/utils.xpl
    -->
-   <p:declare-step type="t:parameters" name="parameters">
-      <p:input port="source"        primary="true"/>
-      <p:input port="in-parameters" primary="true" kind="parameter" sequence="true"/>
-      <p:output port="result"       primary="true">
-         <p:pipe step="parameters" port="source"/>
-      </p:output>
-      <p:output port="parameters"   primary="false">
-         <p:pipe step="params" port="result"/>
-      </p:output>
-      <p:parameters name="params">
-         <p:input port="parameters">
-            <p:pipe step="parameters" port="in-parameters"/>
-         </p:input>
-      </p:parameters>
-   </p:declare-step>
-
-   <!--
+  <p:declare-step type="t:parameters" name="parameters">
+    <p:input port="source" primary="true"/>
+    <p:input port="in-parameters" primary="true" kind="parameter" sequence="true"/>
+    <p:output port="result" primary="true">
+      <p:pipe step="parameters" port="source"/>
+    </p:output>
+    <p:output port="parameters" primary="false">
+      <p:pipe step="params" port="result"/>
+    </p:output>
+    <p:parameters name="params">
+      <p:input port="parameters">
+        <p:pipe step="parameters" port="in-parameters"/>
+      </p:input>
+    </p:parameters>
+  </p:declare-step>
+  <!--
        Pass through and possibly log the input.
        
        If there is a parameter with the name $if-set, its value must be a URI, where
        to log the input.  If there is not, then no log is produced.
    -->
-   <p:declare-step type="t:log" name="log">
-      <!-- the port declarations -->
-      <p:input  port="source"     primary="true"/>
-      <p:input  port="parameters" primary="true" kind="parameter"/>
-      <p:output port="result"     primary="true"/>
-      <p:option name="if-set" required="true"/>
-      <!-- retrieve the params -->
-      <t:parameters name="params"/>
-      <p:group>
-         <p:variable name="uri" select="/c:param-set/c:param[@name eq $if-set]/@value">
-            <p:pipe step="params" port="parameters"/>
-         </p:variable>
-         <p:choose>
-            <p:when test="$uri">
-               <p:store method="text">
-                  <p:with-option name="href" select="$uri"/>
-               </p:store>
-               <p:identity>
-                  <p:input port="source">
-                     <p:pipe step="log" port="source"/>
-                  </p:input>
-               </p:identity>
-            </p:when>
-            <p:otherwise>
-               <p:identity/>
-            </p:otherwise>
-         </p:choose>
-      </p:group>
-   </p:declare-step>
-
-   <!--
-       Compile the suite on source into a stylesheet on result.
-   -->
-   <p:declare-step type="t:compile-xslt" name="compile-xsl">
-      <!-- the port declarations -->
-      <p:input  port="source"     primary="true"/>
-      <p:input  port="parameters" primary="true" kind="parameter"/>
-      <p:output port="result"     primary="true"/>
-      <!-- retrieve the params -->
-      <t:parameters name="params"/>
-      <p:group>
-         <p:variable name="xspec-home" select="
-             /c:param-set/c:param[@name eq 'xspec-home']/@value">
-            <p:pipe step="params" port="parameters"/>
-         </p:variable>
-         <p:variable name="compiler-uri" select="
-             /c:param-set/c:param[@name eq 'compiler-uri']/@value">
-            <p:pipe step="params" port="parameters"/>
-         </p:variable>
-         <!-- if compiler-uri is not passed, then use xspec-home to resolve the compiler -->
-         <!-- if xspec-home is not passed, then use the packaging public URI -->
-         <p:variable name="compiler" select="
-             if ( $compiler-uri ) then
-               $compiler-uri
-             else if ( $xspec-home ) then
-               resolve-uri('src/compiler/generate-xspec-tests.xsl', $xspec-home)
-             else
-               'http://www.jenitennison.com/xslt/xspec/generate-xspec-tests.xsl'"/>
-         <!-- load the compiler -->
-         <p:load name="compiler" pkg:kind="xslt">
-            <p:with-option name="href" select="$compiler"/>
-         </p:load>
-         <!-- actually compile the suite in a stylesheet -->
-         <p:xslt>
+  <p:declare-step type="t:log" name="log">
+    <!-- the port declarations -->
+    <p:input port="source" primary="true"/>
+    <p:input port="parameters" primary="true" kind="parameter"/>
+    <p:output port="result" primary="true"/>
+    <p:option name="if-set" required="true"/>
+    <!-- retrieve the params -->
+    <t:parameters name="params"/>
+    <p:group>
+      <p:variable name="uri" select="/c:param-set/c:param[@name eq $if-set]/@value">
+        <p:pipe step="params" port="parameters"/>
+      </p:variable>
+      <p:choose>
+        <p:when test="$uri">
+          <p:store method="text">
+            <p:with-option name="href" select="$uri"/>
+          </p:store>
+          <p:identity>
             <p:input port="source">
-               <p:pipe port="source" step="compile-xsl"/>
-            </p:input>
-            <p:input port="stylesheet">
-               <p:pipe port="result" step="compiler"/>
-            </p:input>
-            <p:input port="parameters">
-               <p:empty/>
+              <p:pipe step="log" port="source"/>
             </p:input>
-         </p:xslt>
-      </p:group>
-      <!-- log the result? -->
-      <t:log if-set="log-compilation">
-         <p:input port="parameters">
-            <p:pipe step="params" port="parameters"/>
-         </p:input>
-      </t:log>
-   </p:declare-step>
-
-   <!--
+          </p:identity>
+        </p:when>
+        <p:otherwise>
+          <p:identity/>
+        </p:otherwise>
+      </p:choose>
+    </p:group>
+  </p:declare-step>
+  <!--
+       Compile the suite on source into a stylesheet on result.
+   -->
+  <p:declare-step type="t:compile-xslt" name="compile-xsl">
+    <!-- the port declarations -->
+    <p:input port="source" primary="true"/>
+    <p:input port="parameters" primary="true" kind="parameter"/>
+    <p:output port="result" primary="true"/>
+    <!-- retrieve the params -->
+    <t:parameters name="params"/>
+    <p:group>
+      <p:variable name="xspec-home" select="              /c:param-set/c:param[@name eq 'xspec-home']/@value">
+        <p:pipe step="params" port="parameters"/>
+      </p:variable>
+      <p:variable name="compiler-uri" select="              /c:param-set/c:param[@name eq 'compiler-uri']/@value">
+        <p:pipe step="params" port="parameters"/>
+      </p:variable>
+      <!-- if compiler-uri is not passed, then use xspec-home to resolve the compiler -->
+      <!-- if xspec-home is not passed, then use the packaging public URI -->
+      <p:variable name="compiler" select="              if ( $compiler-uri ) then                $compiler-uri              else if ( $xspec-home ) then                resolve-uri('src/compiler/generate-xspec-tests.xsl', $xspec-home)              else                'http://www.jenitennison.com/xslt/xspec/generate-xspec-tests.xsl'"/>
+      <!-- load the compiler -->
+      <p:load name="compiler" pkg:kind="xslt">
+        <p:with-option name="href" select="$compiler"/>
+      </p:load>
+      <!-- actually compile the suite in a stylesheet -->
+      <p:xslt>
+        <p:input port="source">
+          <p:pipe port="source" step="compile-xsl"/>
+        </p:input>
+        <p:input port="stylesheet">
+          <p:pipe port="result" step="compiler"/>
+        </p:input>
+        <p:input port="parameters">
+          <p:empty/>
+        </p:input>
+      </p:xslt>
+    </p:group>
+    <!-- log the result? -->
+    <t:log if-set="log-compilation">
+      <p:input port="parameters">
+        <p:pipe step="params" port="parameters"/>
+      </p:input>
+    </t:log>
+  </p:declare-step>
+  <!--
        Compile the suite on source into a query on result.
        
        The query is wrapped into an element c:query.  Parameters to the XSpec
@@ -159,72 +137,63 @@
        parameters port (e.g. utils-library-at to set the at location hint to use
        to import the XSpec utils library module in the generated query).
    -->
-   <p:declare-step type="t:compile-xquery" name="compile-xq">
-      <!-- the port declarations -->
-      <p:input  port="source" primary="true"/>
-      <p:input  port="parameters" kind="parameter"/>
-      <p:output port="result" primary="true"/>
-      <!-- retrieve the params -->
-      <t:parameters name="params"/>
-      <p:group>
-        <!-- param: xspec-home: the dir with the sources of XSpec if EXPath packaging
+  <p:declare-step type="t:compile-xquery" name="compile-xq">
+    <!-- the port declarations -->
+    <p:input port="source" primary="true"/>
+    <p:input port="parameters" kind="parameter"/>
+    <p:output port="result" primary="true"/>
+    <!-- retrieve the params -->
+    <t:parameters name="params"/>
+    <p:group>
+      <!-- param: xspec-home: the dir with the sources of XSpec if EXPath packaging
              is not supported -->
-         <p:variable name="xspec-home" select="
-             /c:param-set/c:param[@name eq 'xspec-home']/@value">
-            <p:pipe step="params" port="parameters"/>
-         </p:variable>
-         <!-- param: compiler-uri: the URI of the XSpec compiler to XQuery -->
-         <p:variable name="compiler-uri" select="
-             /c:param-set/c:param[@name eq 'compiler-uri']/@value">
-            <p:pipe step="params" port="parameters"/>
-         </p:variable>
-         <!-- if compiler-uri is not passed, then use xspec-home to resolve the compiler -->
-         <!-- if xspec-home is not passed, then use the packaging public URI -->
-         <p:variable name="compiler" select="
-             if ( $compiler-uri ) then
-               $compiler-uri
-             else if ( $xspec-home ) then
-               resolve-uri('src/compiler/generate-query-tests.xsl', $xspec-home)
-             else
-               'http://www.jenitennison.com/xslt/xspec/generate-query-tests.xsl'"/>
-         <!-- wrap the generated query in a c:query element -->
-         <p:string-replace match="xsl:import/@href" name="compiler">
-            <p:with-option name="replace" select="concat('''', $compiler, '''')"/>
-            <p:input port="source">
-               <p:inline>
-                  <!-- TODO: I think this is due to a bug in Calabash, if I don't create a node
+      <p:variable name="xspec-home" select="              /c:param-set/c:param[@name eq 'xspec-home']/@value">
+        <p:pipe step="params" port="parameters"/>
+      </p:variable>
+      <!-- param: compiler-uri: the URI of the XSpec compiler to XQuery -->
+      <p:variable name="compiler-uri" select="              /c:param-set/c:param[@name eq 'compiler-uri']/@value">
+        <p:pipe step="params" port="parameters"/>
+      </p:variable>
+      <!-- if compiler-uri is not passed, then use xspec-home to resolve the compiler -->
+      <!-- if xspec-home is not passed, then use the packaging public URI -->
+      <p:variable name="compiler" select="              if ( $compiler-uri ) then                $compiler-uri              else if ( $xspec-home ) then                resolve-uri('src/compiler/generate-query-tests.xsl', $xspec-home)              else                'http://www.jenitennison.com/xslt/xspec/generate-query-tests.xsl'"/>
+      <!-- wrap the generated query in a c:query element -->
+      <p:string-replace match="xsl:import/@href" name="compiler">
+        <p:with-option name="replace" select="concat('''', $compiler, '''')"/>
+        <p:input port="source">
+          <p:inline>
+            <!-- TODO: I think this is due to a bug in Calabash, if I don't create a node
                        using the prefix 't', then the biding is not visible to Saxon and it throws
                        a compilation error for this stylesheet... -->
-                  <xsl:stylesheet version="2.0" t:dummy="...">
-                     <xsl:import href="..."/>
-                     <xsl:template match="/">
-                        <c:query>
-                           <xsl:call-template name="t:generate-tests"/>
-                        </c:query>
-                     </xsl:template>
-                  </xsl:stylesheet>
-               </p:inline>
-            </p:input>
-         </p:string-replace>
-         <!-- actually compile the suite in a query -->
-         <p:xslt name="do-it">
-            <p:input port="source">
-               <p:pipe step="compile-xq" port="source"/>
-            </p:input>
-            <p:input port="stylesheet">
-               <p:pipe step="compiler" port="result"/>
-            </p:input>
-         </p:xslt>
-      </p:group>
-      <!-- log the result? -->
-      <t:log if-set="log-compilation">
-         <p:input port="parameters">
-            <p:pipe step="params" port="parameters"/>
-         </p:input>
-      </t:log>
-   </p:declare-step>
-
-   <!--
+            <xsl:stylesheet version="2.0" t:dummy="...">
+              <xsl:import href="..."/>
+              <xsl:template match="/">
+                <c:query>
+                  <xsl:call-template name="t:generate-tests"/>
+                </c:query>
+              </xsl:template>
+            </xsl:stylesheet>
+          </p:inline>
+        </p:input>
+      </p:string-replace>
+      <!-- actually compile the suite in a query -->
+      <p:xslt name="do-it">
+        <p:input port="source">
+          <p:pipe step="compile-xq" port="source"/>
+        </p:input>
+        <p:input port="stylesheet">
+          <p:pipe step="compiler" port="result"/>
+        </p:input>
+      </p:xslt>
+    </p:group>
+    <!-- log the result? -->
+    <t:log if-set="log-compilation">
+      <p:input port="parameters">
+        <p:pipe step="params" port="parameters"/>
+      </p:input>
+    </t:log>
+  </p:declare-step>
+  <!--
        Get the XML report on source, and give the HTML report on result.
        
        If xspec-home is set, it is used to resolve the XSLT that formats the
@@ -232,58 +201,51 @@
        EXPath packaging system.  If the document element is not an XSpec
        t:report, the error t:ERR001 is thrown.
    -->
-   <p:declare-step type="t:format-report" name="format">
-      <!-- the port declarations -->
-      <p:input  port="source"     primary="true"/>
-      <p:input  port="parameters" kind="parameter"/>
-      <p:output port="result"     primary="true"/>
-      <!-- if xspec-home is not passed, then use packaging public URI -->
-      <p:option name="xspec-home" select="''"/>
-      <!-- either the public URI, or resolved from xspec-home if packaging not supported -->
-      <p:variable name="formatter" select="
-          if ( $xspec-home ) then
-            resolve-uri('src/reporter/format-xspec-report.xsl', $xspec-home)
-          else
-            'http://www.jenitennison.com/xslt/xspec/format-xspec-report.xsl'"/>
-      <!-- log the report? -->
-      <t:log if-set="log-xml-report">
-         <p:input port="parameters">
-            <p:pipe step="format" port="parameters"/>
-         </p:input>
-      </t:log>
-      <!-- if there is a report, format it, or it is an error -->
-      <p:choose>
-         <p:when test="exists(/t:report)">
-            <p:load name="formatter" pkg:kind="xslt">
-               <p:with-option name="href" select="$formatter"/>
-            </p:load>
-            <p:xslt name="format-report">
-               <p:input port="source">
-                  <p:pipe step="format" port="source"/>
-               </p:input>
-               <p:input port="stylesheet">
-                  <p:pipe step="formatter" port="result"/>
-               </p:input>
-               <p:input port="parameters">
-                  <p:empty/>
-               </p:input>
-            </p:xslt>
-         </p:when>
-         <p:otherwise>
-            <p:error code="t:ERR001"/>
-         </p:otherwise>
-      </p:choose>
-      <!-- log the report? -->
-      <t:log if-set="log-report">
-         <p:input port="parameters">
-            <p:pipe step="format" port="parameters"/>
-         </p:input>
-      </t:log>
-   </p:declare-step>
-
+  <p:declare-step type="t:format-report" name="format">
+    <!-- the port declarations -->
+    <p:input port="source" primary="true"/>
+    <p:input port="parameters" kind="parameter"/>
+    <p:output port="result" primary="true"/>
+    <!-- if xspec-home is not passed, then use packaging public URI -->
+    <p:option name="xspec-home" select="''"/>
+    <!-- either the public URI, or resolved from xspec-home if packaging not supported -->
+    <p:variable name="formatter" select="           if ( $xspec-home ) then             resolve-uri('src/reporter/format-xspec-report.xsl', $xspec-home)           else             'http://www.jenitennison.com/xslt/xspec/format-xspec-report.xsl'"/>
+    <!-- log the report? -->
+    <t:log if-set="log-xml-report">
+      <p:input port="parameters">
+        <p:pipe step="format" port="parameters"/>
+      </p:input>
+    </t:log>
+    <!-- if there is a report, format it, or it is an error -->
+    <p:choose>
+      <p:when test="exists(/t:report)">
+        <p:load name="formatter" pkg:kind="xslt">
+          <p:with-option name="href" select="$formatter"/>
+        </p:load>
+        <p:xslt name="format-report">
+          <p:input port="source">
+            <p:pipe step="format" port="source"/>
+          </p:input>
+          <p:input port="stylesheet">
+            <p:pipe step="formatter" port="result"/>
+          </p:input>
+          <p:input port="parameters">
+            <p:empty/>
+          </p:input>
+        </p:xslt>
+      </p:when>
+      <p:otherwise>
+        <p:error code="t:ERR001"/>
+      </p:otherwise>
+    </p:choose>
+    <!-- log the report? -->
+    <t:log if-set="log-report">
+      <p:input port="parameters">
+        <p:pipe step="format" port="parameters"/>
+      </p:input>
+    </t:log>
+  </p:declare-step>
 </p:library>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/marklogic/ml-xquery-harness.xproc b/src/harnesses/marklogic/ml-xquery-harness.xproc
index b71e9e1fa..069c1d72e 100644
--- a/src/harnesses/marklogic/ml-xquery-harness.xproc
+++ b/src/harnesses/marklogic/ml-xquery-harness.xproc
@@ -3,104 +3,69 @@
 <!--  File:       ml-xquery-harness.xproc                                  -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:ml="http://xmlcalabash.com/ns/extensions/marklogic"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/marklogic/harness/xquery.xproc"
-            name="ml-xquery-harness"
-            type="t:ml-xquery-harness"
-            version="1.0">
-	
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite on a MarkLogic instance.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The XQuery library module to test must already be on the MarkLogic
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:ml="http://xmlcalabash.com/ns/extensions/marklogic" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/marklogic/harness/xquery.xproc" name="ml-xquery-harness" type="t:ml-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite on a MarkLogic instance.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The XQuery library module to test must already be on the MarkLogic
         instance.  The instance endpoint is passed in the option 'endpoint'.  The
         runtime utils library (also known as generate-query-utils.xql) must also
         be on the instance (its location hint, that is the 'at' clause to use) is
         passed in the option 'utils-lib'.  The dir where you unzipped the XSpec
         archive on your filesystem is passed in the option 'xspec-home'.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:option name="project-dir" required="true"/>
-
-   <p:import href="http://xmlcalabash.com/extension/steps/library-1.0.xpl"/>
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="host" select="/c:param-set/c:param[@name eq 'host']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="port" select="/c:param-set/c:param[@name eq 'port']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="user" select="/c:param-set/c:param[@name eq 'user']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="password" select="/c:param-set/c:param[@name eq 'password']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="query-at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="modules-re" select="/c:param-set/c:param[@name eq 'modules-re']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <!-- the tested module URI, relative to the project's src/ dir -->
-      <p:variable name="query-file" select="
-          substring-after(
-            resolve-uri(/t:description/@query-at, base-uri(/)),
-            resolve-uri('src/', $project-dir))"/>
-
-      <!-- the at location hint, given explicitly or through 'modules-re' -->
-      <p:variable name="query-at" select="
-          if ( $query-at-param ) then
-            $query-at-param
-          else
-            replace($query-file, '(.+)', $modules-re)"/>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery>
-         <p:with-param name="query-at" select="$query-at"/>
-      </t:compile-xquery>
-
-      <!-- escape the query as text -->
-      <p:escape-markup/>
-
-      <!-- run it on marklogic -->
-      <ml:adhoc-query name="run">
-         <p:with-option name="host"     select="$host"/>
-         <p:with-option name="port"     select="$port"/>
-         <p:with-option name="user"     select="$user"/>
-         <p:with-option name="password" select="$password"/>
-         <p:input port="parameters">
-            <p:empty/>
-         </p:input>
-      </ml:adhoc-query>
-
-      <!-- format the report -->
-      <t:format-report/>
-   </p:group>
-
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:option name="project-dir" required="true"/>
+  <p:import href="http://xmlcalabash.com/extension/steps/library-1.0.xpl"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="host" select="/c:param-set/c:param[@name eq 'host']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="port" select="/c:param-set/c:param[@name eq 'port']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="user" select="/c:param-set/c:param[@name eq 'user']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="password" select="/c:param-set/c:param[@name eq 'password']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="query-at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="modules-re" select="/c:param-set/c:param[@name eq 'modules-re']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- the tested module URI, relative to the project's src/ dir -->
+    <p:variable name="query-file" select="           substring-after(             resolve-uri(/t:description/@query-at, base-uri(/)),             resolve-uri('src/', $project-dir))"/>
+    <!-- the at location hint, given explicitly or through 'modules-re' -->
+    <p:variable name="query-at" select="           if ( $query-at-param ) then             $query-at-param           else             replace($query-file, '(.+)', $modules-re)"/>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery>
+      <p:with-param name="query-at" select="$query-at"/>
+    </t:compile-xquery>
+    <!-- escape the query as text -->
+    <p:escape-markup/>
+    <!-- run it on marklogic -->
+    <ml:adhoc-query name="run">
+      <p:with-option name="host" select="$host"/>
+      <p:with-option name="port" select="$port"/>
+      <p:with-option name="user" select="$user"/>
+      <p:with-option name="password" select="$password"/>
+      <p:input port="parameters">
+        <p:empty/>
+      </p:input>
+    </ml:adhoc-query>
+    <!-- format the report -->
+    <t:format-report/>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/saxon/saxon-xquery-harness.xproc b/src/harnesses/saxon/saxon-xquery-harness.xproc
index 23424eb32..7597efd5a 100644
--- a/src/harnesses/saxon/saxon-xquery-harness.xproc
+++ b/src/harnesses/saxon/saxon-xquery-harness.xproc
@@ -3,82 +3,51 @@
 <!--  File:       saxon-xquery-harness.xproc                               -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/saxon/harness/xquery.xproc"
-            name="saxon-xquery-harness"
-            type="t:saxon-xquery-harness"
-            version="1.0">
-	
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite with the Saxon embedded in Calabash.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The dir where you unzipped the XSpec archive on your filesystem is passed
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/saxon/harness/xquery.xproc" name="saxon-xquery-harness" type="t:saxon-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite with the Saxon embedded in Calabash.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The dir where you unzipped the XSpec archive on your filesystem is passed
         in the option 'xspec-home'.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="xspec-home" select="
-          /c:param-set/c:param[@name eq 'xspec-home']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="utils-library-at" select="
-          /c:param-set/c:param[@name eq 'utils-library-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <!-- either no at location hint, or resolved from xspec-home if packaging not supported -->
-      <p:variable name="utils-lib" select="
-          if ( $utils-library-at ) then
-            $utils-library-at
-          else if ( $xspec-home ) then
-            resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home)
-          else
-            ''"/>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery>
-         <p:with-param name="utils-library-at" select="$utils-lib"/>
-      </t:compile-xquery>
-
-      <!-- escape the query as text -->
-      <p:escape-markup name="escape"/>
-
-      <!-- run it on saxon -->
-      <p:xquery name="run">
-         <p:input port="source">
-            <p:empty/>
-         </p:input>
-         <p:input port="query">
-            <p:pipe step="escape" port="result"/>
-         </p:input>
-         <p:input port="parameters">
-            <p:empty/>
-         </p:input>
-      </p:xquery>
-
-      <!-- format the report -->
-      <t:format-report/>
-   </p:group>
-
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="xspec-home" select="           /c:param-set/c:param[@name eq 'xspec-home']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="utils-library-at" select="           /c:param-set/c:param[@name eq 'utils-library-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- either no at location hint, or resolved from xspec-home if packaging not supported -->
+    <p:variable name="utils-lib" select="           if ( $utils-library-at ) then             $utils-library-at           else if ( $xspec-home ) then             resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home)           else             ''"/>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery>
+      <p:with-param name="utils-library-at" select="$utils-lib"/>
+    </t:compile-xquery>
+    <!-- escape the query as text -->
+    <p:escape-markup name="escape"/>
+    <!-- run it on saxon -->
+    <p:xquery name="run">
+      <p:input port="source">
+        <p:empty/>
+      </p:input>
+      <p:input port="query">
+        <p:pipe step="escape" port="result"/>
+      </p:input>
+      <p:input port="parameters">
+        <p:empty/>
+      </p:input>
+    </p:xquery>
+    <!-- format the report -->
+    <t:format-report/>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/saxon/saxon-xslt-harness.xproc b/src/harnesses/saxon/saxon-xslt-harness.xproc
index c63a56efa..d93a4f2f4 100644
--- a/src/harnesses/saxon/saxon-xslt-harness.xproc
+++ b/src/harnesses/saxon/saxon-xslt-harness.xproc
@@ -3,58 +3,36 @@
 <!--  File:       saxon-xslt-harness.xproc                                 -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-08-30                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/saxon/harness/xslt.xproc"
-            name="saxon-xslt-harness"
-            type="t:saxon-xslt-harness"
-            version="1.0">
-
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite with the Saxon embedded in Calabash.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <!-- TODO: Does not work yet... -->
-   <!--t:ensure-input/-->
-
-   <!-- compile the suite into a stylesheet -->
-   <t:compile-xslt name="compile"/>
-
-   <!-- run it on saxon -->
-   <p:xslt name="run" template-name="t:main">
-      <p:input port="source">
-         <p:empty/>
-      </p:input>
-      <p:input port="stylesheet">
-         <p:pipe step="compile" port="result"/>
-      </p:input>
-      <p:input port="parameters">
-         <p:empty/>
-      </p:input>
-   </p:xslt>
-
-   <!-- format the report -->
-   <t:format-report/>
-
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/saxon/harness/xslt.xproc" name="saxon-xslt-harness" type="t:saxon-xslt-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite with the Saxon embedded in Calabash.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <!-- TODO: Does not work yet... -->
+  <!--t:ensure-input/-->
+  <!-- compile the suite into a stylesheet -->
+  <t:compile-xslt name="compile"/>
+  <!-- run it on saxon -->
+  <p:xslt name="run" template-name="t:main">
+    <p:input port="source">
+      <p:empty/>
+    </p:input>
+    <p:input port="stylesheet">
+      <p:pipe step="compile" port="result"/>
+    </p:input>
+    <p:input port="parameters">
+      <p:empty/>
+    </p:input>
+  </p:xslt>
+  <!-- format the report -->
+  <t:format-report/>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/harnesses/zorba/zorba-xquery-harness.xproc b/src/harnesses/zorba/zorba-xquery-harness.xproc
index 81ed7e0f3..685b0a67c 100644
--- a/src/harnesses/zorba/zorba-xquery-harness.xproc
+++ b/src/harnesses/zorba/zorba-xquery-harness.xproc
@@ -3,119 +3,76 @@
 <!--  File:       zorba-xquery-harness.xproc                               -->
 <!--  Author:     Florent Georges                                          -->
 <!--  Date:       2011-09-18                                               -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2011 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-<p:pipeline xmlns:p="http://www.w3.org/ns/xproc"
-            xmlns:c="http://www.w3.org/ns/xproc-step"
-            xmlns:cx="http://xmlcalabash.com/ns/extensions"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            xmlns:t="http://www.jenitennison.com/xslt/xspec"
-            xmlns:pkg="http://expath.org/ns/pkg"
-            pkg:import-uri="http://www.jenitennison.com/xslt/xspec/zorba/harness/xquery.xproc"
-            name="zorba-xquery-harness"
-            type="t:zorba-xquery-harness"
-            version="1.0">
-
-   <p:documentation>
-      <p>This pipeline executes an XSpec test suite with Zorba.</p>
-      <p><b>Primary input:</b> A XSpec test suite document.</p>
-      <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
-      <p>The dir where you unzipped the XSpec archive on your filesystem is passed
+<p:pipeline xmlns:p="http://www.w3.org/ns/xproc" xmlns:c="http://www.w3.org/ns/xproc-step" xmlns:cx="http://xmlcalabash.com/ns/extensions" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:pkg="http://expath.org/ns/pkg" pkg:import-uri="http://www.jenitennison.com/xslt/xspec/zorba/harness/xquery.xproc" name="zorba-xquery-harness" type="t:zorba-xquery-harness" version="1.0">
+  <p:documentation>
+    <p>This pipeline executes an XSpec test suite with Zorba.</p>
+    <p><b>Primary input:</b> A XSpec test suite document.</p>
+    <p><b>Primary output:</b> A formatted HTML XSpec report.</p>
+    <p>The dir where you unzipped the XSpec archive on your filesystem is passed
         in the option 'xspec-home'.  The compiled test suite (the XQuery file to be
         actually evaluated) is saved on the filesystem to be passed to Zorba.  The
         name of this file is passed in the option 'compiled-file' (it defaults to a
         file in /tmp).  It relies on a script called 'zorba' being available in the
         system's $PATH.</p>
-   </p:documentation>
-
-   <p:serialization port="result" indent="true"/>
-
-   <p:import href="../harness-lib.xpl"/>
-
-   <t:parameters name="params"/>
-
-   <p:group>
-      <p:variable name="xspec-home" select="/c:param-set/c:param[@name eq 'xspec-home']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <!-- TODO: Use a robust way to get a tmp file name from the OS... -->
-      <p:variable name="compiled-file" select="
-          ( /c:param-set/c:param[@name eq 'compiled-file']/@value,
-            'file:///tmp/xspec-zorba-compiled-suite.xq' )[1]">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-
-      <p:variable name="at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <p:variable name="at-attr" select="resolve-uri(/t:description/@query-at, base-uri(/))"/>
-      <p:variable name="at-tmp" select="( $at-param, $at-attr )[.][1]"/>
-      <!-- Saxon's resolve-uri() returns file:/ with only one slashes, which Zorba
+  </p:documentation>
+  <p:serialization port="result" indent="true"/>
+  <p:import href="../harness-lib.xpl"/>
+  <t:parameters name="params"/>
+  <p:group>
+    <p:variable name="xspec-home" select="/c:param-set/c:param[@name eq 'xspec-home']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- TODO: Use a robust way to get a tmp file name from the OS... -->
+    <p:variable name="compiled-file" select="           ( /c:param-set/c:param[@name eq 'compiled-file']/@value,             'file:///tmp/xspec-zorba-compiled-suite.xq' )[1]">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="at-param" select="/c:param-set/c:param[@name eq 'query-at']/@value">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <p:variable name="at-attr" select="resolve-uri(/t:description/@query-at, base-uri(/))"/>
+    <p:variable name="at-tmp" select="( $at-param, $at-attr )[.][1]"/>
+    <!-- Saxon's resolve-uri() returns file:/ with only one slashes, which Zorba
            does not understand. -->
-      <p:variable name="query-at" select="
-          if ( starts-with($at-tmp, 'file:/') and not(starts-with($at-tmp, 'file:///')) ) then
-            concat('file:///', substring($at-tmp, 7))
-          else
-            $at-tmp"/>
-
-      <p:variable name="utils-tmp" select="
-          ( /c:param-set/c:param[@name eq 'utils-library-at']/@value,
-            resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home) )[1]">
-         <p:pipe step="params" port="parameters"/>
-      </p:variable>
-      <!-- Saxon's resolve-uri() returns file:/ with only one slashes, which Zorba
+    <p:variable name="query-at" select="           if ( starts-with($at-tmp, 'file:/') and not(starts-with($at-tmp, 'file:///')) ) then             concat('file:///', substring($at-tmp, 7))           else             $at-tmp"/>
+    <p:variable name="utils-tmp" select="           ( /c:param-set/c:param[@name eq 'utils-library-at']/@value,             resolve-uri('src/compiler/generate-query-utils.xql', $xspec-home) )[1]">
+      <p:pipe step="params" port="parameters"/>
+    </p:variable>
+    <!-- Saxon's resolve-uri() returns file:/ with only one slashes, which Zorba
            does not understand. -->
-      <p:variable name="utils-lib" select="
-          if ( starts-with($utils-tmp, 'file:/') and not(starts-with($utils-tmp, 'file:///')) ) then
-            concat('file:///', substring($utils-tmp, 7))
-          else
-            $utils-tmp"/>
-
-      <!-- compile the suite into a query -->
-      <t:compile-xquery>
-         <p:with-param name="query-at"         select="$query-at"/>
-         <p:with-param name="utils-library-at" select="$utils-lib"/>
-      </t:compile-xquery>
-
-      <!-- escape the query as text -->
-      <p:escape-markup name="escape"/>
-
-      <!-- store it on disk in order to pass it to zorba -->
-      <p:store method="text" name="store">
-         <p:with-option name="href" select="$compiled-file"/>
-      </p:store>
-
-      <!-- run it on zorba, rely on a script 'zorba' being in the PATH -->
-      <p:exec command="zorba" name="run" cx:depends-on="store">
-         <!-- Zorba does not accept a URI, only a file path, so we have to remove
+    <p:variable name="utils-lib" select="           if ( starts-with($utils-tmp, 'file:/') and not(starts-with($utils-tmp, 'file:///')) ) then             concat('file:///', substring($utils-tmp, 7))           else             $utils-tmp"/>
+    <!-- compile the suite into a query -->
+    <t:compile-xquery>
+      <p:with-param name="query-at" select="$query-at"/>
+      <p:with-param name="utils-library-at" select="$utils-lib"/>
+    </t:compile-xquery>
+    <!-- escape the query as text -->
+    <p:escape-markup name="escape"/>
+    <!-- store it on disk in order to pass it to zorba -->
+    <p:store method="text" name="store">
+      <p:with-option name="href" select="$compiled-file"/>
+    </p:store>
+    <!-- run it on zorba, rely on a script 'zorba' being in the PATH -->
+    <p:exec command="zorba" name="run" cx:depends-on="store">
+      <!-- Zorba does not accept a URI, only a file path, so we have to remove
               the 'file:' part.  TODO: Report it to the Zorba mailing list. -->
-         <p:with-option name="args" select="
-             concat('-f -q ', substring-after($compiled-file, ':'))"/>
-         <p:input port="source">
-            <p:empty/>
-         </p:input>
-      </p:exec>
-
-      <!-- unwrap the p:exec step wrapper element -->
-      <p:unwrap name="unwrap" match="/c:result">
-         <p:input port="source">
-            <p:pipe step="run" port="result"/>
-         </p:input>
-      </p:unwrap>
-
-      <!-- format the report -->
-      <t:format-report/>
-   </p:group>
-
+      <p:with-option name="args" select="              concat('-f -q ', substring-after($compiled-file, ':'))"/>
+      <p:input port="source">
+        <p:empty/>
+      </p:input>
+    </p:exec>
+    <!-- unwrap the p:exec step wrapper element -->
+    <p:unwrap name="unwrap" match="/c:result">
+      <p:input port="source">
+        <p:pipe step="run" port="result"/>
+      </p:input>
+    </p:unwrap>
+    <!-- format the report -->
+    <t:format-report/>
+  </p:group>
 </p:pipeline>
-
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 <!-- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS COMMENT.             -->
 <!--                                                                       -->
diff --git a/src/reporter/coverage-report.xsl b/src/reporter/coverage-report.xsl
index be46dab8d..cf0841034 100644
--- a/src/reporter/coverage-report.xsl
+++ b/src/reporter/coverage-report.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       coverage-report.xsl                                      -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/reporter/format-utils.xsl b/src/reporter/format-utils.xsl
index 2a08a6e4e..078509dc7 100644
--- a/src/reporter/format-utils.xsl
+++ b/src/reporter/format-utils.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       format-utils.xsl                                         -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/reporter/format-xspec-report-folding.xsl b/src/reporter/format-xspec-report-folding.xsl
index 228ce6574..fa54e600c 100755
--- a/src/reporter/format-xspec-report-folding.xsl
+++ b/src/reporter/format-xspec-report-folding.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       format-xspec-report-folding.xsl                          -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/reporter/format-xspec-report.xsl b/src/reporter/format-xspec-report.xsl
index 290c0f20b..190edb7a1 100644
--- a/src/reporter/format-xspec-report.xsl
+++ b/src/reporter/format-xspec-report.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       format-xspec-report.xsl                                  -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)          -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/src/reporter/test-report.css b/src/reporter/test-report.css
index d91e3b91b..2cb2cffde 100644
--- a/src/reporter/test-report.css
+++ b/src/reporter/test-report.css
@@ -1,7 +1,6 @@
 /****************************************************************************/
 /*  File:       test-report.css                                             */
 /*  Author:     Jeni Tennsion                                               */
-/*  URI:        http://xspec.googlecode.com/                                */
 /*  Tags:                                                                   */
 /*    Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)             */
 /* ------------------------------------------------------------------------ */
diff --git a/src/schemas/find-examples.rnc b/src/schemas/find-examples.rnc
index 671d5ac15..96339abc0 100644
--- a/src/schemas/find-examples.rnc
+++ b/src/schemas/find-examples.rnc
@@ -1,7 +1,6 @@
 # ========================================================================== #
 #   File:       find-examples.rnc                                            #
 #   Author:     Jeni Tennsion                                                #
-#   URI:        http://xspec.googlecode.com/                                 #
 #   Tags:                                                                    #
 #     Copyright (c) 2008, 2010 Jeni Tennsion (see end of file.)              #
 # -------------------------------------------------------------------------- #
diff --git a/test/Makefile b/test/Makefile
index c08db7c28..865bcf375 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,6 @@
 # ========================================================================== #
 #   File:       test/Makefile                                                #
 #   Author:     Jeni Tennsion                                                #
-#   URI:        http://xspec.googlecode.com/                                 #
 #   Tags:                                                                    #
 #     Copyright (c) 2010 Jeni Tennsion (see end of file.)                    #
 # -------------------------------------------------------------------------- #
diff --git a/test/generate-tests-utils.xspec b/test/generate-tests-utils.xspec
index ecf04c617..f9b19c64d 100644
--- a/test/generate-tests-utils.xspec
+++ b/test/generate-tests-utils.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/generate-tests-utils.xspec                          -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" query="http://www.jenitennison.com/xslt/unit-test" query-at="../src/compiler/generate-query-utils.xql" stylesheet="../src/compiler/generate-tests-utils.xsl">
   <!--
 	   Test the source files generate-tests-utils.xsl and generate-query-utils.xql.
diff --git a/test/generate-xspec-tests.xspec b/test/generate-xspec-tests.xspec
index 14e9f7899..d573250a3 100644
--- a/test/generate-xspec-tests.xspec
+++ b/test/generate-xspec-tests.xspec
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       test/generate-xspec-tests.xspec                          -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/test/unit-expect-xsl.xspec b/test/unit-expect-xsl.xspec
index 6c2c3d5d7..1b7223858 100644
--- a/test/unit-expect-xsl.xspec
+++ b/test/unit-expect-xsl.xspec
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       test/unit-expect-xsl.xspec                               -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Florent Georges (see end of file.)              -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -22,8 +21,8 @@
       <t:expect test="false()"/>
     </t:context>
     <t:expect label="is a template" test="$t:result instance of element(xsl:template)"/>
-    <t:expect label="@test must be transformed to @select" test="$t:result/xsl:variable[@name eq 'impl:test-result']/*/xsl:otherwise/*"> 
+    <t:expect label="@test must be transformed to @select" test="$t:result/xsl:variable[@name eq 'impl:test-result']/*/xsl:otherwise/*">
       <xsl:sequence select="false()" version="..."/>
-    </t:expect> 
+    </t:expect>
   </t:scenario>
 </t:description>
diff --git a/test/xspec-focus-1.xspec b/test/xspec-focus-1.xspec
index 6b9a5ea85..4c4b7b170 100644
--- a/test/xspec-focus-1.xspec
+++ b/test/xspec-focus-1.xspec
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-pending.xspec                                 -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/test/xspec-focus-2.xspec b/test/xspec-focus-2.xspec
index 38441234d..963acd3a6 100644
--- a/test/xspec-focus-2.xspec
+++ b/test/xspec-focus-2.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-pending.xspec                                 -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <!--
        Test @focus and pending toghether (both @pending and t:pending).
diff --git a/test/xspec-function.xspec b/test/xspec-function.xspec
index 911fa9f01..026542f72 100644
--- a/test/xspec-function.xspec
+++ b/test/xspec-function.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-function.xspec                                -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <t:scenario label="call" focus="focus">
     <t:call function="my:square">
diff --git a/test/xspec-import.xspec b/test/xspec-import.xspec
index a8e693bb3..cd07c9f89 100644
--- a/test/xspec-import.xspec
+++ b/test/xspec-import.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-import.xspec                                  -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <t:import href="xspec-imported.xspec"/>
   <t:scenario label="call">
diff --git a/test/xspec-imported.xspec b/test/xspec-imported.xspec
index f62c9612d..af9cdb081 100644
--- a/test/xspec-imported.xspec
+++ b/test/xspec-imported.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-imported.xspec                                -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <t:scenario label="call" focus="focus">
     <t:call function="my:square">
diff --git a/test/xspec-pending.xspec b/test/xspec-pending.xspec
index b441a45e8..a1d5d90da 100644
--- a/test/xspec-pending.xspec
+++ b/test/xspec-pending.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-pending.xspec                                 -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <!--
        Test pending features (x:pending and @pending).
diff --git a/test/xspec-rule.xspec b/test/xspec-rule.xspec
index 0b1d2bc8f..7686faba4 100644
--- a/test/xspec-rule.xspec
+++ b/test/xspec-rule.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-rule.xspec                                    -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" stylesheet="xspec-tested.xsl">
   <t:scenario label="context">
     <t:context>
diff --git a/test/xspec-tested.xql b/test/xspec-tested.xql
index c9855990e..9b5538ebf 100644
--- a/test/xspec-tested.xql
+++ b/test/xspec-tested.xql
@@ -1,7 +1,6 @@
 (::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::)
 (:  File:       test/xspec-tested.xql                                       :)
 (:  Author:     Jeni Tennsion                                               :)
-(:  URI:        http://xspec.googlecode.com/                                :)
 (:  Tags:                                                                   :)
 (:    Copyright (c) 2010 Jeni Tennsion (see end of file.)                   :)
 (: ------------------------------------------------------------------------ :)
diff --git a/test/xspec-tested.xsl b/test/xspec-tested.xsl
index 299457969..fdf92bff9 100644
--- a/test/xspec-tested.xsl
+++ b/test/xspec-tested.xsl
@@ -2,7 +2,6 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-tested.xsl                                    -->
 <!--  Author:     Jeni Tennsion                                            -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/test/xspec-variable.xspec b/test/xspec-variable.xspec
index 37687a4b6..49f2f64a2 100644
--- a/test/xspec-variable.xspec
+++ b/test/xspec-variable.xspec
@@ -2,11 +2,9 @@
 <!-- ===================================================================== -->
 <!--  File:       test/xspec-variable.xspec                                -->
 <!--  Author:     Florent Georges                                          -->
-<!--  URI:        http://xspec.googlecode.com/                             -->
 <!--  Tags:                                                                -->
 <!--    Copyright (c) 2010 Jeni Tennsion (see end of file.)                -->
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<?oxygen RNGSchema="http://xspec.googlecode.com/svn/trunk/xspec.rnc" type="compact"?>
 <t:description xmlns:t="http://www.jenitennison.com/xslt/xspec" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://example.org/ns/my" query="http://example.org/ns/my" query-at="xspec-tested.xql" stylesheet="xspec-tested.xsl">
   <t:variable name="test-data" href="xspec-variable.xml"/>
   <t:variable name="test-3" select="$test-data/*/test[xs:integer(@num) eq 3]"/>