diff --git a/array/index-of.xml b/array/index-of.xml
index fd840f7c..f16ef552 100644
--- a/array/index-of.xml
+++ b/array/index-of.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="us-ascii"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="array-index-of" covers-40="array-index-of">
-  <description>Tests for the array:index-of() function (4.0 proposal)</description>
-  <link type="spec" document="http://www.w3.org/TR/xpath-functions-30/" idref="func-array-index-of"/>
-
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="array-index-of" covers-40="PR968">
+  <description>Tests for the array:index-of() function (4.0)</description>
+  
   <dependency type="spec" value="XP40+ XQ40+"/>
   
   <test-case name="array-index-of-001">
diff --git a/array/of.xml b/array/of.xml
deleted file mode 100644
index 1713d3b4..00000000
--- a/array/of.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="array-of" covers-40="array-of">
-   <description>Tests for the proposed XPath 4.0 array:of() function</description>
-   <link type="spec" document="http://www.w3.org/TR/xpath-functions-30/"
-         idref="array-of"/>
-   
-   <dependency type="spec" value="XP40+ XQ40+"/>
-
-   <test-case name="array-of-001">
-      <description> Create an empty array </description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <test>array:of(())</test>
-      <result>
-         <assert-deep-eq>[]</assert-deep-eq>
-      </result>
-   </test-case>
-   
-   <test-case name="array-of-002">
-      <description> Create a singleton array </description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <modified by="Michael Kay" on="2023-03-22" change="revised spec using value records"/>
-      <test>array:of(map{'value':1})</test>
-      <result>
-         <assert-deep-eq>[1]</assert-deep-eq>
-      </result>
-   </test-case>
-   
-   <test-case name="array-of-003">
-      <description> Create a singleton array whose member is a sequence</description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <modified by="Michael Kay" on="2023-03-22" change="revised spec using value records"/>
-      <test>array:of(map{'value':(1 to 5)})</test>
-      <result>
-         <assert-deep-eq>[(1 to 5)]</assert-deep-eq>
-      </result>
-   </test-case>
-   
-   <test-case name="array-of-004">
-      <description> Create a more complex array</description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <modified by="Michael Kay" on="2023-03-22" change="revised spec using value records"/>
-      <modified by="Christian Gruen" on="2023-04-06" change="Syntax fixed"/>
-      <test>array:of((map:entry('value', 1 to 3), map:entry('value', 11 to 13)))</test>
-      <result>
-         <assert-deep-eq>[(1, 2, 3), (11, 12, 13)]</assert-deep-eq>
-      </result>
-   </test-case>
-   
-   <test-case name="array-of-005">
-      <description> Create a more complex array</description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <modified by="Michael Kay" on="2023-03-22" change="revised spec using value records"/>
-      <test>array:of(("The price of freedom" => tokenize()) ! map:entry('value', characters(.)))</test>
-      <result>
-         <assert-deep-eq>[("T", "h", "e"), ("p", "r", "i", "c", "e"), ("o", "f"), ("f", "r", "e", "e", "d", "o", "m")]</assert-deep-eq>
-      </result>
-   </test-case>
-   
-   <test-case name="array-of-006">
-      <description> Reconstruct an array</description>
-      <created by="Michael Kay" on="2021-06-28"/>
-      <test>array:of(array:members([("T", "h", "e"), ("p", "r", "i", "c", "e"), ("o", "f"), ("f", "r", "e", "e", "d", "o", "m")]))</test>
-      <result>
-         <assert-deep-eq>[("T", "h", "e"), ("p", "r", "i", "c", "e"), ("o", "f"), ("f", "r", "e", "e", "d", "o", "m")]</assert-deep-eq>
-      </result>
-   </test-case>
-   
- 
-
- 
-</test-set>
diff --git a/array/values.xml b/array/values.xml
new file mode 100644
index 00000000..7ae25a0e
--- /dev/null
+++ b/array/values.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="array-values" covers-40="PR476">
+   <description>Tests for the XPath 4.0 array:values() function</description>
+ 
+   
+   <dependency type="spec" value="XP40+ XQ40+"/>
+
+   <test-case name="array-values-001">
+      <description> Deconstruct an empty array </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([])</test>
+      <result>
+         <assert-empty/>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-002">
+      <description> Deconstruct a singleton array </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([1])</test>
+      <result>
+         <assert-eq>1</assert-eq>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-003">
+      <description> Deconstruct a more complex array </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([1, (2,3)])</test>
+      <result>
+         <assert-count>3</assert-count>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-004">
+      <description> Deconstruct a more complex array </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([1, (2,3)])</test>
+      <result>
+         <assert-deep-eq>1, 2, 3</assert-deep-eq>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-005">
+      <description> Deconstruct a more complex array </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([1, (2,3), ()])</test>
+      <result>
+         <assert-deep-eq>1, 2, 3</assert-deep-eq>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-006">
+      <description> Not recursive </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values([1, [2,3], []])</test>
+      <result>
+         <assert-deep-eq>1, [2,3], []</assert-deep-eq>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-901">
+      <description> Argument must not be empty sequence </description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values(())</test>
+      <result>
+         <error code="XPTY0004"/>
+      </result>
+   </test-case>
+   
+   <test-case name="array-values-902">
+      <description> Argument must not be sequence of arrays</description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <test>array:values(([1], [2]))</test>
+      <result>
+         <error code="XPTY0004"/>
+      </result>
+   </test-case>
+   
+   
+   
+ 
+
+ 
+</test-set>
diff --git a/catalog.xml b/catalog.xml
index 3c08d97d..8e0bade5 100644
--- a/catalog.xml
+++ b/catalog.xml
@@ -399,6 +399,7 @@
     <test-set name="array-subarray"                     file="array/subarray.xml"/>
     <test-set name="array-tail"                         file="array/tail.xml"/>
     <test-set name="array-trunk"                        file="array/trunk.xml"/>
