Test changes for spec change 26308 (true|false)
authordebbie
Thu, 07 Aug 2014 17:46:27 +0100
changeset 596 5b8a031e248a
parent 595 0c3dacc355d8
child 597 19977784f24e
Test changes for spec change 26308 (true|false)
tests/attr/expand-text/_expand-text-test-set.xml
tests/attr/expand-text/cvt-005.xsl
tests/attr/expand-text/cvt-006.xsl
tests/attr/expand-text/cvt-009.xsl
tests/attr/tunnel/_tunnel-test-set.xml
tests/attr/use-when/_use-when-test-set.xml
tests/decl/accumulator/_accumulator-test-set.xml
tests/decl/output/_output-test-set.xml
tests/decl/output/output-0106.xsl
tests/decl/param/_param-test-set.xml
tests/fn/key/_key-test-set.xml
tests/insn/copy/_copy-test-set.xml
tests/insn/element/_element-test-set.xml
tests/insn/for-each-group/_for-each-group-test-set.xml
tests/insn/for-each-group/for-each-group-044.xsl
tests/insn/for-each-group/for-each-group-045.xsl
tests/misc/xml-version/_xml-version-test-set.xml
tests/type/namespace/_namespace-test-set.xml
--- a/tests/attr/expand-text/_expand-text-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/expand-text/_expand-text-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -51,7 +51,7 @@
    
    <test-case name="cvt-004">
       <description>Expansion enabled at template level</description>
-      <created by="Michael Kay" on="2013-01-25"/>
+      <created by="Michael Kay" on="2013-01-25"/>      
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
@@ -67,6 +67,7 @@
    <test-case name="cvt-005">
       <description>Atomization</description>
       <created by="Michael Kay" on="2013-01-25"/>
+      <modified by="Debbie Lockett" on="2014-08-05" change="use expand-text='true' and 'false'"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
@@ -82,6 +83,7 @@
    <test-case name="cvt-006">
       <description>Space separation</description>
       <created by="Michael Kay" on="2013-01-25"/>
+      <modified by="Debbie Lockett" on="2014-08-05" change="use expand-text='1' and '0'"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
@@ -130,6 +132,7 @@
    <test-case name="cvt-009">
       <description>expand-text must be yes or no</description>
       <created by="Michael Kay" on="2013-02-05"/>
+      <modified by="Debbie Lockett" on="2014-08-05" change="expand-text must be yes|no|true|false|1|0, e.g. not TRUE"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
@@ -145,6 +148,7 @@
    <test-case name="cvt-010">
       <description>expand-text must be yes or no</description>
       <created by="Michael Kay" on="2013-02-05"/>
+      <modified by="Debbie Lockett" on="2014-08-05" change="expand-text must be yes|no|true|false|1|0, e.g. not empty"/>
       <dependencies>
          <spec value="XSLT30+"/>
       </dependencies>
--- a/tests/attr/expand-text/cvt-005.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/expand-text/cvt-005.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -2,13 +2,13 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="xs"
-    expand-text="no"
+    expand-text=" false "
     version="3.0">
     
     <xsl:param name="Hello"><Goodbye/></xsl:param>
     <xsl:param name="World"><Mars/></xsl:param>
     
-    <xsl:template name="main" expand-text=" yes ">
+    <xsl:template name="main" expand-text=" true ">
         <out>{$Hello} {$World}!</out>
     </xsl:template>
     
--- a/tests/attr/expand-text/cvt-006.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/expand-text/cvt-006.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -2,11 +2,11 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="xs"
-    expand-text="no"
+    expand-text="0"
     version="3.0">
 
     
-    <xsl:template name="main" expand-text=" yes ">
+    <xsl:template name="main" expand-text=" 1 ">
         <out>{1,2} {3,4}{5,6}</out>
     </xsl:template>
     
--- a/tests/attr/expand-text/cvt-009.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/expand-text/cvt-009.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -5,7 +5,7 @@
     expand-text="no"
     version="3.0">
 
-    <xsl:template name="main" expand-text="true">
+    <xsl:template name="main" expand-text="TRUE">
         <out>
             <xsl:attribute name="a">{1,2} {3,4}{5,6}</xsl:attribute>
             <xsl:attribute name="b" separator=" ">{1,2} {3,4}{5,6}</xsl:attribute>
--- a/tests/attr/tunnel/_tunnel-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/tunnel/_tunnel-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -295,7 +295,67 @@
          <error code="XTSE0020"/>
       </result>
    </test-case>
-
+   
+   <test-case name="tunnel-0117">
+      <description>Simple test with a non-tunnel param (tunnel="false") specified within xsl:apply-templates but template param has tunnel="true"</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="tunnel-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="tunnel-0117.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>xyz and zyx</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="tunnel-0118">
+      <description>Simple test with a tunnel param (tunnel="true") specified within xsl:call-template but template param has tunnel="false"</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="tunnel-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="tunnel-0118.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>xyz and zyx</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="tunnel-0119">
+      <description>Simple test with a non-tunnel param (tunnel="0") specified within xsl:apply-templates but template param has tunnel="1"</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="tunnel-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="tunnel-0119.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>xyz and zyx</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="tunnel-0120">
+      <description>Simple test with a tunnel param (tunnel="1") specified within xsl:call-template but template param has tunnel="0"</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="tunnel-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="tunnel-0120.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>xyz and zyx</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
    <test-case name="tunnel-0201">
       <description>Simple test with a tunnel param specified within xsl:apply-templates and the tunnel param value is later retrieved</description>
       <created by="Michael Kay" on="2012-10-30"/>
--- a/tests/attr/use-when/_use-when-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/attr/use-when/_use-when-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -714,6 +714,36 @@
          <error code="XTSE3450"/>
       </result>
    </test-case>
+   
+   <test-case name="use-when-0139">
+      <description>test that the statically declared param and variable (with static="true") are allowed in an excluded section.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0139.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<p>value matched ok $xx=2</p>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="use-when-0140">
+      <description>test that the statically declared param and variable (with static="1") are allowed in an excluded section.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0140.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<p>value matched ok $xx=2</p>]]></assert-xml>
+      </result>
+   </test-case>
 
    <test-case name="use-when-0201">
       <description>Test case that uses use-when attribute with a value of true on an xsl:template.</description>
@@ -1305,6 +1335,66 @@
          </all-of>
       </result>
    </test-case>
+   
+   <test-case name="use-when-0408">
+      <description>Test case using a variable with static="no" attribute, that uses use-when with an EBV of true on an xsl:choose instruction.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-04"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0408.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>-1</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="use-when-0409">
+      <description>Test case using a variable with static="false" attribute, that uses use-when with an EBV of true on an xsl:choose instruction.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-04"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0409.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>-1</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="use-when-0410">
+      <description>Test case using a variable with static="0" attribute, that uses use-when with an EBV of true on an xsl:choose instruction.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-04"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0410.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>-1</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="use-when-0411">
+      <description>Test case using a variable with static="" attribute (not allowed), that uses use-when with an EBV of true on an xsl:choose instruction.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="use-when-04"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="use-when-0411.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
 
    <test-case name="use-when-0501">
       <description>Test case that uses use-when on xsl:sort to avoid ascending sort.</description>
--- a/tests/decl/accumulator/_accumulator-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/decl/accumulator/_accumulator-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -575,5 +575,23 @@
          <assert-xml><![CDATA[<figures><p>Figure 2: a diagram</p><p>Figure 4: another diagram</p><p>Figure 2: a third diagram</p><p>Figure 4: a fourth diagram</p></figures>]]></assert-xml>
       </result>
    </test-case>
+   
+   <test-case name="accumulator-035">
+      <description>Basic test of accumulator functions; @streamable="true"</description>
+      <created by="Debbie Lockett" on="2014-30-07"/>
+      <environment>
+         <source role="." file="accumulator-001.xml" streaming="true"/>
+      </environment>
+      <dependencies>
+         <feature value="streaming"/>
+      </dependencies>
+      <test>
+         <stylesheet file="accumulator-001.xsl"/>
+         <param name="streamable" static="yes" select="'true'"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<figures><p>Figure 1: a diagram</p><p>Figure 2: another diagram</p><p>Figure 1: a third diagram</p><p>Figure 2: a fourth diagram</p></figures>]]></assert-xml>
+      </result>
+   </test-case>
 
 </test-set>
--- a/tests/decl/output/_output-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/decl/output/_output-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -46,6 +46,36 @@
       </result>
    </test-case>
    