+    <test-set name="array-values"                       file="array/values.xml"/>
     
     <!-- Some tests for characteristics of xs: data types. -->
     
diff --git a/fn/distinct-values.xml b/fn/distinct-values.xml
index 42650ad3..76216bf8 100644
--- a/fn/distinct-values.xml
+++ b/fn/distinct-values.xml
@@ -1333,7 +1333,7 @@
       </result>
    </test-case>
    
-   <test-case name="distinct-values-401" covers-40="keywords">
+   <test-case name="distinct-values-401" covers-40="PR590">
       <description> Collation set to () </description>
       <created by="Michael Kay" on="2023-07-04"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -1343,7 +1343,7 @@
       </result>
    </test-case>
    
-   <test-case name="distinct-values-402" covers-40="keywords">
+   <test-case name="distinct-values-402" covers-40="PR590">
       <description> Collation set to () </description>
       <created by="Michael Kay" on="2023-07-04"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -1353,7 +1353,7 @@
       </result>
    </test-case>
    
-   <test-case name="distinct-values-403" covers-40="keywords">
+   <test-case name="distinct-values-403" covers-40="PR590">
       <description> Collation set to () dynamically </description>
       <created by="Michael Kay" on="2023-07-04"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -1363,7 +1363,7 @@
       </result>
    </test-case>
    
-   <test-case name="distinct-values-404">
+   <test-case name="distinct-values-404" changes-40="PR987">
       <description>In 4.0 order of results is predictable (assumes ordering mode = ordered)</description>
       <created by="Michael Kay" on="2024-01-31"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
diff --git a/fn/duplicate-values.xml b/fn/duplicate-values.xml
index 2b41ff64..23896c75 100644
--- a/fn/duplicate-values.xml
+++ b/fn/duplicate-values.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-duplicate-values" covers-40="fn-duplicate-values">
-   <description>Tests for the duplicate-values() function</description>
-   <link type="spec" document="http://www.w3.org/TR/xpath-functions-30/"
-         idref="func-duplicate-values"/>
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-duplicate-values" covers-40="PR614">
+   <description>Tests for the duplicate-values() function (4.0)</description>
    
    <dependency type="spec" value="XP40+ XQ40+"/>
    