+   <test-case name="output-0101a">
+      <description>Test escaping of non-ASCII characters in HTML output when @escape-uri-attributes="true".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0101a.xsl"/>
+      </test>
+      <result>
+         <serialization-matches>href=["']http://iri.example.org/%EF%AD%8F/%C3%A5rsrapport/%C3%A5r/2005\?x=y["']</serialization-matches>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0101b">
+      <description>Test escaping of non-ASCII characters in HTML output when @escape-uri-attributes="1".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0101b.xsl"/>
+      </test>
+      <result>
+         <serialization-matches>href=["']http://iri.example.org/%EF%AD%8F/%C3%A5rsrapport/%C3%A5r/2005\?x=y["']</serialization-matches>
+      </result>
+   </test-case>
+   
    <environment name="output-0102">
       <stylesheet file="output-0102.xsl"/>
    </environment> 
@@ -286,6 +316,36 @@
          <serialization-matches><![CDATA[<\?xml version="1.0" encoding="UTF-8"\?>\s*<html xmlns="http://www.w3.org/1999/xhtml">\s*<body>This is the body</body>\s*</html>]]></serialization-matches>
       </result>
    </test-case>
+   
+   <test-case name="output-0106a">
+      <description>Test indent="true", with XHTML output where the stylesheet has a default namespace defined on the html element itself.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0106a.xsl"/>
+      </test>
+      <result>
+         <serialization-matches><![CDATA[<\?xml version="1.0" encoding="UTF-8"\?>\s*<html xmlns="http://www.w3.org/1999/xhtml">\s+<body>This is the body</body>\s+</html>]]></serialization-matches>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0106b">
+      <description>Test indent=" 1 ", with XHTML output where the stylesheet has a default namespace defined on the html element itself.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0106b.xsl"/>
+      </test>
+      <result>
+         <serialization-matches><![CDATA[<\?xml version="1.0" encoding="UTF-8"\?>\s*<html xmlns="http://www.w3.org/1999/xhtml">\s+<body>This is the body</body>\s+</html>]]></serialization-matches>
+      </result>
+   </test-case>
 
    <test-case name="output-0107">
       <description>Test for SCRIPT handling with XHTML output method.</description>
@@ -346,6 +406,36 @@
          <assert-serialization method="xhtml" file="output030.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0110a">
+      <description>Test for the xhtml output method with omit-xml-declaration="true".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0110a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output030.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0110b">
+      <description>Test for the xhtml output method with omit-xml-declaration="1".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0110b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output030.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0111">
       <description>Test XHTML output with @doctype-system only.</description>
@@ -420,8 +510,8 @@
       <result>
          <assert-serialization method="xhtml" file="output043.out"/>
       </result>
-   </test-case>
-
+   </test-case>   
+   
    <test-case name="output-0116">
       <description>Test empty elements with empty content model in XHTML output and @indent=no.</description>
       <created by="Michael Kay" on="2012-10-30"/>
@@ -436,6 +526,36 @@
          <assert-serialization method="xhtml" file="output045.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0116a">
+      <description>Test empty elements with empty content model in XHTML output and @indent=" false".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0116a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output045.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0116b">
+      <description>Test empty elements with empty content model in XHTML output and @indent="0".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0116b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output045.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0117">
       <description>Boolean attributes should not be output in minimized form.</description>
@@ -579,12 +699,55 @@
 	</all-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0124a">
+      <description>Test HTML output with include-content-type="true", the result tree has a 'head' element.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0124a.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches flags="i"><![CDATA[http-equiv="Content-Type"]]></serialization-matches>
+            <serialization-matches><![CDATA[="Content-Type"]]></serialization-matches>
+            <serialization-matches flags="i"><![CDATA[content="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+            <serialization-matches><![CDATA[="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+            <serialization-matches><![CDATA[<HEAD>[^<]*<[Mm][Ee][Tt][Aa][^>\\]*>[^<]*</HEAD>]]></serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0124b">
+      <description>Test HTML output with include-content-type="1", the result tree has a 'head' element.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0124b.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches flags="i"><![CDATA[http-equiv="Content-Type"]]></serialization-matches>
+            <serialization-matches><![CDATA[="Content-Type"]]></serialization-matches>
+            <serialization-matches flags="i"><![CDATA[content="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+            <serialization-matches><![CDATA[="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+            <serialization-matches><![CDATA[<HEAD>[^<]*<[Mm][Ee][Tt][Aa][^>\\]*>[^<]*</HEAD>]]></serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0125">
       <description>Test HTML output with include-content-type value set to "no".</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="Use serialization-matches"/>
       <modified by="Michael Kay" on="2013-01-31" change="Correct regex in 3rd assertion"/>
+      <modified by="Debbie Lockett" on="2014-08-07" change="Add error to not/any-of assertions"/>
       <environment ref="output-01"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -595,6 +758,7 @@
       <result>
 	<not>
 	  <any-of>
+	     <error code="*"/>
 	    <serialization-matches flags="i"><![CDATA[http-equiv="Content-Type"]]></serialization-matches>
 	    <serialization-matches flags="i"><![CDATA[content="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
 	    <serialization-matches><![CDATA[<HEAD>[^<]*<[Mm][Ee][Tt][Aa][^>]*a[^<]*></HEAD>]]></serialization-matches>
@@ -602,6 +766,50 @@
 	</not>
       </result>
    </test-case>
+   
+   <test-case name="output-0125a">
+      <description>Test HTML output with include-content-type value set to "false".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0125a.xsl"/>
+      </test>
+      <result>
+         <not>
+            <any-of>
+               <error code="*"/>
+               <serialization-matches flags="i"><![CDATA[http-equiv="Content-Type"]]></serialization-matches>
+               <serialization-matches flags="i"><![CDATA[content="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+               <serialization-matches><![CDATA[<HEAD>[^<]*<[Mm][Ee][Tt][Aa][^>]*a[^<]*></HEAD>]]></serialization-matches>
+            </any-of>
+         </not>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0125b">
+      <description>Test HTML output with include-content-type value set to "0".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0125b.xsl"/>
+      </test>
+      <result>
+         <not>
+            <any-of>
+               <error code="*"/>
+               <serialization-matches flags="i"><![CDATA[http-equiv="Content-Type"]]></serialization-matches>
+               <serialization-matches flags="i"><![CDATA[content="application/xhtml-xml; charset=UTF-8"]]></serialization-matches>
+               <serialization-matches><![CDATA[<HEAD>[^<]*<[Mm][Ee][Tt][Aa][^>]*a[^<]*></HEAD>]]></serialization-matches>
+            </any-of>
+         </not>
+      </result>
+   </test-case>
 
    <test-case name="output-0126">
       <description>Test XHTML output with default value for @include-content-type, the result tree has a 'head' element in the XHTML namespace and '@media-type="application/xhtml-xml".</description>
@@ -786,6 +994,46 @@
          </all-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0136a">
+      <description>Test XHTML output with @byte-order-mark=true. Encoding is UTF-8.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0136a.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches><![CDATA[<\?xml]]></serialization-matches>
+            <serialization-matches><![CDATA[<html\s+xmlns="http://www.w3.org/1999/xhtml">]]></serialization-matches>
+            <serialization-matches><![CDATA[<body>Hello</body>]]></serialization-matches>
+            <serialization-matches>^&#xfeff;</serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0136b">
+      <description>Test XHTML output with @byte-order-mark="1". Encoding is UTF-8.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0136b.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches><![CDATA[<\?xml]]></serialization-matches>
+            <serialization-matches><![CDATA[<html\s+xmlns="http://www.w3.org/1999/xhtml">]]></serialization-matches>
+            <serialization-matches><![CDATA[<body>Hello</body>]]></serialization-matches>
+            <serialization-matches>^&#xfeff;</serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0137">
       <description>Test XHTML output with @byte-order-mark=no.Encoding is UTF-8.</description>
@@ -801,6 +1049,36 @@
          <assert-serialization method="text" file="output113.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0137a">
+      <description>Test XHTML output with @byte-order-mark=false. Encoding is UTF-8.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0137a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="text" file="output113.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0137b">
+      <description>Test XHTML output with @byte-order-mark="0". Encoding is UTF-8.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0137b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="text" file="output113.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0138">
       <description>Test of XHTML output with @cdata-section-elements with a list of names with or without prefixes.</description>
@@ -866,6 +1144,42 @@
 	</all-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0141a">
+      <description>Test XHTML output with @escape-uri-attributes="false". Use fn:escape-html-uri to escape some URIs but not all.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>      
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0141a.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches><![CDATA[<a href="http://iri.example.org/ﭏ/årsrapport/år/2005\?x=y">not escaped</a>]]></serialization-matches>
+            <serialization-matches><![CDATA[<a href="http://iri.example.org/%EF%AD%8F/%C3%A5rsrapport/a%CC%8Ar/2005\?x=y"></a>]]></serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0141b">
+      <description>Test XHTML output with @escape-uri-attributes=" 0 ". Use fn:escape-html-uri to escape some URIs but not all.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0141b.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches><![CDATA[<a href="http://iri.example.org/ﭏ/årsrapport/år/2005\?x=y">not escaped</a>]]></serialization-matches>
+            <serialization-matches><![CDATA[<a href="http://iri.example.org/%EF%AD%8F/%C3%A5rsrapport/a%CC%8Ar/2005\?x=y"></a>]]></serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0142">
       <description>Test XHTML output with include-content-type=yes, the result tree has a 'head' element in the XHTML namespace and '@media-type="application/xhtml-xml".</description>
@@ -971,6 +1285,36 @@
          <assert-serialization method="xhtml" file="output134.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0148a">
+      <description>Test for the xhtml output method with omit-xml-declaration="false"</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0148a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output134.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0148b">
+      <description>Test for the xhtml output method with omit-xml-declaration="0"</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0148b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output134.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0149">
       <description>Test for the xhtml output method @standalone=yes.</description>
@@ -986,6 +1330,36 @@
          <assert-serialization method="xhtml" file="output136.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0149a">
+      <description>Test for the xhtml output method @standalone="true".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0149a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output136.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0149b">
+      <description>Test for the xhtml output method @standalone="1".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0149b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output136.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0150">
       <description>Test for the xhtml output method @standalone=no.</description>
@@ -1001,6 +1375,36 @@
          <assert-serialization method="xhtml" file="output137.out"/>
       </result>
    </test-case>
+   
+   <test-case name="output-0150a">
+      <description>Test for the xhtml output method @standalone="false".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0150a.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output137.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="output-0150b">
+      <description>Test for the xhtml output method @standalone="0".</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0150b.xsl"/>
+      </test>
+      <result>
+         <assert-serialization method="xhtml" file="output137.out"/>
+      </result>
+   </test-case>
 
    <test-case name="output-0151">
       <description>Test empty elements with non-empty content model in XHTML output.</description>
@@ -1771,9 +2175,10 @@
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0197a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0197.xsl"/>
@@ -1785,15 +2190,34 @@
          </any-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0197a">
+      <description>Test that an error is raised on invalid @byte-order-mark value ("TRUE") in xsl:output.</description>      
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0197a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0198">
       <description>Test that an error is raised on invalid @escape-uri-attributes value in xsl:output.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0198a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0198.xsl"/>
@@ -1805,14 +2229,33 @@
          </any-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0198a">
+      <description>Test that an error is raised on invalid @escape-uri-attributes value ("YES") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0198a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0199">
       <description>Test that an error is raised on invalid @include-content-type value in xsl:output.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0199a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0199.xsl"/>
@@ -1824,6 +2267,24 @@
          </any-of>
       </result>
    </test-case>
+   
+   <test-case name="output-0199a">
+      <description>Test that an error is raised on invalid @include-content-type value ("TRUE") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0199a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
 
    <test-case name="output-0201">
       <description>Simple test for using one character map with the XML output method.</description>
@@ -2033,6 +2494,7 @@
       </description>
       <created by="Michael Kay" on="2012-12-05"/>
       <modified by="Abel Braaksma" on="2013-12-10" change="@html-version occured in xslt3.0 spec, stylesheet @version=3.0"/>
+      <modified by="Debbie Lockett" on="2014-08-07" change="Add error in not/any-of assertions"/>
       <environment ref="output-02"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -2042,7 +2504,10 @@
       </test>
       <result>
          <not>
-            <serialization-matches>DOCTYPE</serialization-matches>
+            <any-of>
+               <error code="*"/>
+               <serialization-matches>DOCTYPE</serialization-matches>
+            </any-of>            
          </not>
       </result>
    </test-case>
@@ -2463,6 +2928,7 @@
       </description>
       <created by="Michael Kay" on="2012-12-06"/>
       <modified by="Abel Braaksma" on="2013-12-10" change="@html-version occured in xslt3.0 spec, stylesheet @version=3.0"/>
+      <modified by="Debbie Lockett" on="2014-08-07" change="Add error in not/any-of assertions"/>
       <environment ref="output-02"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -2472,7 +2938,10 @@
       </test>
       <result>
          <not>
-           <serialization-matches><![CDATA[<!DOCTYPE\s+html\s*>]]></serialization-matches>
+            <any-of>
+               <error code="*"/>
+               <serialization-matches><![CDATA[<!DOCTYPE\s+html\s*>]]></serialization-matches>
+            </any-of>           
          </not>            
       </result>
    </test-case>
@@ -2517,9 +2986,10 @@
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0280a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0280.xsl"/>
@@ -2532,14 +3002,33 @@
       </result>
    </test-case>
    
+   <test-case name="output-0280a">
+      <description>Test that an error is raised on invalid @indent value ("TRUE") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0280a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
+   
    <test-case name="output-0281">
       <description>Test that an error is raised on invalid @omit-xml-declaration value in xsl:output.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0281a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0281.xsl"/>
@@ -2552,14 +3041,33 @@
       </result>
    </test-case>
    
+   <test-case name="output-0281a">
+      <description>Test that an error is raised on invalid @omit-xml-declaration value ("YES") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0281a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
+   
    <test-case name="output-0282">
       <description>Test that an error is raised on invalid @standalone value in xsl:output.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0282a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0282.xsl"/>
@@ -2572,14 +3080,33 @@
       </result>
    </test-case>
    
+   <test-case name="output-0282a">
+      <description>Test that an error is raised on invalid @standalone value ("TRUE") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0282a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
+   
    <test-case name="output-0283">
       <description>Test that an error is raised on invalid @undeclare-prefixes value in xsl:output.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <modified by="Tim Mills" on="2013-01-29" change="all-of to any-of"/>
       <modified by="Tim Mills" on="2013-01-29" change="error to assert-serialization-error"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="spec value to XSLT20 only, see test output-0283a"/>
       <environment ref="output-01"/>
       <dependencies>
-         <spec value="XSLT20+"/>
+         <spec value="XSLT20"/>
       </dependencies>
       <test>
          <stylesheet file="output-0283.xsl"/>
@@ -2592,6 +3119,24 @@
       </result>
    </test-case>
    
+   <test-case name="output-0283a">
+      <description>Test that an error is raised on invalid @undeclare-prefixes value ("True") in xsl:output.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="output-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="output-0283a.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <assert-serialization-error code="SEPM0016"/>
+            <error code="XTSE0020"/>
+         </any-of>
+      </result>
+   </test-case>
+   
    <test-case name="output-0284">
       <description>Test that an error is raised on invalid @doctype-public value in xsl:output. See XSLT 2.0 Erratum E3</description>
       <created by="Michael Kay" on="2012-11-07"/>
--- a/tests/decl/output/output-0106.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/decl/output/output-0106.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <t:transform xmlns:t="http://www.w3.org/1999/XSL/Transform" version="2.0">
-<!-- Purpose: Test with XHTML output where the stylesheet has a 
+   <!-- Purpose: Test with XHTML output where the stylesheet has a 
   				default namespace defined on the html element itself. -->
 
    <t:output method="xhtml" encoding="UTF-8" indent="yes"/>
--- a/tests/decl/param/_param-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/decl/param/_param-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -266,6 +266,7 @@
          template parameter that specifies required="yes".
       </description>
       <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="Debbie Lockett" on="2014-08-06" change="additional error code, see bug 24864"/>
       <environment ref="param-01"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -275,7 +276,70 @@
          <initial-template name="temp"/>
       </test>
       <result>
-         <error code="XTDE0060"/>
+         <any-of>
+            <error code="XTDE0060"/>
+            <error code="XTDE0700"/>
+         </any-of>
+      </result>
+   </test-case>
+   
+   <test-case name="param-0117">
+      <description>Test the "required" attribute with values "true" and "false", using xsl:call-template instruction to set the parameter.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="param-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="param-0117.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>Required parameter;Not required parameter</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="param-0118">
+      <description>Test the "required" attribute with values "1" and "0", using xsl:call-template instruction to set the parameter.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="param-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="param-0118.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>Required parameter;Not required parameter</out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="param-0119">
+      <description>Test the "required" attribute with values "TRUE" (not allowed) and "0", using xsl:call-template instruction to set the parameter.</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="param-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="param-0119.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
+   
+   <test-case name="param-0120">
+      <description> Test 3 global variables and 1 stylesheet function that reference each other, testing use of static="no", "false" and "0".</description>
+      <created by="Debbie Lockett" on="2014-08-06"/>
+      <environment ref="param-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="param-0120.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>foo</out>]]></assert-xml>
       </result>
    </test-case>
 
--- a/tests/fn/key/_key-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/fn/key/_key-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -1545,4 +1545,19 @@
          <assert-xml><![CDATA[<o><elem type="a"><active>true</active><dataset><field1>x</field1><field2>x</field2><field3><field4>x</field4><field5>x</field5></field3></dataset></elem></o>]]></assert-xml>
       </result>
    </test-case>
+   
+   <test-case name="key-085">
+      <description>test for xsl:key, with composite="yes".</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="key105"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="key-085.xsl"/>
+      </test>
+      <result>
+         <assert>/out='3'</assert>
+      </result>
+   </test-case>
 </test-set>
--- a/tests/insn/copy/_copy-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/insn/copy/_copy-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <test-set xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns="http://www.w3.org/2012/10/xslt-test-catalog"
-          name="copy">
+   xmlns="http://www.w3.org/2012/10/xslt-test-catalog" name="copy">
    <description>Tests copy</description>
    <environment name="copy-01">
       <source role=".">
@@ -44,7 +43,7 @@
 </doc>]]></content>
       </source>
    </environment>
-   
+
    <environment name="copy-06">
       <source role=".">
          <content><![CDATA[<pink xmlns:rose="http://www.rose.com">
@@ -74,17 +73,17 @@
 </OL>]]></content>
       </source>
    </environment>
-   
+
    <environment name="copy-10">
       <source role="." file="copy-10.xml"/>
    </environment>
-   
+
    <environment name="copy-12">
       <source role=".">
          <content><![CDATA[<doc/>]]></content>
       </source>
    </environment>
-   
+
    <environment name="copy-16">
       <source role=".">
          <content><![CDATA[ 
@@ -95,7 +94,7 @@
 </doc>]]></content>
       </source>
    </environment>
-   
+
    <environment name="copy-18">
       <source role="." file="copy-18.xml"/>
    </environment>
@@ -103,7 +102,7 @@
    <environment name="copy-22">
       <source role="." file="copy-22.xml"/>
    </environment>
-   
+
    <environment name="copy-24">
       <source role="." file="copy-24.xml"/>
    </environment>
@@ -120,7 +119,7 @@
 </OL>]]></content>
       </source>
    </environment>
-   
+
    <environment name="copy-29">
       <source role=".">
          <content><![CDATA[ 
@@ -231,7 +230,7 @@
    <environment name="copy-48">
       <source role="." file="copy-48.xml"/>
    </environment>
-   
+
 
    <test-case name="copy-0101">
       <description>Test for simple identity transformation w/Template match</description>
@@ -264,7 +263,8 @@
    </test-case>
 
    <test-case name="copy-0103">
-      <description>Simple identity transformation, Result tree fragment test for xsl:copy-of</description>
+      <description>Simple identity transformation, Result tree fragment test for
+         xsl:copy-of</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-01"/>
       <dependencies>
@@ -331,7 +331,8 @@
    </test-case>
 
    <test-case name="copy-0401">
-      <description>BUG Saxon 5.5.1/010 Test that contents of xsl:copy are ignored for an attribute, comment, text node, or PI</description>
+      <description>BUG Saxon 5.5.1/010 Test that contents of xsl:copy are ignored for an attribute,
+         comment, text node, or PI</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-04"/>
       <dependencies>
@@ -350,7 +351,8 @@
    </test-case>
 
    <test-case name="copy-0501">
-      <description>Test copying of attribute from a temporary tree (docbook bug clearance) See bug 529362</description>
+      <description>Test copying of attribute from a temporary tree (docbook bug clearance) See bug
+         529362</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
          <source role=".">
@@ -398,11 +400,150 @@
       </result>
    </test-case>
 
+   <test-case name="copy-0603">
+      <description>test use copy-namespaces attribute of xsl:copy-of, with values " true " (with
+         some white-space), "false". (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0603.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="copy-0601.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="copy-0604">
+      <description>test use copy-namespaces attribute of xsl:copy, with values "true", "false".
+         (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0604.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="copy-0602.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="copy-0605">
+      <description>test use copy-namespaces attribute of xsl:copy-of, with values "1", "0". (XSLT
+         3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0605.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="copy-0601.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="copy-0606">
+      <description>test use copy-namespaces attribute of xsl:copy, with values " 1" (with some
+         white-space), "0". (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0606.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="copy-0602.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="element-0607">
+      <description> Test case that uses copy-namespaces ="TRUE" on an xsl:copy-of instruction (not
+         allowed).</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0607.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
+
+   <test-case name="element-0608">
+      <description> Test case that uses copy-namespaces ="FALSE" on an xsl:copy instruction (not
+         allowed).</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0608.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
+
+   <test-case name="copy-0609">
+      <description>test use inherit-namespaces="   yes  " (with whitespace) of xsl:copy. (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0609.xsl"/>
+      </test>
+      <result>
+         <assert>//red[namespace::rose="http://www.rose.com"]</assert>
+      </result>
+   </test-case>
+   
+   <test-case name="copy-0610">
+      <description>test use inherit-namespaces="true" of xsl:copy. (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0610.xsl"/>
+      </test>
+      <result>
+         <assert>//red[namespace::rose="http://www.rose.com"]</assert>
+      </result>
+   </test-case>
+   
+   <test-case name="copy-0611">
+      <description>test use inherit-namespaces="1" of xsl:copy. (XSLT 3.0)</description>
+      <created by="Debbie Lockett" on="2014-08-05"/>
+      <environment ref="copy-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="copy-0611.xsl"/>
+      </test>
+      <result>
+         <assert>//red[namespace::rose="http://www.rose.com"]</assert>
+      </result>
+   </test-case>
+
    <test-case name="copy-0701">
-      <description>
-      	Test for copy-of with '*' wildcard pattern. 
-      	This test also checks handling of processing instructions by copy-of.
-      </description>
+      <description> Test for copy-of with '*' wildcard pattern. This test also checks handling of
+         processing instructions by copy-of. </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
          <source role=".">
@@ -436,10 +577,8 @@
    </test-case>
 
    <test-case name="copy-0901">
-      <description>
-      	Use id(node-set) to try to create a set of nodes in random order. 
-      	Either id() or xsl:copy is arranging them in document order.
-      </description>
+      <description> Use id(node-set) to try to create a set of nodes in random order. Either id() or
+         xsl:copy is arranging them in document order. </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
          <source role="." file="copy-09.xml"/>
@@ -471,7 +610,8 @@
    </test-case>
 
    <test-case name="copy-1002">
-      <description>Another style of identity transform, where attributes are copied by copy-of rather than by recursive use of the template.</description>
+      <description>Another style of identity transform, where attributes are copied by copy-of
+         rather than by recursive use of the template.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-10"/>
       <dependencies>
@@ -486,7 +626,8 @@
    </test-case>
 
    <test-case name="copy-1003">
-      <description>FileName: copy43 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy43 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-10"/>
       <dependencies>
@@ -504,9 +645,9 @@
       <description>Test for copy-of with union of attribute nodes.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
-       <source role=".">
-         <content><![CDATA[<TEST RELEASE="R6.0"><ELEMENT x="100000"/><ELEMENT x="2" y="3" z="4"/><ELEMENT x="33333"/></TEST>]]></content>
-       </source>
+         <source role=".">
+            <content><![CDATA[<TEST RELEASE="R6.0"><ELEMENT x="100000"/><ELEMENT x="2" y="3" z="4"/><ELEMENT x="33333"/></TEST>]]></content>
+         </source>
       </environment>
       <dependencies>
          <spec value="XSLT10+"/>
@@ -520,10 +661,8 @@
    </test-case>
 
    <test-case name="copy-1201">
-      <description>
-      	Test copy-of a string constant containing character entity.
-      	With this output encoding, should get one byte of xE8 for the &amp;egrave
-      </description>
+      <description> Test copy-of a string constant containing character entity. With this output
+         encoding, should get one byte of xE8 for the &amp;egrave </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-12"/>
       <dependencies>
@@ -538,10 +677,8 @@
    </test-case>
 
    <test-case name="copy-1202">
-      <description>
-      	Test copy-of a string constant containing character entity.
-      	With this output encoding, should get two bytes (xC3,xA6) for the &amp;aelig
-      </description>
+      <description> Test copy-of a string constant containing character entity. With this output
+         encoding, should get two bytes (xC3,xA6) for the &amp;aelig </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-12"/>
       <dependencies>
@@ -554,9 +691,10 @@
          <assert-xml><![CDATA[<out>abcdæfgh</out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1203">
-      <description>Demonstrate copying a named template from the stylesheet into the result. From a thread on XSL-list 7/30/2001.</description>
+      <description>Demonstrate copying a named template from the stylesheet into the result. From a
+         thread on XSL-list 7/30/2001.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-12"/>
       <dependencies>
@@ -569,7 +707,7 @@
          <assert-xml file="copy-1203.out"/>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1204">
       <description>Make an RTF on the fly and watch for incorrect xml-decl placement</description>
       <created by="Michael Kay" on="2012-11-07"/>
@@ -584,7 +722,7 @@
          <assert-xml><![CDATA[<out><rtf>abc<in x="yz">def</in>ghi</rtf></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1205">
       <description>Test xsl:copy on-empty</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -599,9 +737,10 @@
          <assert>/out/rtf = 'abc'</assert>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1206">
-      <description>Test xsl:copy on-empty: check that the returned node has been copied</description>
+      <description>Test xsl:copy on-empty: check that the returned node has been
+         copied</description>
       <created by="Michael Kay" on="2013-07-30"/>
       <environment ref="copy-12"/>
       <dependencies>
@@ -614,7 +753,7 @@
          <assert>/out/@copied = 'true'</assert>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1207">
       <description>Test xsl:copy on-empty: selecting empty sequence</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -629,7 +768,7 @@
          <assert>/out/rtf = 'abc'</assert>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1208">
       <description>Test xsl:copy on-empty: empty document node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -642,12 +781,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out/@p = "12"</assert>
-             <assert>empty(/out/child::node())</assert>
-         </all-of>    
+            <assert>/out/@p = "12"</assert>
+            <assert>empty(/out/child::node())</assert>
+         </all-of>
       </result>
-   </test-case>  
-   
+   </test-case>
+
    <test-case name="copy-1209">
       <description>Test xsl:copy on-empty: empty document node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -660,12 +799,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out/@p = "12"</assert>
-             <assert>empty(/out/child::node())</assert>
-         </all-of>    
+            <assert>/out/@p = "12"</assert>
+            <assert>empty(/out/child::node())</assert>
+         </all-of>
       </result>
-   </test-case>   
-   
+   </test-case>
+
    <test-case name="copy-1210">
       <description>Test xsl:copy on-empty: content is a namespace node only</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -679,8 +818,8 @@
       <result>
          <assert>/out/rtf</assert>
       </result>
-   </test-case> 
-   
+   </test-case>
+
    <test-case name="copy-1211">
       <description>Test xsl:copy on-empty: non-empty document node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -694,8 +833,8 @@
       <result>
          <assert>/out/a/namespace::n</assert>
       </result>
-   </test-case> 
-   
+   </test-case>
+
    <test-case name="copy-1212">
       <description>Test xsl:copy on-empty: empty comment node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -708,12 +847,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>empty(/out/node())</assert>
+            <assert>/out</assert>
+            <assert>empty(/out/node())</assert>
          </all-of>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1213">
       <description>Test xsl:copy on-empty: non-empty comment node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -726,12 +865,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>/out/comment() = "Boo!"</assert>
+            <assert>/out</assert>
+            <assert>/out/comment() = "Boo!"</assert>
          </all-of>
       </result>
-   </test-case>   
-   
+   </test-case>
+
    <test-case name="copy-1214">
       <description>Test xsl:copy on-empty: empty text node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -744,12 +883,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>empty(/out/node())</assert>
+            <assert>/out</assert>
+            <assert>empty(/out/node())</assert>
          </all-of>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1215">
       <description>Test xsl:copy on-empty: non-empty text node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -762,12 +901,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>/out/text() = "Boo!"</assert>
+            <assert>/out</assert>
+            <assert>/out/text() = "Boo!"</assert>
          </all-of>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1216">
       <description>Test xsl:copy on-empty: empty PI node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -780,12 +919,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>empty(/out/node())</assert>
+            <assert>/out</assert>
+            <assert>empty(/out/node())</assert>
          </all-of>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1217">
       <description>Test xsl:copy on-empty: non-empty PI node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -798,12 +937,12 @@
       </test>
       <result>
          <all-of>
-             <assert>/out</assert>
-             <assert>/out/processing-instruction() = "Boo!"</assert>
+            <assert>/out</assert>
+            <assert>/out/processing-instruction() = "Boo!"</assert>
          </all-of>
       </result>
-   </test-case>  
-   
+   </test-case>
+
    <test-case name="copy-1218">
       <description>Test xsl:copy on-empty: empty attribute node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -818,7 +957,7 @@
          <assert>/out/@y = '3'</assert>
       </result>
    </test-case>
-   
+
    <test-case name="copy-1219">
       <description>Test xsl:copy on-empty: non-empty attribute node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -832,9 +971,9 @@
       <result>
          <assert>/out/@y = '3'</assert>
       </result>
-   </test-case>      
-   
-   
+   </test-case>
+
+
 
    <test-case name="copy-1301">
       <description>Ensure that external entity reference works in copy.</description>
@@ -854,20 +993,18 @@
    </test-case>
 
    <test-case name="copy-1401">
-      <description>
-      	Ensure that external entity reference with high-byte character works in copy. 
-      	With this output encoding, should get one byte of xBE for the &amp;frac34
-      </description>
+      <description> Ensure that external entity reference with high-byte character works in copy.
+         With this output encoding, should get one byte of xBE for the &amp;frac34 </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
-      <source role=".">
-         <content><![CDATA[<!DOCTYPE test [ 
+         <source role=".">
+            <content><![CDATA[<!DOCTYPE test [ 
   <!ELEMENT test (#PCDATA)> 
   <!ENTITY extEnt SYSTEM "ent22.xml">
   ]>
   <test>abcd&extEnt;fgh</test>]]></content>
-      </source>
-   </environment>
+         </source>
+      </environment>
       <dependencies>
          <spec value="XSLT10+"/>
       </dependencies>
@@ -883,14 +1020,14 @@
       <description>Purpose: Test for copy-of text nodes including CDATA.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
-      <source role=".">
-         <content><![CDATA[ 
+         <source role=".">
+            <content><![CDATA[ 
 <doc>
   <simple>abcde</simple>
   <coded>ab<![CDATA[<P>&nbsp;</P>]]]]><![CDATA[>de</coded>
 </doc>]]></content>
-      </source>
-   </environment>
+         </source>
+      </environment>
       <dependencies>
          <spec value="XSLT10+"/>
       </dependencies>
@@ -906,7 +1043,8 @@
    </test-case>
 
    <test-case name="copy-1601">
-      <description>Test for processing-instruction() node-test in copy-of. should say "Found-pi,,Found-pi"</description>
+      <description>Test for processing-instruction() node-test in copy-of. should say
+         "Found-pi,,Found-pi"</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-16"/>
       <dependencies>
@@ -925,7 +1063,8 @@
    </test-case>
 
    <test-case name="copy-1602">
-      <description>FileName: copy24 Document: http://www.w3.org/TR/xpath DocVersion: 19991116 Section: 2.3</description>
+      <description>FileName: copy24 Document: http://www.w3.org/TR/xpath DocVersion: 19991116
+         Section: 2.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-16"/>
       <dependencies>
@@ -942,10 +1081,8 @@
    </test-case>
 
    <test-case name="copy-1701">
-      <description>
-      	Accumulate attributes from several places in the source. 
-      	First, get all attribute nodes under the 'a' node in the source next, get an attribute node from elsewhere
-      </description>
+      <description> Accumulate attributes from several places in the source. First, get all
+         attribute nodes under the 'a' node in the source next, get an attribute node from elsewhere </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
          <source role="." file="copy-17.xml"/>
@@ -1035,7 +1172,8 @@
    </test-case>
 
    <test-case name="copy-2202">
-      <description>FileName: copy40 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
+      <description>FileName: copy40 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-22"/>
       <dependencies>
@@ -1112,7 +1250,8 @@
    </test-case>
 
    <test-case name="copy-2501">
-      <description>Make an RTF of the whole doc and watch for incorrect xml-decl placement.</description>
+      <description>Make an RTF of the whole doc and watch for incorrect xml-decl
+         placement.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-25"/>
       <dependencies>
@@ -1134,7 +1273,8 @@
    </test-case>
 
    <test-case name="copy-2502">
-      <description>Make a node-set of the whole doc and watch for incorrect xml-decl placement.</description>
+      <description>Make a node-set of the whole doc and watch for incorrect xml-decl
+         placement.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-25"/>
       <dependencies>
@@ -1190,7 +1330,16 @@
    </test-case>
 
    <test-case name="copy-2801">
-      <description>Using copy-of for repeated output of an RTF (HTML output) Source Attribution: This test was written by Michael Kay and is taken from 'XSLT Programmer's Reference' published by Wrox Press Limited in 2000; ISBN 1-861003-12-9; copyright Wrox Press Limited 2000; all rights reserved. Now updated in the second edition (ISBN 1-861005-06-7), http://www.wrox.com. No part of this book may be reproduced, stored in a retrieval system or transmitted in any form or by any means - electronic, electrostatic, mechanical, photocopying, recording or otherwise - without the prior written permission of the publisher, except in the case of brief quotations embodied in critical articles or reviews. Origin: copy-of/soccer.xml, copy-of/soccer.xsl, Chapter/Page: 4-185, was MK015 before</description>
+      <description>Using copy-of for repeated output of an RTF (HTML output) Source Attribution:
+         This test was written by Michael Kay and is taken from 'XSLT Programmer's Reference'
+         published by Wrox Press Limited in 2000; ISBN 1-861003-12-9; copyright Wrox Press Limited
+         2000; all rights reserved. Now updated in the second edition (ISBN 1-861005-06-7),
+         http://www.wrox.com. No part of this book may be reproduced, stored in a retrieval system
+         or transmitted in any form or by any means - electronic, electrostatic, mechanical,
+         photocopying, recording or otherwise - without the prior written permission of the
+         publisher, except in the case of brief quotations embodied in critical articles or reviews.
+         Origin: copy-of/soccer.xml, copy-of/soccer.xsl, Chapter/Page: 4-185, was MK015
+         before</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment>
          <source role="." file="copy-28.xml"/>
@@ -1207,7 +1356,8 @@
    </test-case>
 
    <test-case name="copy-2901">
-      <description>FileName: COPY41 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: COPY41 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-29"/>
       <dependencies>
@@ -1222,7 +1372,8 @@
    </test-case>
 
    <test-case name="copy-3001">
-      <description>FileName: copy42 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy42 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-30"/>
       <dependencies>
@@ -1237,7 +1388,8 @@
    </test-case>
 
    <test-case name="copy-3101">
-      <description>FileName: copy44 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy44 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-31"/>
       <dependencies>
@@ -1252,7 +1404,8 @@
    </test-case>
 
    <test-case name="copy-3102">
-      <description>FileName: copy46 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.2</description>
+      <description>FileName: copy46 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.2</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-31"/>
       <dependencies>
@@ -1267,7 +1420,8 @@
    </test-case>
 
    <test-case name="copy-3301">
-      <description>FileName: copy47 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.1.1 (and 11.3)</description>
+      <description>FileName: copy47 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.1.1 (and 11.3)</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-33"/>
       <dependencies>
@@ -1282,7 +1436,8 @@
    </test-case>
 
    <test-case name="copy-3302">
-      <description>FileName: copy48 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.1.1 (and 11.3)</description>
+      <description>FileName: copy48 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.1.1 (and 11.3)</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-33"/>
       <dependencies>
@@ -1297,7 +1452,8 @@
    </test-case>
 
    <test-case name="copy-3401">
-      <description>FileName: copy49 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.5</description>
+      <description>FileName: copy49 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.5</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-34"/>
       <dependencies>
@@ -1312,7 +1468,8 @@
    </test-case>
 
    <test-case name="copy-3501">
-      <description>FileName: copy51 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.5</description>
+      <description>FileName: copy51 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.5</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-35"/>
       <dependencies>
@@ -1328,7 +1485,8 @@
    </test-case>
 
    <test-case name="copy-3601">
-      <description>FileName: copy52 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.5</description>
+      <description>FileName: copy52 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.5</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-36"/>
       <dependencies>
@@ -1347,7 +1505,8 @@
    </test-case>
 
    <test-case name="copy-3602">
-      <description>FileName: copy53 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy53 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-36"/>
       <dependencies>
@@ -1362,7 +1521,8 @@
    </test-case>
 
    <test-case name="copy-3603">
-      <description>FileName: copy54 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.5</description>
+      <description>FileName: copy54 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.5</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-36"/>
       <dependencies>
@@ -1380,7 +1540,8 @@
    </test-case>
 
    <test-case name="copy-3701">
-      <description>FileName: COPY55 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 7.5</description>
+      <description>FileName: COPY55 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 7.5</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-37"/>
       <dependencies>
@@ -1395,7 +1556,8 @@
    </test-case>
 
    <test-case name="copy-3801">
-      <description>FileName: copy56 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
+      <description>FileName: copy56 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-38"/>
       <dependencies>
@@ -1410,7 +1572,8 @@
    </test-case>
 
    <test-case name="copy-3901">
-      <description>FileName: copy57 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
+      <description>FileName: copy57 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-39"/>
       <dependencies>
@@ -1425,7 +1588,8 @@
    </test-case>
 
    <test-case name="copy-4001">
-      <description>FileName: copy58 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
+      <description>FileName: copy58 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         AdditionalSpec: http://www.w3.org/1999/11/REC-xslt-19991116-errata/#E27</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-40"/>
       <dependencies>
@@ -1440,7 +1604,8 @@
    </test-case>
 
    <test-case name="copy-4101">
-      <description>FileName: copy59 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
+      <description>FileName: copy59 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-41"/>
       <dependencies>
@@ -1455,7 +1620,8 @@
    </test-case>
 
    <test-case name="copy-4102">
-      <description>FileName: copy60 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
+      <description>FileName: copy60 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3 Using Values of Variables &amp; Parameters with xsl:copy-of.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-41"/>
       <dependencies>
@@ -1530,7 +1696,8 @@
    </test-case>
 
    <test-case name="copy-4304">
-      <description>Use xsl:copy-of within a function, which in Saxon will do a virtual copy</description>
+      <description>Use xsl:copy-of within a function, which in Saxon will do a virtual
+         copy</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-43"/>
       <dependencies>
@@ -1545,10 +1712,8 @@
    </test-case>
 
    <test-case name="copy-4305">
-      <description>
-      	Check that in a copy of a tree, axes only navigate within the subtree that was copied 
-      	&lt;xsl:variable name="cp" select="$in//c"/&gt;
-      </description>
+      <description> Check that in a copy of a tree, axes only navigate within the subtree that was
+         copied &lt;xsl:variable name="cp" select="$in//c"/&gt; </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-43"/>
       <dependencies>
@@ -1563,10 +1728,8 @@
    </test-case>
 
    <test-case name="copy-4306">
-      <description>
-      	Saxon 8.5.1 bug report from Krzysztof Nowicki. 
-      	Copying a document node followed by an element node in the sequence constructor of a new document node.
-      </description>
+      <description> Saxon 8.5.1 bug report from Krzysztof Nowicki. Copying a document node followed
+         by an element node in the sequence constructor of a new document node. </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-43"/>
       <dependencies>
@@ -1582,7 +1745,8 @@
    </test-case>
 
    <test-case name="copy-4307">
-      <description>Test xsl:copy when there is no context item. See spec bug 7624. In this example the error can be detected statically.</description>
+      <description>Test xsl:copy when there is no context item. See spec bug 7624. In this example
+         the error can be detected statically.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-43"/>
       <dependencies>
@@ -1597,7 +1761,8 @@
    </test-case>
 
    <test-case name="copy-4308">
-      <description>Test xsl:copy when there is no context item. See spec bug 7624. In this example the error is detected dynamically.</description>
+      <description>Test xsl:copy when there is no context item. See spec bug 7624. In this example
+         the error is detected dynamically.</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-43"/>
       <dependencies>
@@ -1663,7 +1828,8 @@
    </test-case>
 
    <test-case name="copy-4601">
-      <description>FileName: COPY50 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: COPY50 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-46"/>
       <dependencies>
@@ -1678,7 +1844,8 @@
    </test-case>
 
    <test-case name="copy-4701">
-      <description>FileName: copy61 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy61 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-47"/>
       <dependencies>
@@ -1693,7 +1860,8 @@
    </test-case>
 
    <test-case name="copy-4702">
-      <description>FileName: copy62 Document: http://www.w3.org/TR/xslt DocVersion: 19991116 Section: 11.3</description>
+      <description>FileName: copy62 Document: http://www.w3.org/TR/xslt DocVersion: 19991116
+         Section: 11.3</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-47"/>
       <dependencies>
@@ -1708,7 +1876,8 @@
    </test-case>
 
    <test-case name="copy-4801">
-      <description>Test for simple identity transformation w/Template match, using select attribute</description>
+      <description>Test for simple identity transformation w/Template match, using select
+         attribute</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-48"/>
       <dependencies>
@@ -1723,7 +1892,8 @@
    </test-case>
 
    <test-case name="copy-4802">
-      <description>Test for simple identity transformation w/Template match, using select attribute</description>
+      <description>Test for simple identity transformation w/Template match, using select
+         attribute</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="copy-48"/>
       <dependencies>
@@ -1783,5 +1953,5 @@
       </result>
    </test-case>
 
-  
+
 </test-set>
--- a/tests/insn/element/_element-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/insn/element/_element-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <test-set xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns="http://www.w3.org/2012/10/xslt-test-catalog"
-          name="element">
-   
+   xmlns="http://www.w3.org/2012/10/xslt-test-catalog" name="element">
+
    <description>Tests the xsl:element instruction</description>
-   
+
    <environment name="element-01">
       <source role=".">
          <content><![CDATA[<doc>
@@ -15,13 +14,14 @@
 </doc>]]></content>
       </source>
    </environment>
-   
+
    <environment name="element-03">
       <source role="." file="element-03.xml"/>
    </environment>
 
    <test-case name="element-0001">
-      <description>Test that the element name is cast to a string if supplied as a QName</description>
+      <description>Test that the element name is cast to a string if supplied as a
+         QName</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -36,7 +36,8 @@
    </test-case>
 
    <test-case name="element-0002">
-      <description>Test that the element namespace is cast to a string if supplied as a anyURI</description>
+      <description>Test that the element namespace is cast to a string if supplied as a
+         anyURI</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -51,7 +52,8 @@
    </test-case>
 
    <test-case name="element-0003">
-      <description>Test that the element name is cast to a string if supplied as a dynamic QName</description>
+      <description>Test that the element name is cast to a string if supplied as a dynamic
+         QName</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -66,7 +68,8 @@
    </test-case>
 
    <test-case name="element-0004">
-      <description>Test that the element namespace is cast to a string if supplied as a dynamic anyURI</description>
+      <description>Test that the element namespace is cast to a string if supplied as a dynamic
+         anyURI</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -81,10 +84,9 @@
    </test-case>
 
    <test-case name="element-0005">
-      <description>
-         Test that the element namespace is cast to a string if supplied as a dynamic boolean 
-         (Highly artifial test, but legal XSLT, even though the results cannot be converted to canonical XML)
-      </description>
+      <description> Test that the element namespace is cast to a string if supplied as a dynamic
+         boolean (Highly artifial test, but legal XSLT, even though the results cannot be converted
+         to canonical XML) </description>
       <created by="Michael Kay" on="2012-11-07"/>
       <dependencies>
          <spec value="XSLT20+"/>
@@ -99,7 +101,8 @@
    </test-case>
 
    <test-case name="element-0101">
-      <description>Test case that uses xsl:sequence inside xsl:element to create children and attributes for the new element.</description>
+      <description>Test case that uses xsl:sequence inside xsl:element to create children and
+         attributes for the new element.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-01"/>
       <dependencies>
@@ -114,7 +117,8 @@
    </test-case>
 
    <test-case name="element-0102">
-      <description>Test case to create a new element using xsl:element and use inherit-namespace="no".</description>
+      <description>Test case to create a new element using xsl:element and use
+         inherit-namespaces="no".</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-01"/>
       <dependencies>
@@ -143,7 +147,7 @@
          <assert-xml><![CDATA[<out><name xmlns:abc="http://www.test.com"/></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="element-0104">
       <description>xsl:element with on-empty.</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -158,7 +162,7 @@
          <assert-xml><![CDATA[<out><one><name><e/></name></one><two/></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="element-0105">
       <description>xsl:element with on-empty, producing an element</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -173,7 +177,7 @@
          <assert-xml><![CDATA[<out><one><name><e/></name></one><two><jaq/></two></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="element-0106">
       <description>xsl:element with on-empty, with intervening document node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -188,7 +192,7 @@
          <assert-xml><![CDATA[<out><one><name><e/></name></one><two><jaq/></two></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="element-0107">
       <description>xsl:element with on-empty, with intervening empty text node</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -203,7 +207,7 @@
          <assert-xml><![CDATA[<out><one><name><e/></name></one><two><jaq/></two></out>]]></assert-xml>
       </result>
    </test-case>
-   
+
    <test-case name="element-0108">
       <description>xsl:element with on-empty, value is an atomic type (not allowed)</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -218,7 +222,7 @@
          <error code="XTTE3310"/>
       </result>
    </test-case>
-   
+
    <test-case name="element-0109">
       <description>xsl:element with on-empty, value is two elements (not allowed)</description>
       <created by="Michael Kay" on="2013-07-30"/>
@@ -233,12 +237,45 @@
          <error code="XTTE3310"/>
       </result>
    </test-case>
+   
+   <test-case name="element-0110">
+      <description>Test case to create a new element using xsl:element and use inherit-namespaces="
+         false" (with some white-space). (Adapted element-0102)</description>
+      <created by="Debbie Lockett" on="2014-07-31"/>
+      <environment ref="element-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="element-0110.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out><Outer xmlns="http://www.test.com"><Worth xmlns=""
+            ><e2 type="valid" value="eternity">Worth</e2></Worth></Outer></out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="element-0111">
+      <description>Test case to create a new element using xsl:element and use
+         inherit-namespaces="0". (Adapted element-0102)</description>
+      <created by="Debbie Lockett" on="2014-07-31"/>
+      <environment ref="element-01"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="element-0111.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out><Outer xmlns="http://www.test.com"><Worth xmlns=""
+            ><e2 type="valid" value="eternity">Worth</e2></Worth></Outer></out>]]></assert-xml>
+      </result>
+   </test-case>
 
    <test-case name="element-0201">
-      <description>
-         Test case that creates an element using xsl:element instruction and uses different ways 
-         (xsl:attribute instruction, xsl:call-template, xsl:copy-of) to add attributes to the newly created element.
-      </description>
+      <description> Test case that creates an element using xsl:element instruction and uses
+         different ways (xsl:attribute instruction, xsl:call-template, xsl:copy-of) to add
+         attributes to the newly created element. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment>
          <source role=".">
@@ -276,10 +313,9 @@
    </test-case>
 
    <test-case name="element-0302">
-      <description>
-         Test case that uses xml:base in the content of a new element to verify that the base URI of the new element 
-         is the value of xml:base attribute resolved against the base URI of the xsl:element in the stylesheet.
-      </description>
+      <description> Test case that uses xml:base in the content of a new element to verify that the
+         base URI of the new element is the value of xml:base attribute resolved against the base
+         URI of the xsl:element in the stylesheet. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -294,7 +330,8 @@
    </test-case>
 
    <test-case name="element-0303">
-      <description>Test case to verify that zero-length strings result in no text node child.</description>
+      <description>Test case to verify that zero-length strings result in no text node
+         child.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -309,7 +346,8 @@
    </test-case>
 
    <test-case name="element-0304">
-      <description>Test case to verify that adjacent strings/text nodes copied into content result in one merged text node.</description>
+      <description>Test case to verify that adjacent strings/text nodes copied into content result
+         in one merged text node.</description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -327,10 +365,9 @@
    </test-case>
 
    <test-case name="element-0305">
-      <description>
-         Test case that uses inherit-namespaces = yes on an xsl:element instruction to verify that the 
-         namespace nodes are copied to the children and descendants of the newly constructed element.
-      </description>
+      <description> Test case that uses inherit-namespaces = "yes" on an xsl:element instruction to
+         verify that the namespace nodes are copied to the children and descendants of the newly
+         constructed element. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -346,13 +383,12 @@
    </test-case>
 
    <test-case name="element-0306">
-      <description>
-         Test case that uses inherit-namespaces = "yes" inherit-namespaces = "no" on different xsl:element 
-         instructions to verify the effect of the inherit-namespaces attribute on differents levels of elements 
-         (parent, child, grandchild).
-      </description>
+      <description> Test case that uses inherit-namespaces = "yes" inherit-namespaces = "no" on
+         different xsl:element instructions to verify the effect of the inherit-namespaces attribute
+         on differents levels of elements (parent, child, grandchild). </description>
       <created by="Michael Kay" on="2012-10-30"/>
-      <modified by="Michael Kay" on="2012-11-27" change="rewrote expected result to test the namespace nodes explicitly"/>
+      <modified by="Michael Kay" on="2012-11-27"
+         change="rewrote expected result to test the namespace nodes explicitly"/>
       <modified by="Abel Braaksma" on="2014-05-23" change="expected results changed: see bug 20340"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -373,28 +409,35 @@
             <assert>/out/*:profession/namespace::* = "http://www.dummy_ns.com"</assert>
             <assert>/out/*:profession/namespace::* = "http://www.w3.org/XML/1998/namespace"</assert>
             <assert>count(/out/*:profession/namespace::*) = 4</assert>
-            <assert>/out/*:profession/*:IT_Architect/namespace::* = "http://www.w3.org/XML/1998/namespace"</assert>
-            <assert>/out/*:profession/*:IT_Architect/namespace::* = "http://www.dummy_ns.com"</assert>
+            <assert>/out/*:profession/*:IT_Architect/namespace::* =
+               "http://www.w3.org/XML/1998/namespace"</assert>
+            <assert>/out/*:profession/*:IT_Architect/namespace::* =
+               "http://www.dummy_ns.com"</assert>
             <assert>count(/out/*:profession/*:IT_Architect/namespace::*) = 4</assert>
-            <assert>/out/*:profession/*:IT_Specialist/namespace::* = "http://www.w3.org/XML/1998/namespace"</assert>
+            <assert>/out/*:profession/*:IT_Specialist/namespace::* =
+               "http://www.w3.org/XML/1998/namespace"</assert>
             <assert>/out/*:profession/*:IT_Specialist/namespace::* = "http://www.all.com"</assert>
             <assert>count(/out/*:profession/*:IT_Specialist/namespace::*) = 4</assert>
-            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* = "http://www.w3.org/XML/1998/namespace"</assert>
-            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* = "http://www.funJobs.com"</assert>
-            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* = "http://www.easyJobs.com"</assert>
-            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* = "http://www.dummy_ns.com"</assert>
+            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* =
+               "http://www.w3.org/XML/1998/namespace"</assert>
+            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* =
+               "http://www.funJobs.com"</assert>
+            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* =
+               "http://www.easyJobs.com"</assert>
+            <assert>/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::* =
+               "http://www.dummy_ns.com"</assert>
             <assert>count(/out/*:profession/*:IT_Specialist/*:dogsbody/namespace::*) = 4</assert>
-            <assert>/out/*:profession/Business_Analyst/namespace::* = "http://www.w3.org/XML/1998/namespace"</assert>
+            <assert>/out/*:profession/Business_Analyst/namespace::* =
+               "http://www.w3.org/XML/1998/namespace"</assert>
             <assert>count(/out/*:profession/Business_Analyst/namespace::*) = 3</assert>
          </all-of>
       </result>
    </test-case>
 
    <test-case name="element-0307">
-      <description>
-         Test case that uses different combinations of xsl:namespace and xmlns attribute on an xsl:element 
-         instruction with prefixed and unprefixed QNames to test the effect of the namespace on the newly created element.
-      </description>
+      <description> Test case that uses different combinations of xsl:namespace and xmlns attribute
+         on an xsl:element instruction with prefixed and unprefixed QNames to test the effect of the
+         namespace on the newly created element. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -409,10 +452,9 @@
    </test-case>
 
    <test-case name="element-0308">
-      <description>
-         Test case that creates an xsl:element and the AVT used in the name attribute delivers a result that 
-         is of type xs:QName. That will be casted to string to compute the result of the AVT.
-      </description>
+      <description> Test case that creates an xsl:element and the AVT used in the name attribute
+         delivers a result that is of type xs:QName. That will be casted to string to compute the
+         result of the AVT. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -427,10 +469,8 @@
    </test-case>
 
    <test-case name="element-0309">
-      <description>
-         Test case that uses default-validation="strip" on an xsl:stylesheet element to verify the type 
-         annotation is stripped.
-      </description>
+      <description> Test case that uses default-validation="strip" on an xsl:stylesheet element to
+         verify the type annotation is stripped. </description>
       <created by="Michael Kay" on="2012-10-30"/>
       <environment ref="element-03"/>
       <dependencies>
@@ -442,5 +482,59 @@
       <result>
          <assert-xml><![CDATA[<out>truetrue</out>]]></assert-xml>
       </result>
+   </test-case>   
+
+   <test-case name="element-0310">
+      <description> Test case that uses inherit-namespaces ="true" on an xsl:element instruction to
+         verify that the namespace nodes are copied to the children and descendants of the newly
+         constructed element. (Adapted element-0305) </description>
+      <created by="Debbie Lockett" on="2014-07-31"/>
+      <environment ref="element-03"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="namespace_axis"/>
+      </dependencies>
+      <test>
+         <stylesheet file="element-0310.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="element-0305.out"/>
+      </result>
+   </test-case>   
+
+   <test-case name="element-0311">
+      <description> Test case that uses inherit-namespaces ="1" on an xsl:element instruction to
+         verify that the namespace nodes are copied to the children and descendants of the newly
+         constructed element. (Adapted element-0305) </description>
+      <created by="Debbie Lockett" on="2014-07-31"/>
+      <environment ref="element-03"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="namespace_axis"/>
+      </dependencies>
+      <test>
+         <stylesheet file="element-0311.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="element-0305.out"/>
+      </result>
    </test-case>
+
+   <test-case name="element-0312">
+      <description> Test case that uses inherit-namespaces ="01" on an xsl:element instruction (not
+         allowed). (Adapted element-0305) </description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="element-03"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="namespace_axis"/>
+      </dependencies>
+      <test>
+         <stylesheet file="element-0312.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
+
 </test-set>
--- a/tests/insn/for-each-group/_for-each-group-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/insn/for-each-group/_for-each-group-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -689,6 +689,7 @@
    <test-case name="for-each-group-044">
       <description>XSLT 3.0 grouping using group-adjacent with composite keys</description>
       <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Debbie Lockett" on="2014-08-04" change="use composite='true'"/>
       <environment ref="group020"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -704,6 +705,7 @@
    <test-case name="for-each-group-045">
       <description>XSLT 3.0 grouping using group-adjacent with composite keys including NaNs</description>
       <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Debbie Lockett" on="2014-08-04" change="use composite='1'"/>
       <environment ref="group020"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -1147,4 +1149,79 @@
          /></out>]]></assert-xml>
       </result>
    </test-case>
+   
+   <test-case name="for-each-group-073">
+      <description>simple test of value-based grouping, with composite="no"</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="group001"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="for-each-group-073.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="for-each-group-001.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="for-each-group-074">
+      <description>simple test of value-based grouping, with composite="  false  " (with white-space)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="group001"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="for-each-group-074.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="for-each-group-001.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="for-each-group-075">
+      <description>simple test of value-based grouping, with composite="0"</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="group001"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="for-each-group-075.xsl"/>
+      </test>
+      <result>
+         <assert-xml file="for-each-group-001.out"/>
+      </result>
+   </test-case>
+   
+   <test-case name="for-each-group-076">
+      <description>XSLT 3.0 grouping using group-by with composite=" " (not allowed).</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="group020"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="for-each-group-076.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
+   
+   <test-case name="for-each-group-077">
+      <description>ERR XTSE1090: cannot specify composite except with group-by/adjacent</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="group020"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="for-each-group-077.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE1090"/>
+      </result>
+   </test-case>
 </test-set>
--- a/tests/insn/for-each-group/for-each-group-044.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/insn/for-each-group/for-each-group-044.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -11,7 +11,7 @@
 <out>
 	<xsl:for-each-group select="/*/city" 
 	                    group-adjacent="@country, xs:decimal(@pop)"
-	                    composite="yes">
+	                    composite="true">
 	  <group country="{current-grouping-key()[1]}" pop="{current-grouping-key()[2]}">
 	    <xsl:copy-of select="current-group()"/>
 	  </group>
--- a/tests/insn/for-each-group/for-each-group-045.xsl	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/insn/for-each-group/for-each-group-045.xsl	Thu Aug 07 17:46:27 2014 +0100
@@ -11,7 +11,7 @@
 <out>
 	<xsl:for-each-group select="1 to 30" 
 	                    group-adjacent=". idiv 2, number(concat(., 'zzz'))"
-	                    composite="yes">
+	                    composite="1">
 	  <group values="{current-group()}"/>
 	</xsl:for-each-group>
 </out>
--- a/tests/misc/xml-version/_xml-version-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/misc/xml-version/_xml-version-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -563,4 +563,76 @@
          <assert-serialization-error code="SERE0006"/>
       </result>
    </test-case>
+   
+   <test-case name="xml-version-031">
+      <description>See if a namespace undeclaration (using undeclare-prefixes="true") in a stylesheet works.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="xml-version-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="xml-version-031.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches>version=['"]1.1['"]</serialization-matches>
+            <serialization-matches>xmlns:a=(""|'')</serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
+   
+   <test-case name="xml-version-032">
+      <description>See if a namespace undeclaration (using undeclare-prefixes=" 1 ") in a stylesheet works.</description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="xml-version-06"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="xml-version-032.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <serialization-matches>version=['"]1.1['"]</serialization-matches>
+            <serialization-matches>xmlns:a=(""|'')</serialization-matches>
+         </all-of>
+      </result>
+   </test-case>
+   
+   <test-case name="xml-version-033">
+      <description>
+         Tests undeclare-prefixes="false" on xsl:output element where the method is 'xml' 
+         and version is '1.1', the namespace is an IRI.
+      </description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="xml-version-02"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="xml-version-033.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out><a xmlns:pref="http://example.org/pre&#xC0;"><b/></a></out>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="xml-version-034">
+      <description>
+         Tests undeclare-prefixes="0" on xsl:output element where the method is 'xml' 
+         and version is '1.1', the namespace is an IRI.
+      </description>
+      <created by="Debbie Lockett" on="2014-08-07"/>
+      <environment ref="xml-version-02"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="xml-version-034.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out><a xmlns:pref="http://example.org/pre&#xC0;"><b/></a></out>]]></assert-xml>
+      </result>
+   </test-case>
 </test-set>
--- a/tests/type/namespace/_namespace-test-set.xml	Thu Aug 07 17:39:25 2014 +0100
+++ b/tests/type/namespace/_namespace-test-set.xml	Thu Aug 07 17:46:27 2014 +0100
@@ -1360,7 +1360,7 @@
    </test-case>
 
    <test-case name="namespace-2614">
-      <description>Modified example taken from the example "Confilicting Namespace Prefixes" in section 11.7 of the spec exclude-result-prefixes added. This should not generate an error (namespace fixup should invent a prefix)</description>
+      <description>Modified example taken from the example "Conflicting Namespace Prefixes" in section 11.7 of the spec exclude-result-prefixes added. This should not generate an error (namespace fixup should invent a prefix)</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="namespace-26"/>
       <dependencies>
@@ -1420,7 +1420,7 @@
    </test-case>
 
    <test-case name="namespace-2618">
-      <description>Incorrect example taken from the example "Confilicting Namespace Prefixes" in section 11.7 of the spec This should generate an error (two conflicting namespace nodes). Corrected versions in nspc70 and nspc71</description>
+      <description>Incorrect example taken from the example "Conflicting Namespace Prefixes" in section 11.7 of the spec This should generate an error (two conflicting namespace nodes). Corrected versions in nspc70 and nspc71</description>
       <created by="Michael Kay" on="2012-11-07"/>
       <environment ref="namespace-26"/>
       <dependencies>
@@ -1510,6 +1510,54 @@
          <error code="XTDE0920"/>
       </result>
    </test-case>
+   
+   <test-case name="namespace-2625">
+      <description>test inherit-namespaces="false" on xsl:copy</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="namespace-26"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="XML_1.1"/>
+      </dependencies>
+      <test>
+         <stylesheet file="namespace-2625.xsl"/>
+      </test>
+      <result>
+         <assert-xml xml-version="1.1"><![CDATA[<n:a xmlns="http://d/" xmlns:n="http://n/"><n:b xmlns:n="http://n2/" xmlns=""/><c xmlns="http://n3/" xmlns:n=""/></n:a>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="namespace-2626">
+      <description>test inherit-namespaces="  0" on xsl:copy</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="namespace-26"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="XML_1.1"/>
+      </dependencies>
+      <test>
+         <stylesheet file="namespace-2626.xsl"/>
+      </test>
+      <result>
+         <assert-xml xml-version="1.1"><![CDATA[<n:a xmlns="http://d/" xmlns:n="http://n/"><n:b xmlns:n="http://n2/" xmlns=""/><c xmlns="http://n3/" xmlns:n=""/></n:a>]]></assert-xml>
+      </result>
+   </test-case>
+   
+   <test-case name="namespace-2627">
+      <description>test inherit-namespaces="FALSE" on xsl:copy (not allowed)</description>
+      <created by="Debbie Lockett" on="2014-08-04"/>
+      <environment ref="namespace-26"/>
+      <dependencies>
+         <spec value="XSLT30+"/>
+         <feature value="XML_1.1"/>
+      </dependencies>
+      <test>
+         <stylesheet file="namespace-2627.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0020"/>
+      </result>
+   </test-case>
 
    <test-case name="namespace-2701">
       <description>Identity template (using an unusual namespace prefix)</description>