@@ -1303,7 +1301,7 @@ duplicate-values(
       </result>
    </test-case>
    
-   <test-case name="duplicate-values-401" covers-40="keywords">
+   <test-case name="duplicate-values-401" covers-40="PR590">
       <description> Collation set to () </description>
       <created by="Michael Kay" on="2023-07-18"/>
       <test>fn:duplicate-values(("a", "a"), ())</test>
@@ -1312,7 +1310,7 @@ duplicate-values(
       </result>
    </test-case>
    
-   <test-case name="duplicate-values-402" covers-40="keywords">
+   <test-case name="duplicate-values-402" covers-40="PR590">
       <description> Collation set to () </description>
       <created by="Michael Kay" on="2023-07-18"/>
       <test>count(fn:duplicate-values(("a", "b", "a"), collation:=()))</test>
@@ -1321,7 +1319,7 @@ duplicate-values(
       </result>
    </test-case>
    
-   <test-case name="duplicate-values-403" covers-40="keywords">
+   <test-case name="duplicate-values-403" covers-40="PR590">
       <description> Collation set to () dynamically </description>
       <created by="Michael Kay" on="2023-07-18"/>
       <test>count(fn:duplicate-values(("a", "b", "a"), collation:="xyz"[current-date() lt xs:date('1999-01-01')]))</test>
@@ -1330,7 +1328,7 @@ duplicate-values(
       </result>
    </test-case>
    
-   <test-case name="duplicate-values-404">
+   <test-case name="duplicate-values-404" changes-40="PR987">
       <description>Order of results is predictable (assumes ordering mode = ordered)</description>
       <created by="Michael Kay" on="2024-01-31"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
diff --git a/fn/seconds.xml b/fn/seconds.xml
index 4af5dd63..4da53f63 100644
--- a/fn/seconds.xml
+++ b/fn/seconds.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-seconds">
-   <description>Tests for the seconds() function</description>
-   <link type="spec" document="http://www.w3.org/TR/xpath-functions-30/"
-         idref="func-seconds"/>
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="PR984">
+   <description>Tests for the seconds() function (4.0)</description>
    
    <dependency type="spec" value="XP40+ XQ40+"/>
 
diff --git a/fn/sort-with.xml b/fn/sort-with.xml
index 1a0fcd6a..3ff055f8 100644
--- a/fn/sort-with.xml
+++ b/fn/sort-with.xml
@@ -1,6 +1,5 @@
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-sort-with" covers-40="fn-sort-with">
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-sort-with" covers-40="PR795">
   <description>Tests for the fn:sort-with function</description>
-  <link type="spec" document="http://www.w3.org/TR/xpath-functions-30/" idref="func-sort-with"/>
   <dependency type="spec" value="XP40+ XQ40+"/>
   
   <test-case name="sort-with-001">
diff --git a/fn/subsequence-where.xml b/fn/subsequence-where.xml
index 2c3fd69b..2c8a7e7b 100644
--- a/fn/subsequence-where.xml
+++ b/fn/subsequence-where.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-subsequence-where"  covers-40="PR940">
-   <description>Tests for the fn:subsequence-where function (4.0 proposal)</description>
-   <link type="spec" document="http://www.w3.org/TR/xpath-functions-11/"
-         idref="func-subsequence-where"/>
+   <description>Tests for the fn:subsequence-where function (4.0)</description>
          
-    <dependency type="spec" value="XP40+ XQ40+"/>  
+   <dependency type="spec" value="XP40+ XQ40+"/>  
 
    <test-case name="subsequence-after-001">
        <description>Basic example</description>
diff --git a/fn/void.xml b/fn/void.xml
index 2aa3142b..12576653 100644
--- a/fn/void.xml
+++ b/fn/void.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-void" covers-40="fn-void">
-   <description>Tests for the fn:log() function (4.0 proposal)</description>
-   <link type="spec" document="http://www.w3.org/TR/xquery-30/"
-         idref="doc-xquery30-QuantifiedExpr"/>
-   <link type="spec" document="XQuery" section-number="3.11"
-         idref="id-quantified-expressions"/>
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="fn-void" covers-40="PR575">
+   <description>Tests for the fn:void() function (4.0)</description>
+ 
    
    
    <dependency type="spec" value="XP40+ XQ40+"/>
@@ -42,7 +39,7 @@
       </result>
    </test-case>
    
-   <test-case name="void-004">
+   <test-case name="void-004" covers-40="PR1032">
       <description> Use void#0 function item </description>
       <created by="Michael Kay" on="2024-02-20"/>
       <test>(1 to 10) => for-each(if (current-date() lt xs:date('1900-01-01')) 
@@ -53,7 +50,7 @@
       </result>
    </test-case>
    
-   <test-case name="void-005">
+   <test-case name="void-005" covers-40="PR1032">
       <description> Direct call on void#0 </description>
       <created by="Michael Kay" on="2024-02-20"/>
       <test>empty(void())</test>
diff --git a/prod/Annotation.xml b/prod/Annotation.xml
index ef5571f9..e84b80d8 100644
--- a/prod/Annotation.xml
+++ b/prod/Annotation.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="us-ascii"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-Annotation" covers-30="annotations">
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-Annotation" >
    <description>Tests for function and variable annotations</description>
-   <link type="spec" document="http://www.w3.org/TR/xquery-30/"
-         idref="doc-xquery30-Annotation"/>
-   <link type="spec" document="XQuery" section-number="5.15"
-         idref="id-annotations"/>
+
    <dependency type="spec" value="XQ30+"/>
 
    <test-case name="annotation-1">
@@ -640,7 +637,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-01" covers-40="extended-annotations">
+   <test-case name="annotation-40-01" covers-40="PR682">
       <description>
          Annotation value true()</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -657,7 +654,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-02" covers-40="extended-annotations">
+   <test-case name="annotation-40-02" covers-40="PR682">
       <description>
          Annotation value false()</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -674,7 +671,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-03" covers-40="extended-annotations">
+   <test-case name="annotation-40-03" covers-40="PR682">
       <description>
          Annotation value true() with whitespace</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -691,7 +688,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-04" covers-40="extended-annotations">
+   <test-case name="annotation-40-04" covers-40="PR682">
       <description>
          Annotation value false() with whitespace and comments</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -708,7 +705,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-05" covers-40="extended-annotations">
+   <test-case name="annotation-40-05" covers-40="PR682">
       <description>
          Annotation value false() with namespace prefix: not allowed</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -725,7 +722,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-06" covers-40="extended-annotations">
+   <test-case name="annotation-40-06" covers-40="PR682">
       <description>
          Annotation values true() and false() mixed with others</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -742,7 +739,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-07" covers-40="extended-annotations">
+   <test-case name="annotation-40-07" covers-40="PR682">
       <description>
          Annotation value true() used with a variable</description>
       <created by="Michael Kay" on="2023-09-06"/>
@@ -757,7 +754,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-08" covers-40="extended-annotations">
+   <test-case name="annotation-40-08" covers-40="PR682">
       <description>Hex integers are allowed</description>
       <created by="Michael Kay" on="2023-09-06"/>
       <dependency type="spec" value="XQ40+"/>
@@ -773,7 +770,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-09" covers-40="extended-annotations">
+   <test-case name="annotation-40-09" covers-40="PR682">
       <description>Underscores in integers are allowed</description>
       <created by="Michael Kay" on="2023-09-06"/>
       <dependency type="spec" value="XQ40+"/>
@@ -789,7 +786,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-10" covers-40="extended-annotations">
+   <test-case name="annotation-40-10" covers-40="PR682">
       <description>Binary integers are allowed</description>
       <created by="Michael Kay" on="2023-09-06"/>
       <dependency type="spec" value="XQ40+"/>
@@ -805,7 +802,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-11" covers-40="extended-annotations">
+   <test-case name="annotation-40-11" covers-40="PR682">
       <description>Negative numbers are allowed</description>
       <created by="Michael Kay" on="2023-09-07"/>
       <dependency type="spec" value="XQ40+"/>
@@ -821,7 +818,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-12" covers-40="extended-annotations">
+   <test-case name="annotation-40-12" covers-40="PR682">
       <description>Negative numbers are allowed</description>
       <created by="Michael Kay" on="2023-09-07"/>
       <dependency type="spec" value="XQ40+"/>
@@ -837,7 +834,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-13" covers-40="extended-annotations">
+   <test-case name="annotation-40-13" covers-40="PR682">
       <description>Negative strings are not allowed</description>
       <created by="Michael Kay" on="2023-09-07"/>
       <dependency type="spec" value="XQ40+"/>
@@ -853,7 +850,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-14" covers-40="extended-annotations">
+   <test-case name="annotation-40-14" covers-40="PR682">
       <description>Negative booleans are not allowed</description>
       <created by="Michael Kay" on="2023-09-07"/>
       <dependency type="spec" value="XQ40+"/>
@@ -869,8 +866,8 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-40-15" covers-40="extended-annotations">
-      <description>Double negatuves are not allowed</description>
+   <test-case name="annotation-40-15" covers-40="PR682">
+      <description>Double negatives are not allowed</description>
       <created by="Michael Kay" on="2023-09-07"/>
       <dependency type="spec" value="XQ40+"/>
       <test><![CDATA[
@@ -885,8 +882,24 @@
       </result>
    </test-case>
    
+   <test-case name="annotation-40-16" covers-40="PR682">
+      <description>String templates are not allowed</description>
+      <created by="Michael Kay" on="2024-03-15"/>
+      <dependency type="spec" value="XQ40+"/>
+      <test><![CDATA[
+         declare namespace a = "http://www.example.org/annotation";
+         declare %a:awesomeness(`awesome`) function local:foo() {
+            "bar"
+         };
+         local:foo()
+      ]]></test>
+      <result>
+         <error code="XPST0003"/>
+      </result>
+   </test-case>
+   
 
-   <test-case name="annotation-assertion-1" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-1" >
       <description>
          Tests that a function test with an annotation assertion
          parses. The behavior of annotation assertions is
@@ -905,7 +918,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-2" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-2" >
       <description>
           An annotation assertion with a string literal parameter.  
           Tests the parsing of annotation assertions. 
@@ -921,7 +934,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-3" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-3" >
       <description>
           An annotation assertion with an integer literal parameter.
           Tests the parsing of annotation assertions. 
@@ -937,7 +950,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-4" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-4" >
       <description>
           An annotation assertion with a decimal literal parameter.
           Tests the parsing of annotation assertions. 
@@ -953,7 +966,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-5" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-5" >
       <description>
           An annotation assertion with a double literal parameter
           Tests the parsing of annotation assertions. 
@@ -969,7 +982,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-6" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-6" >
       <description>
           An annotation assertion with multiple parameters
           Tests the parsing of annotation assertions. 
@@ -985,7 +998,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-7" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-7" >
       <description>
           An annotation assertion with an expanded QName
           Tests the parsing of annotation assertions. 
@@ -1001,7 +1014,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-8" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-8" >
       <description>
           An annotation assertion with an expanded QName.
           Tests the parsing of annotation assertions. 
@@ -1017,7 +1030,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-9" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-9" >
       <description>
           Multiple annotation assertions.
           Tests the parsing of annotation assertions. 
@@ -1033,7 +1046,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-10" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-10" >
       <description>
           An annotation assertion on a typed function test.
           Tests the parsing of annotation assertions. 
@@ -1049,7 +1062,7 @@
       <result><assert-false/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-11" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-11" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Kay" on="2014-03-19" change="added dependency"/>        
@@ -1061,7 +1074,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-12" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-12" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Dyck" on="2012-03-11" change="Revised URIQualifiedName syntax as per bug 15399"/>
@@ -1074,7 +1087,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-13" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-13" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Kay" on="2014-03-19" change="added dependency"/>        
@@ -1086,7 +1099,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-14" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-14" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Dyck" on="2012-03-11" change="Revised URIQualifiedName syntax as per bug 15399"/>
@@ -1099,7 +1112,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-15" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-15" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Kay" on="2014-03-19" change="added dependency"/>        
@@ -1111,7 +1124,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-16" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-16" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Kay" on="2014-03-19" change="added dependency"/>        
@@ -1123,7 +1136,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-17" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-17" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Michael Kay" on="2014-03-19" change="added dependency"/>        
@@ -1136,7 +1149,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
 
-   <test-case name="annotation-assertion-18" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-18" >
       <description>An annotation assertion in a reserved namespace.</description>
       <created by="Josh Spiegel" on="2012-01-09"/>
       <modified by="Josh Spiegel" on="2012-10-08" change="Changed reserved namespace (bug 16199)"/>
@@ -1150,7 +1163,7 @@
       <result><error code="XQST0045"/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-19" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-19" >
       <description>
          Two annotation assertions with the same name
          Tests the parsing of annotation assertions. 
@@ -1165,7 +1178,7 @@
       <result><assert-false/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-20" covers-30="annotation-assertions">
+   <test-case name="annotation-assertion-20" >
       <description>
          In a list of function annotation assertions, %public and %private can be mixed. 
       </description>
@@ -1185,7 +1198,7 @@
       </result>
    </test-case>
    
-   <test-case name="annotation-assertion-40-01" covers-40="extended-annotations">
+   <test-case name="annotation-assertion-40-01" covers-40="PR682">
       <description>
          In an annotation assertion, the value true() can be used
       </description>
@@ -1198,7 +1211,7 @@
       <result><assert-false/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-40-02" covers-40="extended-annotations">
+   <test-case name="annotation-assertion-40-02" covers-40="PR682">
       <description>
          In an annotation assertion, the value false() can be used
       </description>
@@ -1211,7 +1224,7 @@
       <result><assert-false/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-40-03" covers-40="extended-annotations">
+   <test-case name="annotation-assertion-40-03" covers-40="PR682">
       <description>
          In an annotation assertion, the values true() and false() can be used together
       </description>
@@ -1224,7 +1237,7 @@
       <result><assert-false/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-40-04" covers-40="extended-annotations">
+   <test-case name="annotation-assertion-40-04" covers-40="PR682">
       <description>
          In an annotation assertion, comments can be used together with true() and false()
       </description>
@@ -1237,7 +1250,7 @@
       <result><assert-false/></result>
    </test-case>
    
-   <test-case name="annotation-assertion-40-05" covers-40="extended-annotations">
+   <test-case name="annotation-assertion-40-05" covers-40="PR682">
       <description>
          In an annotation assertion, negative numbers are allowed
       </description>
@@ -1250,5 +1263,18 @@
       <result><assert-false/></result>
    </test-case>
    
+   <test-case name="annotation-assertion-40-06" covers-40="PR682">
+      <description>
+         In an annotation assertion, string templates are not allowed
+      </description>
+      <created by="Michael Kay" on="2023-09-07"/>        
+      <dependency type="spec" value="XQ40+"/>
+      <test><![CDATA[
+         declare namespace eg = "http://example.com";
+         () instance of %eg:x(`wonderful`) function(*)
+      ]]></test>
+      <result><assert-false/></result>
+   </test-case>
+   
 
 </test-set>
diff --git a/prod/Literal.xml b/prod/Literal.xml
index 0121857c..8e05bacf 100644
--- a/prod/Literal.xml
+++ b/prod/Literal.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="us-ascii"?>
 <test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-Literal">
    <description>Tests for the Literal production</description>
-   <link type="spec" document="http://www.w3.org/TR/xquery-30/"
-         idref="doc-xquery30-Literal"/>
-   <link type="spec" document="XQuery" section-number="3.1.1" idref="id-literals"/>
+
 
    <test-case name="Literals001">
       <description> Simple use case for string literals </description>
@@ -1703,7 +1701,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-001" covers-40="hex-literals">
+   <test-case name="Literals-40-001" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1713,7 +1711,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-002" covers-40="hex-literals">
+   <test-case name="Literals-40-002" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1723,7 +1721,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-003" covers-40="hex-literals">
+   <test-case name="Literals-40-003" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1733,7 +1731,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-004" covers-40="hex-literals">
+   <test-case name="Literals-40-004" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1743,7 +1741,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-005" covers-40="hex-literals">
+   <test-case name="Literals-40-005" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1753,7 +1751,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-006" covers-40="hex-literals">
+   <test-case name="Literals-40-006" covers-40="PR433">
       <description> hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1763,7 +1761,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-007" covers-40="hex-literals">
+   <test-case name="Literals-40-007" covers-40="PR433">
       <description> hex numeric literals in context </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1773,7 +1771,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-008" covers-40="hex-literals">
+   <test-case name="Literals-40-008" covers-40="PR433">
       <description> long hex numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1786,7 +1784,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-009" covers-40="hex-literals">
+   <test-case name="Literals-40-009" covers-40="PR433">
       <description> long hex numeric literal arithmetic </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1799,7 +1797,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-010" covers-40="hex-literals">
+   <test-case name="Literals-40-010" covers-40="PR433">
       <description> long hex numeric literal arithmetic </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1812,7 +1810,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-011" covers-40="hex-literals binary-literals">
+   <test-case name="Literals-40-011" covers-40="PR433">
       <description>Hex/binary literals in annotation parameter</description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+"/>
@@ -1830,7 +1828,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-020" covers-40="binary-literals">
+   <test-case name="Literals-40-020" covers-40="PR433">
       <description> binary numeric literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1840,7 +1838,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-021" covers-40="binary-literals">
+   <test-case name="Literals-40-021" covers-40="PR433">
       <description> binary numeric literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1850,7 +1848,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-022" covers-40="binary-literals">
+   <test-case name="Literals-40-022" covers-40="PR433">
       <description> long binary numeric literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1863,7 +1861,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-030" covers-40="numeric-underscores">
+   <test-case name="Literals-40-030" covers-40="PR433">
       <description> underscores in integer literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1873,7 +1871,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-031" covers-40="numeric-underscores">
+   <test-case name="Literals-40-031" covers-40="PR433">
       <description> underscores in integer literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1883,7 +1881,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-032" covers-40="numeric-underscores">
+   <test-case name="Literals-40-032" covers-40="PR433">
       <description> underscores in decimal literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1893,7 +1891,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-033" covers-40="numeric-underscores">
+   <test-case name="Literals-40-033" covers-40="PR433">
       <description> invalid integer literal - underscore not allowed here</description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1903,7 +1901,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-034" covers-40="numeric-underscores">
+   <test-case name="Literals-40-034" covers-40="PR433">
       <description> underscores in double literals </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1913,7 +1911,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-035" covers-40="numeric-underscores">
+   <test-case name="Literals-40-035" covers-40="PR433">
       <description> underscores in function references </description>
       <created by="Michael Kay" on="2023-04-28"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1923,7 +1921,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-036" covers-40="numeric-underscores">
+   <test-case name="Literals-40-036" covers-40="PR433">
       <description> underscores in lookup expressions </description>
       <created by="Michael Kay" on="2023-04-28"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1933,7 +1931,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-037" covers-40="numeric-underscores">
+   <test-case name="Literals-40-037" covers-40="PR433">
       <description> underscores in lookup expressions </description>
       <created by="Michael Kay" on="2023-04-28"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1945,7 +1943,7 @@ line2</assert-string-value>
    
 
    
-   <test-case name="Literals-40-901" covers-40="hex-literals">
+   <test-case name="Literals-40-901" covers-40="PR433">
       <description> invalid hex literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1955,7 +1953,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-902" covers-40="hex-literals">
+   <test-case name="Literals-40-902" covers-40="PR433">
       <description> invalid hex literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1965,7 +1963,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-903" covers-40="hex-literals">
+   <test-case name="Literals-40-903" covers-40="PR433">
       <description> invalid hex literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1975,7 +1973,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-904" covers-40="binary-literals">
+   <test-case name="Literals-40-904" covers-40="PR433">
       <description> invalid binary literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1985,7 +1983,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-905" covers-40="numeric-underscores">
+   <test-case name="Literals-40-905" covers-40="PR433">
       <description> invalid decimal literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -1995,7 +1993,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-906" covers-40="numeric-underscores">
+   <test-case name="Literals-40-906" covers-40="PR433">
       <description> invalid float literal </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2005,7 +2003,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-907" covers-40="numeric-underscores">
+   <test-case name="Literals-40-907" covers-40="PR433">
       <description> invalid integer literal</description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2015,7 +2013,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-908" covers-40="hex-literals">
+   <test-case name="Literals-40-908" covers-40="PR433">
       <description> hex literals not allowed in function references </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2025,7 +2023,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-909" covers-40="hex-literals">
+   <test-case name="Literals-40-909" covers-40="PR433">
       <description> hex literals not allowed on rhs of lookup </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2035,7 +2033,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-910" covers-40="hex-literals">
+   <test-case name="Literals-40-910" covers-40="PR433">
       <description> There must be at least one digit </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2045,7 +2043,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-911" covers-40="binary-literals">
+   <test-case name="Literals-40-911" covers-40="PR433">
       <description> There must be at least one digit </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2055,7 +2053,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-912" covers-40="hex-literals">
+   <test-case name="Literals-40-912" covers-40="PR433">
       <description> Misplaced sign </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2065,7 +2063,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-913" covers-40="hex-literals">
+   <test-case name="Literals-40-913" covers-40="PR433">
       <description> Misplaced underscore </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2075,7 +2073,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-914" covers-40="hex-literals">
+   <test-case name="Literals-40-914" covers-40="PR433">
       <description> Misplaced underscore </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2085,7 +2083,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-915" covers-40="binary-literals">
+   <test-case name="Literals-40-915" covers-40="PR433">
       <description> Misplaced underscore </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2095,7 +2093,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-916" covers-40="binary-literals">
+   <test-case name="Literals-40-916" covers-40="PR433">
       <description> Misplaced underscore </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2105,7 +2103,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-917" covers-40="hex-literals">
+   <test-case name="Literals-40-917" covers-40="PR433">
       <description> Hex fractional part </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2115,7 +2113,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-918" covers-40="hex-literals">
+   <test-case name="Literals-40-918" covers-40="PR433">
       <description> Hex fractional part </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2125,7 +2123,7 @@ line2</assert-string-value>
       </result>
    </test-case>
    
-   <test-case name="Literals-40-919" covers-40="hex-literals">
+   <test-case name="Literals-40-919" covers-40="PR433">
       <description> Hex fractional part </description>
       <created by="Michael Kay" on="2023-04-07"/>
       <dependency type="spec" value="XQ40+ XP40+"/>
@@ -2134,4 +2132,44 @@ line2</assert-string-value>
          <error code="XPST0003"/>
       </result>
    </test-case>
+   
+   <test-case name="Literals-40-920" covers-40="PR433">
+      <description> Underscore disallowed before decimal point </description>
+      <created by="Michael Kay" on="2023-04-07"/>
+      <dependency type="spec" value="XQ40+ XP40+"/>
+      <test>0_.001</test>
+      <result>
+         <error code="XPST0003"/>
+      </result>
+   </test-case>
+   
+   <test-case name="Literals-40-921" covers-40="PR433">
+      <description> Underscore disallowed after decimal point </description>
+      <created by="Michael Kay" on="2023-04-07"/>
+      <dependency type="spec" value="XQ40+ XP40+"/>
+      <test>0._001</test>
+      <result>
+         <error code="XPST0003"/>
+      </result>
+   </test-case>
+   
+   <test-case name="Literals-40-922" covers-40="PR433">
+      <description> Underscore disallowed after exponent separator </description>
+      <created by="Michael Kay" on="2023-04-07"/>
+      <dependency type="spec" value="XQ40+ XP40+"/>
+      <test>0.001e_-3</test>
+      <result>
+         <error code="XPST0003"/>
+      </result>
+   </test-case>
+   
+   <test-case name="Literals-40-923" covers-40="PR433">
+      <description> Underscore disallowed before exponent separator </description>
+      <created by="Michael Kay" on="2023-04-07"/>
+      <dependency type="spec" value="XQ40+ XP40+"/>
+      <test>0.001_e-3</test>
+      <result>
+         <error code="XPST0003"/>
+      </result>
+   </test-case>
 </test-set>
diff --git a/prod/Predicate.xml b/prod/Predicate.xml
index 547db8f2..aa60ddc3 100644
--- a/prod/Predicate.xml
+++ b/prod/Predicate.xml
@@ -2207,7 +2207,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-400">
+   <test-case name="predicate-400" covers-40="PR996">
       <description>Predicate in 4.0 can be a sequence of numbers</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2217,7 +2217,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-401">
+   <test-case name="predicate-401" covers-40="PR996">
       <description>Predicate in 4.0 can be a sequence of numbers</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2227,7 +2227,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-402">
+   <test-case name="predicate-402" covers-40="PR996">
       <description>Numbers out of order</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2237,7 +2237,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-403">
+   <test-case name="predicate-403" covers-40="PR996">
       <description>If one item is numeric, all must be numeric</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2247,7 +2247,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-404">
+   <test-case name="predicate-404" covers-40="PR996">
       <description>Negative numbers are allowed and effectively ignored</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2257,7 +2257,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-405">
+   <test-case name="predicate-405" covers-40="PR996">
       <description>Non-integral numbers are allowed and effectively ignored</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2267,7 +2267,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-406">
+   <test-case name="predicate-406" covers-40="PR996">
       <description>Numeric predicate can depend on focus</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2277,7 +2277,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-407">
+   <test-case name="predicate-407" covers-40="PR996">
       <description>Type of predicate not known statically</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2287,7 +2287,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-408">
+   <test-case name="predicate-408" covers-40="PR996">
       <description>Type of predicate not known statically, error case</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2297,7 +2297,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-409">
+   <test-case name="predicate-409" covers-40="PR996">
       <description>Performance hopefully is not quadratic</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2309,7 +2309,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-410">
+   <test-case name="predicate-410" covers-40="PR996">
       <description>Range using variables</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2321,7 +2321,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-411">
+   <test-case name="predicate-411" covers-40="PR996">
       <description>Range using last()</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2333,7 +2333,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
    
-   <test-case name="predicate-412">
+   <test-case name="predicate-412" covers-40="PR996">
       <description>Type of predicate not known statically, and dependent on focus</description>
       <created by="Michael Kay" on="2024-02-03"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2343,7 +2343,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
 
-   <test-case name="predicate-500">
+   <test-case name="predicate-500" covers-40="PR996">
       <description> A predicate starting with a number and ending with a string. </description>
       <created by="Christian Gruen" on="2024-02-08"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2356,7 +2356,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
 
-   <test-case name="predicate-501">
+   <test-case name="predicate-501" covers-40="PR996">
       <description> A predicate starting with a number and ending with a string. </description>
       <created by="Christian Gruen" on="2024-02-08"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2369,7 +2369,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
 
-   <test-case name="predicate-502">
+   <test-case name="predicate-502" covers-40="PR996">
       <description> A predicate starting with a number and ending with a string. </description>
       <created by="Christian Gruen" on="2024-02-08"/>
       <dependency type="spec" value="XP40+ XQ40+"/>
@@ -2382,7 +2382,7 @@ count((-1, 0, 1, 2147483647, 2147483648, 2147483649, 4294967295, 4294967296, 429
       </result>
    </test-case>
 
-   <test-case name="predicate-503">
+   <test-case name="predicate-503" covers-40="PR996">
       <description> A predicate starting with a number and ending with a string. </description>
       <created by="Christian Gruen" on="2024-02-08"/>
       <dependency type="spec" value="XQ40+"/>
diff --git a/prod/RecordTest.xml b/prod/RecordTest.xml
index 64bd2d51..15740d00 100644
--- a/prod/RecordTest.xml
+++ b/prod/RecordTest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="us-ascii"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-RecordTest" covers-40="record-test">
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-RecordTest" covers-40="PR728">
    <description>Tests for RecordTest item type (proposed 4.0 extension)</description>
-   <link type="spec" document="http://www.w3.org/TR/xpath-functions-11/"
-         idref="func-abs"/>
          
    <dependency type="spec" value="XP40+ XQ40+"/>
       
diff --git a/prod/WhileClause.xml b/prod/WhileClause.xml
index 1a5b1a50..1fe5dc90 100644
--- a/prod/WhileClause.xml
+++ b/prod/WhileClause.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="us-ascii"?>
-<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-WhileClause" covers-40="WhileClause">
+<test-set xmlns="http://www.w3.org/2010/09/qt-fots-catalog" name="prod-WhileClause" covers-40="PR943">
    <description>Tests for the WhileClause production in 4.0</description>
-   <link type="spec" document="http://www.w3.org/TR/xquery-40/"
-         idref="doc-xquery30-WhileClause"/>
-   <link type="spec" document="XQuery" section-number="3.8.2" idref="id-while"/>
    
    <environment name="fsx">
       <source role="." file="ForClause/fsx.xml">