diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
index 51f6aa49537..67ea535370e 100644
--- a/.github/workflows/ci-deploy.yml
+++ b/.github/workflows/ci-deploy.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install bats
         run: sudo apt-get install bats    
       - name: Build images
-        run: mvn -V -B -q -Pdocker -DskipTests -Ddependency-check.skip=true clean package
+        run: mvn -V -B -q -Pdocker -DskipTests -Ddependency-check.skip=true -P !mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives clean package
       - name: Check local images
         run: docker image ls
       - name: Check license headers
diff --git a/exist-core/pom.xml b/exist-core/pom.xml
index 7f6ab856668..4c05ba97ae8 100644
--- a/exist-core/pom.xml
+++ b/exist-core/pom.xml
@@ -721,6 +721,10 @@
                                 <exclude>src/main/java/org/exist/xquery/value/SubSequence.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceRangeTest.java</exclude>
                                 <exclude>src/test/java/org/exist/xquery/value/SubSequenceTest.java</exclude>
+                                <exclude>src/test/xquery/type-promotion.xqm</exclude>
+                                <exclude>src/test/xquery/xqsuite/xqsuite-assertions-dynamic.xqm</exclude>
+                                <exclude>src/test/xquery/xqsuite/xqsuite-assertions-inline.xqm</exclude>
+                                <exclude>src/test/xquery/xqsuite/xqsuite-assertions.resources.xqm.ignore</exclude>
 
                                 <!--
                                     Derivative work licensed under dbXML 1.0 and LGPL 2.1
@@ -870,6 +874,10 @@ The original license statement is also included below.]]></preamble>
                                 <include>src/main/java/org/exist/xquery/value/SubSequence.java</include>
                                 <include>src/test/java/org/exist/xquery/value/SubSequenceRangeTest.java</include>
                                 <include>src/test/java/org/exist/xquery/value/SubSequenceTest.java</include>
+                                <include>src/test/xquery/type-promotion.xqm</include>
+                                <include>src/test/xquery/xqsuite/xqsuite-assertions-dynamic.xqm</include>
+                                <include>src/test/xquery/xqsuite/xqsuite-assertions-inline.xqm</include>
+                                <include>src/test/xquery/xqsuite/xqsuite-assertions.resources.xqm.ignore</include>
                             </includes>
 
                         </licenseSet>
diff --git a/exist-core/src/main/java/org/exist/xquery/UntypedValueCheck.java b/exist-core/src/main/java/org/exist/xquery/UntypedValueCheck.java
index 78a25fc589e..f2a04074cf9 100644
--- a/exist-core/src/main/java/org/exist/xquery/UntypedValueCheck.java
+++ b/exist-core/src/main/java/org/exist/xquery/UntypedValueCheck.java
@@ -55,7 +55,7 @@ public UntypedValueCheck(XQueryContext context, int requiredType, Error error) {
 	public UntypedValueCheck(XQueryContext context, int requiredType, final Expression expression, Error error) {
 		super(context);
 		this.requiredType = requiredType;
-        if (expression instanceof Atomize && requiredType != Type.ATOMIC) {
+        if (expression instanceof Atomize && !Type.subTypeOf(requiredType, Type.ATOMIC)) {
             this.expression = ((Atomize)expression).getExpression();
             this.atomize = true;
         } else {
@@ -109,7 +109,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
 	}
 
     private Item convert(Item item) throws XPathException {
-        if (atomize || item.getType() == Type.UNTYPED_ATOMIC || Type.subTypeOfUnion(requiredType, Type.NUMBER) && Type.subTypeOfUnion(item.getType(), Type.NUMBER)) {
+        if (atomize || item.getType() == Type.UNTYPED_ATOMIC || Type.hasMember(Type.NUMBER, requiredType) && Type.subTypeOfUnion(item.getType(), Type.NUMBER)) {
             try {
                 if (Type.subTypeOf(item.getType(), requiredType)) {
                     return item;
diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 4ed72c87154..9779b582dad 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2625,7 +2625,15 @@ private Module importModuleFromLocation(final String namespaceURI, @Nullable fin
             final Source moduleSource;
             try {
                 //TODO: use URIs to ensure proper resolution of relative locations
-                moduleSource = SourceFactory.getSource(getBroker(), moduleLoadPath, location, true);
+                final String contextPath;
+                if (source instanceof FileSource) {
+                    final Path sourcePath = ((FileSource)source).getPath();
+                    contextPath = sourcePath.resolveSibling(moduleLoadPath).normalize().toString();
+                } else {
+                    contextPath = moduleLoadPath;
+                }
+
+                moduleSource = SourceFactory.getSource(getBroker(), contextPath, location, true);
                 if (moduleSource == null) {
                     throw moduleLoadException("Source for module '" + namespaceURI + "' not found module location hint URI '" + location + "'.", location);
                 }
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/inspect/InspectFunctionHelper.java b/exist-core/src/main/java/org/exist/xquery/functions/inspect/InspectFunctionHelper.java
index 8f5fe2b26ab..cc654ef99dc 100644
--- a/exist-core/src/main/java/org/exist/xquery/functions/inspect/InspectFunctionHelper.java
+++ b/exist-core/src/main/java/org/exist/xquery/functions/inspect/InspectFunctionHelper.java
@@ -125,9 +125,9 @@ private static void writeParameters(final FunctionSignature sig, final MemTreeBu
     }
 
     private static void writeAnnotations(final FunctionSignature signature, final MemTreeBuilder builder) throws XPathException {
-        final AttributesImpl attribs = new AttributesImpl();
         final Annotation[] annots = signature.getAnnotations();
         if (annots != null) {
+            final AttributesImpl attribs = new AttributesImpl();
             for (final Annotation annot : annots) {
                 attribs.clear();
                 attribs.addAttribute(null, "name", "name", "CDATA", annot.getName().toString());
@@ -136,7 +136,9 @@ private static void writeAnnotations(final FunctionSignature signature, final Me
                 final LiteralValue[] value = annot.getValue();
                 if (value != null) {
                     for (final LiteralValue literal : value) {
-                        builder.startElement(ANNOTATION_VALUE_QNAME, null);
+                        attribs.clear();
+                        attribs.addAttribute(null, "type", "type", "CDATA", Type.getTypeName(literal.returnsType()));
+                        builder.startElement(ANNOTATION_VALUE_QNAME, attribs);
                         builder.characters(literal.getValue().getStringValue());
                         builder.endElement();
                     }
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/util/IndexKeys.java b/exist-core/src/main/java/org/exist/xquery/functions/util/IndexKeys.java
index 3ae1b267ff6..00e4464dd6e 100644
--- a/exist-core/src/main/java/org/exist/xquery/functions/util/IndexKeys.java
+++ b/exist-core/src/main/java/org/exist/xquery/functions/util/IndexKeys.java
@@ -62,7 +62,7 @@ public class IndexKeys extends BasicFunction {
                 "containing three int values: a) the overall frequency of the key within the node set, " +
                 "b) the number of distinct documents in the node set the key occurs in, " +
                 "c) the current position of the key in the whole list of keys returned."),
-                    new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE, "The maximum number of returned keys")
+                    new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE, "The maximum number of returned keys")
                  },
             new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference")),
     	new FunctionSignature(
@@ -79,7 +79,7 @@ public class IndexKeys extends BasicFunction {
                 "containing three int values: a) the overall frequency of the key within the node set, " +
                 "b) the number of distinct documents in the node set the key occurs in, " +
                 "c) the current position of the key in the whole list of keys returned."),
-                    new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys"),
+                    new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys"),
                     new FunctionParameterSequenceType("index", Type.STRING, Cardinality.EXACTLY_ONE, "The index in which the search is made")
                 },
             new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference")),
@@ -97,7 +97,7 @@ public class IndexKeys extends BasicFunction {
                 "containing three int values: a) the overall frequency of the key within the node set, " +
                 "b) the number of distinct documents in the node set the key occurs in, " +
                 "c) the current position of the key in the whole list of keys returned."),
-                    new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE, "The maximum number of returned keys"),
+                    new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE, "The maximum number of returned keys"),
                     new FunctionParameterSequenceType("index", Type.STRING, Cardinality.EXACTLY_ONE, "The index in which the search is made")
                  },
             new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference")),
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java b/exist-core/src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java
index 81c868d3f4b..66fdb71bbf8 100644
--- a/exist-core/src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java
+++ b/exist-core/src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java
@@ -50,9 +50,9 @@ public class XMLDBGetMimeType extends BasicFunction {
 		new FunctionSignature(
 			new QName("get-mime-type", XMLDBModule.NAMESPACE_URI, XMLDBModule.PREFIX),
 			"Returns the MIME type if available of the resource $resource-uri, otherwise the empty sequence. " +
-            XMLDBModule.ANY_URI,
+					XMLDBModule.ANY_URI,
 			new SequenceType[] {
-                new FunctionParameterSequenceType("resource-uri", Type.ANY_URI, Cardinality.EXACTLY_ONE, "The resource URI")
+                new FunctionParameterSequenceType("resource-uri", Type.STRING, Cardinality.EXACTLY_ONE, "The resource URI")
 			},
 			new FunctionReturnSequenceType(Type.STRING, Cardinality.ZERO_OR_ONE, "the mime-type if available, otherwise the empty sequence")
 		);
diff --git a/exist-core/src/main/java/org/exist/xquery/value/Type.java b/exist-core/src/main/java/org/exist/xquery/value/Type.java
index 23bcb6f2a95..332b3acd3eb 100644
--- a/exist-core/src/main/java/org/exist/xquery/value/Type.java
+++ b/exist-core/src/main/java/org/exist/xquery/value/Type.java
@@ -317,7 +317,7 @@ public class Type {
     }
 
     static {
-        defineUnionType(NUMBER, new int[]{ INTEGER, DECIMAL, FLOAT, DOUBLE });
+        defineUnionType(NUMBER, new int[]{ DECIMAL, FLOAT, DOUBLE });
     }
 
     // https://www.w3.org/TR/xmlschema-2/#built-in-primitive-datatypes
diff --git a/exist-core/src/main/resources/org/exist/xquery/lib/xqsuite/xqsuite.xql b/exist-core/src/main/resources/org/exist/xquery/lib/xqsuite/xqsuite.xql
index 6618265dee1..eeb49ab16ae 100755
--- a/exist-core/src/main/resources/org/exist/xquery/lib/xqsuite/xqsuite.xql
+++ b/exist-core/src/main/resources/org/exist/xquery/lib/xqsuite/xqsuite.xql
@@ -57,6 +57,7 @@ declare variable $test:TEST_NAMESPACE := "http://exist-db.org/xquery/xqsuite";
 declare variable $test:UNKNOWN_ASSERTION := QName($test:TEST_NAMESPACE, "no-such-assertion");
 declare variable $test:WRONG_ARG_COUNT := QName($test:TEST_NAMESPACE, "wrong-number-of-arguments");
 declare variable $test:TYPE_ERROR := QName($test:TEST_NAMESPACE, "type-error");
+declare variable $test:UNKNOWN_ANNOTATION_VALUE_TYPE := QName($test:TEST_NAMESPACE, "unknown-annotation-value-type");
 
 (:~
  : Main entry point into the module. Takes a sequence of function items.
@@ -456,7 +457,7 @@ declare %private function test:get-assertions($meta as element(function), $first
 (:~
  : Collect %test:arg and %test:args for the current run.
  :)
-declare %private function test:get-run-args($firstArg as element(annotation)?) {
+declare %private function test:get-run-args($firstArg as element(annotation)?) as element(annotation)* {
     if ($firstArg) then
         let $nextBlock :=
             $firstArg/following-sibling::annotation[matches(@name, ":args?")]
@@ -481,7 +482,7 @@ declare %private function test:get-run-args($firstArg as element(annotation)?) {
 declare %private function test:call-test($func as function(*), $meta as element(function), $args as element(annotation)*) {
     let $funArgs :=
         if ($args[1]/@name = "test:args") then
-            test:map-arguments($args/value/string(), $meta/argument)
+            test:map-arguments($args/value, $meta/argument)
         else
             test:map-named-arguments($meta/argument, $args)
     return
@@ -511,12 +512,12 @@ declare %private function test:map-named-arguments($funcArgs as element(argument
             $mappedArgs
 };
 
-declare %private function test:map-named-argument($testArgs as element(value)*, $funcArg as element(argument)) {
+declare %private function test:map-named-argument($test-args as element(value)*, $func-arg as element(argument)) {
     let $data :=
         try {
-            test:cast($testArgs, $funcArg)
+            test:cast($test-args, $func-arg)
         } catch * {
-            error($test:TYPE_ERROR, "Failed to cast annotation arguments to required target type " || $funcArg/@type)
+            fn:error($test:TYPE_ERROR, "Failed to cast annotation arguments to required target type " || $func-arg/@type)
         }
     return
         (: If we need to return a sequence of values, enclose them into a closure function :)
@@ -526,47 +527,135 @@ declare %private function test:map-named-argument($testArgs as element(value)*,
 (:~
  : For %args: transform each annotation parameter into the type required for the function parameter.
  :)
-declare %private function test:map-arguments($testArgs as xs:string*, $funcArgs as element(argument)*) {
-    if (exists($testArgs)) then
-        if (count($testArgs) != count($funcArgs)) then
-            error(
+declare %private function test:map-arguments($test-args as element(value)*, $func-args as element(argument)*) {
+    if (fn:not(fn:empty($test-args))) then
+        if (fn:count($test-args) ne fn:count($func-args)) then
+            fn:error(
                 $test:WRONG_ARG_COUNT,
                 "The number of arguments specified in test:args must match the arguments of the function to test"
             )
         else
-            fn:for-each-pair($testArgs, $funcArgs, function($targ as xs:string, $farg as element(argument)) {
-                let $data := test:cast($targ, $farg)
-                return
-                    function() { $data }
+            fn:for-each-pair($test-args, $func-args, function($targ as element(value), $farg as element(argument)) {
+                function() {
+                    test:cast($targ, $farg)
+                }
             })
     else
         ()
 };
 
-declare %private function test:cast($targs as xs:string*, $farg as element(argument)) {
+
+(:~
+ : Convert an annotation value into an XDM value.
+ :
+ : Annotation values can only be one of the following types: xs:string, xs:integer, xs:decimal or xs:double.
+ :
+ : @param $annotation-value the annotation value element as returned by util:inspect-function
+ :
+ : @return the atomic value of the annotation
+ :)
+declare %private function test:xdm-value-from-annotation-value($annotation-value as element(value)) {
+    switch ($annotation-value/string(@type))
+        case "xs:string"
+        return
+            xs:string($annotation-value/text())
+
+        case "xs:integer"
+        return
+            xs:integer($annotation-value/text())
+
+        case "xs:decimal"
+        return
+            xs:decimal($annotation-value/text())
+
+        case "xs:double"
+        return
+            xs:double($annotation-value/text())
+
+        default
+        return
+            fn:error(
+                $test:UNKNOWN_ANNOTATION_VALUE_TYPE,
+                "The annotation value has an unknown type"
+            )
+};
+
+declare %private function test:cast($targs as element(value)*, $farg as element(argument)) {
     for $targ in $targs
+    let $varg := test:xdm-value-from-annotation-value($targ)
     return
         switch (string($farg/@type))
-            case "xs:string" return
-                string($targ)
-            case "xs:integer" case "xs:int" return
-                xs:integer($targ)
-            case "xs:decimal" return
-                xs:decimal($targ)
-            case "xs:float" case "xs:double" return
-                xs:double($targ)
-            case "xs:date" return
-                xs:date($targ)
-            case "xs:dateTime" return
-                xs:dateTime($targ)
-            case "xs:time" return
-                xs:time($targ)
-            case "element()" return
-                parse-xml($targ)/*
-            case "text()" return
-                text { string($targ) }
-            default return
-                $targ
+            case "xs:string"
+            return
+                if ($varg instance of xs:string)
+                then
+                    $varg
+                else
+                    string($varg)
+
+            case "xs:integer"
+            return
+                if ($varg instance of xs:integer)
+                then
+                    $varg
+                else
+                    xs:integer($varg)
+
+            case "xs:int"
+            return
+                xs:int($varg)
+
+            case "xs:decimal"
+            return
+                if ($varg instance of xs:decimal)
+                then
+                    $varg
+                else
+                    xs:decimal($varg)
+
+            case "xs:float"
+            return
+                xs:float($varg)
+
+            case "xs:double"
+            return
+                if ($varg instance of xs:decimal)
+                then
+                    $varg
+                else
+                    xs:double($varg)
+
+            case "xs:date"
+            return
+                xs:date($varg)
+
+            case "xs:dateTimeStamp"
+            return
+                xs:dateTimeStamp($varg)
+
+            case "xs:dateTime"
+            return
+                xs:dateTime($varg)
+
+            case "xs:time"
+            return
+                xs:time($varg)
+
+            case "element()"
+            return
+                fn:parse-xml($varg)/element()
+
+            case "text()"
+            return
+                if ($varg instance of xs:string)
+                then
+                    text { $varg }
+                else
+                    text { xs:string($varg) }
+
+            default
+            return
+                $varg
 };
 
 declare function test:apply($func as function(*), $meta as element(function), $args as item()*) {
@@ -651,9 +740,9 @@ declare %private function test:check-assertions($assertions as element(annotatio
     return
         switch ($assert)
             case "assertEquals" return
-                test:assertEquals($annotation/value/string(), $result)
+                test:assertEquals($annotation/value, $result)
             case "assertEqualsPermutation" return
-                test:assertEqualsPermutation($annotation/value/string(), $result)
+                test:assertEqualsPermutation($annotation/value, $result)
             case "assertEmpty" return
                 test:assertEmpty($result)
             case "assertExists" return
@@ -674,9 +763,9 @@ declare %private function test:check-assertions($assertions as element(annotatio
  : Check for equality of the function's result with the value in the annotation.
  : This function transforms the result to a string before checking for equality.
  :)
-declare %private function test:assertEquals($values as item()*, $result as item()*) as element(report)? {
-    if (exists($values)) then
-        if (count($values) eq count($result)) then
+declare %private function test:assertEquals($values as element(value)*, $result as item()*) as element(report)? {
+    if (fn:exists($values)) then
+        if (fn:count($values) eq fn:count($result)) then
             let $tests := fn:for-each-pair($values, $result, test:equals#2)
             let $equal := every $test in $tests satisfies $test
             return
@@ -686,15 +775,15 @@ declare %private function test:assertEquals($values as item()*, $result as item(
                    <report>
                         <failure message="assertEquals failed."
                             type="failure-error-code-1">
-                        { $values }
+                        { $values ! test:xdm-value-from-annotation-value(.) }
                         </failure>
                         <output>{ $result }</output>
                     </report>
         else
             <report>
-                <failure message="assertEquals failed: wrong number of items returned by function. Expected: {count($values)}. Got: {count($result)}"
+                <failure message="assertEquals failed: wrong number of items returned by function. Expected: {fn:count($values)}. Got: {fn:count($result)}"
                     type="failure-error-code-1">
-                { $values }
+                { $values ! test:xdm-value-from-annotation-value(.) }
                 </failure>
                 <output>{ $result }</output>
             </report>
@@ -706,13 +795,13 @@ declare %private function test:assertEquals($values as item()*, $result as item(
  : Check for equality of the function's result with the value in the annotation.
  : This function transforms the result to a string before checking for equality.
  :)
-declare %private function test:assertEqualsPermutation($values as item()*, $result as item()*) as element(report)? {
-    if (exists($values)) then
-        if (count($values) eq count($result)) then
+declare %private function test:assertEqualsPermutation($values as element(value)*, $result as item()*) as element(report)? {
+    if (fn:exists($values)) then
+        if (fn:count($values) eq fn:count($result)) then
             let $tests :=
                 for $item in $result
                 return
-                    some $value in $values satisfies test:equals($item, $value)
+                    some $value in $values satisfies test:equals($value, $item)
             let $equal := every $test in $tests satisfies $test
             return
                 if ($equal) then
@@ -721,15 +810,15 @@ declare %private function test:assertEqualsPermutation($values as item()*, $resu
                    <report>
                         <failure message="assertEqualsPermutation failed."
                             type="failure-error-code-1">
-                        { $values }
+                        { $values ! test:xdm-value-from-annotation-value(.) }
                         </failure>
                         <output>{ $result }</output>
                     </report>
         else
             <report>
-                <failure message="assertEqualsPermutation failed: wrong number of items returned by function. Expected: {count($values)}. Got: {count($result)}"
+                <failure message="assertEqualsPermutation failed: wrong number of items returned by function. Expected: {fn:count($values)}. Got: {fn:count($result)}"
                     type="failure-error-code-1">
-                { $values }
+                { $values ! test:xdm-value-from-annotation-value(.) }
                 </failure>
                 <output>{ $result }</output>
             </report>
@@ -737,13 +826,14 @@ declare %private function test:assertEqualsPermutation($values as item()*, $resu
         ()
 };
 
-declare %private function test:equals($value as item(), $result as item()) as xs:boolean {
+declare %private function test:equals($annotation-value as element(value), $result as item()) as xs:boolean {
     let $normResult :=
         typeswitch ($result)
             case node() return
                 test:normalize($result)
             default return
                 $result
+    let $value := test:xdm-value-from-annotation-value($annotation-value)
     let $normValue := test:cast-to-type($value, $result)
     return
         typeswitch ($normResult)
diff --git a/exist-core/src/test/xquery/arrays/arrays.xql b/exist-core/src/test/xquery/arrays/arrays.xql
index b85f43cb9b7..067c649c146 100644
--- a/exist-core/src/test/xquery/arrays/arrays.xql
+++ b/exist-core/src/test/xquery/arrays/arrays.xql
@@ -45,9 +45,9 @@ declare variable $arr:SERIALIZE_JSON_INDENT :=
 declare variable $arr:COLLECTION_CONF :=
     <collection xmlns="http://exist-db.org/collection-config/1.0">
         <index xmlns:xs="http://www.w3.org/2001/XMLSchema">
-            <create qname="a" type="xs:int"/>
+            <create qname="a" type="xs:integer"/>
             <range>
-                <create qname="b" type="xs:int"/>
+                <create qname="b" type="xs:integer"/>
             </range>
         </index>
     </collection>;
@@ -85,7 +85,7 @@ declare
     %test:assertEquals(13)
     %test:args(3)
     %test:assertEquals(14)
-function arr:function-item($pos as xs:int) {
+function arr:function-item($pos as xs:integer) {
     [13, 10, 14]($pos)
 };
 
@@ -94,7 +94,7 @@ declare
     %test:assertEquals(13)
     %test:args(3)
     %test:assertEquals(14)
-function arr:function-item2($pos as xs:int) {
+function arr:function-item2($pos as xs:integer) {
     let $a := [13, 10, 14]
     return
         $a($pos)
@@ -105,9 +105,9 @@ declare
     %test:assertEquals(13)
     %test:args(3)
     %test:assertEquals(14)
-function arr:function-item3($pos as xs:int) {
+function arr:function-item3($pos as xs:integer) {
     let $a := [13, 10, 14]
-    let $f := function($array as function(*), $position as xs:int) {
+    let $f := function($array as function(*), $position as xs:integer) {
         $array($position)
     }
     return
@@ -192,7 +192,7 @@ declare
     %test:assertEmpty
     %test:args(2)
     %test:assertEquals(27, 17, 0)
-function arr:square-constructor1($pos as xs:int) {
+function arr:square-constructor1($pos as xs:integer) {
     let $a := [(), (27, 17, 0)]
     return $a($pos)
 };
@@ -202,7 +202,7 @@ declare
     %test:assertEquals("<p>test</p>")
     %test:args(2)
     %test:assertEquals(55)
-function arr:square-constructor2($pos as xs:int) {
+function arr:square-constructor2($pos as xs:integer) {
     let $a := [<p>test</p>, 55]
     return $a($pos)
 };
@@ -219,7 +219,7 @@ declare
     %test:assertEquals(27)
     %test:args(2)
     %test:assertEquals(17)
-function arr:curly-constructor1($pos as xs:int) {
+function arr:curly-constructor1($pos as xs:integer) {
     let $x := (27, 17, 0)
     let $a := array { $x }
     return $a($pos)
@@ -230,7 +230,7 @@ declare
     %test:assertEquals(27)
     %test:args(2)
     %test:assertEquals(17)
-function arr:curly-constructor2($pos as xs:int) {
+function arr:curly-constructor2($pos as xs:integer) {
     let $a := array { (), (27, 17, 0) }
     return $a($pos)
 };
@@ -359,7 +359,7 @@ declare
     %test:assertEquals("b", "c", "d")
     %test:args(5)
     %test:assertEmpty
-function arr:subarray1($start as xs:int) {
+function arr:subarray1($start as xs:integer) {
     let $a := array:subarray(["a", "b", "c", "d"], $start)
     return
         $a?*
@@ -384,7 +384,7 @@ declare
     %test:assertError("FOAY0001")
     %test:args(1, "-1")
     %test:assertError("FOAY0002")
-function arr:subarray2($start as xs:int, $length as xs:int) {
+function arr:subarray2($start as xs:integer, $length as xs:integer) {
     let $a := array:subarray(["a", "b", "c", "d"], $start, $length)
     return
         $a?*
@@ -401,7 +401,7 @@ declare
     %test:assertError("FOAY0001")
     %test:args(5)
     %test:assertError("FOAY0001")
-function arr:remove1($pos as xs:int) {
+function arr:remove1($pos as xs:integer) {
     array:remove(["a", "b", "c", "d"], $pos)?*
 };
 
@@ -656,7 +656,7 @@ function arr:array-type1() {
 declare
     %test:assertEquals("<t>test</t>")
 function arr:apply-inline() {
-    let $fn := function($a as xs:string, $b as xs:int, $c as element()) {
+    let $fn := function($a as xs:string, $b as xs:integer, $c as element()) {
         $c
     }
     return
@@ -858,7 +858,7 @@ declare
     %test:assertTrue
     %test:args(7)
     %test:assertFalse
-function arr:general-comparison1($val as xs:int) {
+function arr:general-comparison1($val as xs:integer) {
     [1, 2, 3, [5, 6]] = $val
 };
 
@@ -1018,7 +1018,7 @@ function arr:put_pos_zero() {
 };
 
 declare
-    %test:assertError("err:FORG0006")
+    %test:assertError("err:XPTY0004")
 function arr:put_pos_double() {
     array:put(["a", "b", "c", "d"], 1.5, "x")?*
 };
diff --git a/exist-core/src/test/xquery/integers.xq b/exist-core/src/test/xquery/integers.xq
index 2fc3360789e..3f128840e2f 100644
--- a/exist-core/src/test/xquery/integers.xq
+++ b/exist-core/src/test/xquery/integers.xq
@@ -48,9 +48,9 @@ function it:function-signature-negative-integer-from-string($test-value as xs:st
 
 declare
     %test:args(0)
-    %test:assertError("err:FORG0001")
+    %test:assertError("err:XPTY0004")
     %test:args(1)
-    %test:assertError("err:FORG0001")
+    %test:assertError("err:XPTY0004")
 function it:function-signature-negative-integer-from-integer($test-value as xs:integer) {
     function($negative-integer as xs:negativeInteger) {
         $negative-integer
@@ -72,9 +72,9 @@ function it:function-signature-positive-integer-from-string($test-value as xs:st
 
 declare
     %test:args(0)
-    %test:assertError("err:FORG0001")
+    %test:assertError("err:XPTY0004")
     %test:args(1)
-    %test:assertError("err:FORG0001")
+    %test:assertError("err:XPTY0004")
 function it:function-signature-positive-integer-from-integer($test-value as xs:integer) {
     function($positive-integer as xs:positiveInteger) {
         $positive-integer
diff --git a/exist-core/src/test/xquery/numbers/format-numbers.xql b/exist-core/src/test/xquery/numbers/format-numbers.xql
index aaca539763a..68a83792d3a 100644
--- a/exist-core/src/test/xquery/numbers/format-numbers.xql
+++ b/exist-core/src/test/xquery/numbers/format-numbers.xql
@@ -251,10 +251,10 @@ function fd:grouping-fraction($number as xs:double, $picture) {
 };
 
 declare
-    %test:args("12345.6")
+    %test:args(12345.6)
     %test:args("#,###.##")
     %test:assertEquals("12,345.6")
-function fd:simple-number-1($number as numeric, $picture) {
+function fd:simple-number-1($number as xs:numeric, $picture) {
     format-number($number, $picture)
 };
 
@@ -262,7 +262,7 @@ declare
     %test:args(87504.4812)
     %test:args("000,000.000000")
     %test:assertEquals("087,504.481200")
-function fd:simple-number-2($number, $picture) {
+function fd:simple-number-2($number as xs:numeric, $picture) {
     format-number($number, $picture)
 };
 
@@ -270,7 +270,7 @@ declare
     %test:args(12345.6)
     %test:args("#.###,##")
     %test:assertEquals("12345.6")
-function fd:simple-number-3($number as numeric, $picture) {
+function fd:simple-number-3($number as xs:numeric, $picture) {
     format-number($number, $picture)
 };
 
diff --git a/exist-core/src/test/xquery/optimizer/optimizer.xql b/exist-core/src/test/xquery/optimizer/optimizer.xql
index 33dd30da386..c7b75c0f8cf 100755
--- a/exist-core/src/test/xquery/optimizer/optimizer.xql
+++ b/exist-core/src/test/xquery/optimizer/optimizer.xql
@@ -353,7 +353,7 @@ declare
     %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 0]")
     %test:args(3, "Rudi Rüssel")
     %test:assertXPath("$result//stats:index[@type = 'range'][@optimization = 2]")
-function ot:optimize-switch($case as xs:int, $name as xs:string) {
+function ot:optimize-switch($case as xs:integer, $name as xs:string) {
     switch($case)
         case 1 return
             collection($ot:COLLECTION)//address[name = $name]/city/text()
diff --git a/exist-core/src/test/xquery/optimizer/positional.xql b/exist-core/src/test/xquery/optimizer/positional.xql
index cdbf2428384..67734efe6a4 100644
--- a/exist-core/src/test/xquery/optimizer/positional.xql
+++ b/exist-core/src/test/xquery/optimizer/positional.xql
@@ -76,7 +76,7 @@ declare variable $ot:SIBLINGS :=
         </test>
     };
 
-declare function ot:generate-words($count as xs:int) {
+declare function ot:generate-words($count as xs:integer) {
     for $i in (1 to $count) return <w xml:id="{$i}">{$i}</w>
 };
 
diff --git a/exist-core/src/test/xquery/type-promotion.xqm b/exist-core/src/test/xquery/type-promotion.xqm
new file mode 100644
index 00000000000..c5cb6b0630d
--- /dev/null
+++ b/exist-core/src/test/xquery/type-promotion.xqm
@@ -0,0 +1,54 @@
+(:
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This file was originally ported from FusionDB to eXist-db by
+ : Evolved Binary, for the benefit of the eXist-db Open Source community.
+ : Only the ported code as it appears in this file, at the time that
+ : it was contributed to eXist-db, was re-licensed under The GNU
+ : Lesser General Public License v2.1 only for use in eXist-db.
+ :
+ : This license grant applies only to a snapshot of the code as it
+ : appeared when ported, it does not offer or infer any rights to either
+ : updates of this source code or access to the original source code.
+ :
+ : The GNU Lesser General Public License v2.1 only license follows.
+ :
+ : ---------------------------------------------------------------------
+ :
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+xquery version "3.1";
+
+(:~
+ : Tests for Type Promotion.
+ :
+ : @author Adam Retter
+ :)
+module namespace tpt = "http://exist-db.org/xquery/test/type-promotion";
+
+declare namespace test = "http://exist-db.org/xquery/xqsuite";
+
+declare
+    %test:assertError("err:XPTY0004")
+function tpt:fn-decimal-to-integer() {
+  tpt:f-int-1(1.5)
+};
+
+declare
+    %private
+function tpt:f-int-1($int as xs:integer) as xs:integer {
+  $int
+};
diff --git a/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-dynamic.xqm b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-dynamic.xqm
new file mode 100644
index 00000000000..b1bf358e0fe
--- /dev/null
+++ b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-dynamic.xqm
@@ -0,0 +1,234 @@
+(:
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This file was originally ported from FusionDB to eXist-db by
+ : Evolved Binary, for the benefit of the eXist-db Open Source community.
+ : Only the ported code as it appears in this file, at the time that
+ : it was contributed to eXist-db, was re-licensed under The GNU
+ : Lesser General Public License v2.1 only for use in eXist-db.
+ :
+ : This license grant applies only to a snapshot of the code as it
+ : appeared when ported, it does not offer or infer any rights to either
+ : updates of this source code or access to the original source code.
+ :
+ : The GNU Lesser General Public License v2.1 only license follows.
+ :
+ : ---------------------------------------------------------------------
+ :
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+xquery version "3.1";
+
+(:~
+ : Dynamic Tests for XQSuite assertions.
+ :
+ : @author Adam Retter
+ :)
+module namespace xqtad = "http://exist-db.org/xquery/xqsuite/test/assertions-dynamic";
+
+(:~
+ : Resource functions to test through XQSuite.
+ :)
+declare namespace xqtares = "http://exist-db.org/xquery/xqsuite/test/assertions/resources";
+
+import module namespace test = "http://exist-db.org/xquery/xqsuite"
+    at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+
+declare
+    %private
+function xqtad:get-resource-function($name as xs:string, $arity as xs:integer) as function() as item()* {
+  let $resource-functions :=
+      fn:load-xquery-module(
+          "http://exist-db.org/xquery/xqsuite/test/assertions/resources",
+          map {
+            "location-hints": "xqsuite-assertions.resources.xqm.ignore"
+          }
+      )?functions
+  let $resource-function := $resource-functions(xs:QName("xqtares:" || $name))($arity)
+  return
+    $resource-function
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtad:test-assertTrue-assertion-when-true() {
+  let $fn-to-test := xqtad:get-resource-function("assertTrue-assertion-when-true", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertTrue-assertion-when-false() {
+  let $fn-to-test := xqtad:get-resource-function("assertTrue-assertion-when-false", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 1, 0)
+function xqtad:test-assertTrue-assertion-when-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertTrue-assertion-when-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertFalse-assertion-when-true() {
+  let $fn-to-test := xqtad:get-resource-function("assertFalse-assertion-when-true", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtad:test-assertFalse-assertion-when-false() {
+  let $fn-to-test := xqtad:get-resource-function("assertFalse-assertion-when-false", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 1, 0)
+function xqtad:test-assertFalse-assertion-when-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertFalse-assertion-when-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtad:test-assertError-assertion-when-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-unexpected-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-unexpected-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtad:test-assertError-assertion-when-expected-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-expected-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-different-error() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-different-error", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-true() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-true", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-false() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-false", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-empty() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-empty", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-non-empty() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-non-empty", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-element() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-element", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-string() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-string", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtad:test-assertError-assertion-when-integer() {
+  let $fn-to-test := xqtad:get-resource-function("assertError-assertion-when-integer", 0)
+  return
+    let $testsuite-result as element(testsuite) := test:suite($fn-to-test)/testsuite
+    return
+        $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
diff --git a/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-inline.xqm b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-inline.xqm
new file mode 100644
index 00000000000..c6d18fb0e91
--- /dev/null
+++ b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions-inline.xqm
@@ -0,0 +1,185 @@
+(:
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This file was originally ported from FusionDB to eXist-db by
+ : Evolved Binary, for the benefit of the eXist-db Open Source community.
+ : Only the ported code as it appears in this file, at the time that
+ : it was contributed to eXist-db, was re-licensed under The GNU
+ : Lesser General Public License v2.1 only for use in eXist-db.
+ :
+ : This license grant applies only to a snapshot of the code as it
+ : appeared when ported, it does not offer or infer any rights to either
+ : updates of this source code or access to the original source code.
+ :
+ : The GNU Lesser General Public License v2.1 only license follows.
+ :
+ : ---------------------------------------------------------------------
+ :
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+xquery version "3.1";
+
+(:~
+ : Inline Tests for XQSuite assertions.
+ :
+ : @author Adam Retter
+ :)
+module namespace xqtai = "http://exist-db.org/xquery/xqsuite/test/assertions-inline";
+
+(:~
+ : Resource functions to test through XQSuite.
+ :)
+import module namespace xqtares = "http://exist-db.org/xquery/xqsuite/test/assertions/resources"
+    at "xqsuite-assertions.resources.xqm.ignore";
+
+import module namespace test = "http://exist-db.org/xquery/xqsuite"
+    at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtai:test-assertTrue-assertion-when-true() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertTrue-assertion-when-true#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertTrue-assertion-when-false() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertTrue-assertion-when-false#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 1, 0)
+function xqtai:test-assertTrue-assertion-when-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertTrue-assertion-when-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertFalse-assertion-when-true() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertFalse-assertion-when-true#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtai:test-assertFalse-assertion-when-false() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertFalse-assertion-when-false#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 1, 0)
+function xqtai:test-assertFalse-assertion-when-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertFalse-assertion-when-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtai:test-assertError-assertion-when-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-unexpected-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-unexpected-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 0, 0, 0)
+function xqtai:test-assertError-assertion-when-expected-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-expected-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-different-error() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-different-error#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-true() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-true#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-false() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-false#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-empty() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-empty#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-non-empty() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-non-empty#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-element() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-element#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-string() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-string#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
+
+declare
+    %test:assertEquals(1, 1, 0, 0)
+function xqtai:test-assertError-assertion-when-integer() {
+  let $testsuite-result as element(testsuite) := test:suite(xqtares:assertError-assertion-when-integer#0)/testsuite
+  return
+      $testsuite-result/(@tests|@failures|@errors|@pending)/xs:integer(.)
+};
diff --git a/exist-core/src/test/xquery/xqsuite/xqsuite-assertions.resources.xqm.ignore b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions.resources.xqm.ignore
new file mode 100644
index 00000000000..6d008d64fa1
--- /dev/null
+++ b/exist-core/src/test/xquery/xqsuite/xqsuite-assertions.resources.xqm.ignore
@@ -0,0 +1,146 @@
+(:
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This file was originally ported from FusionDB to eXist-db by
+ : Evolved Binary, for the benefit of the eXist-db Open Source community.
+ : Only the ported code as it appears in this file, at the time that
+ : it was contributed to eXist-db, was re-licensed under The GNU
+ : Lesser General Public License v2.1 only for use in eXist-db.
+ :
+ : This license grant applies only to a snapshot of the code as it
+ : appeared when ported, it does not offer or infer any rights to either
+ : updates of this source code or access to the original source code.
+ :
+ : The GNU Lesser General Public License v2.1 only license follows.
+ :
+ : ---------------------------------------------------------------------
+ :
+ : Copyright (C) 2014, Evolved Binary Ltd
+ :
+ : This library is free software; you can redistribute it and/or
+ : modify it under the terms of the GNU Lesser General Public
+ : License as published by the Free Software Foundation; version 2.1.
+ :
+ : This library is distributed in the hope that it will be useful,
+ : but WITHOUT ANY WARRANTY; without even the implied warranty of
+ : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ : Lesser General Public License for more details.
+ :
+ : You should have received a copy of the GNU Lesser General Public
+ : License along with this library; if not, write to the Free Software
+ : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ :)
+xquery version "3.1";
+
+(:~
+ : Resource functions for testing XQSuite assertions.
+ : These are utilised from: xqsuite-assertions-inline.xqm,
+ : and xqsuite-assertions-dynamic.xqm.
+ :
+ : @author Adam Retter
+ :)
+module namespace xqtares = "http://exist-db.org/xquery/xqsuite/test/assertions/resources";
+
+declare namespace test = "http://exist-db.org/xquery/xqsuite";
+
+declare
+    %test:assertTrue
+function xqtares:assertTrue-assertion-when-true() {
+    fn:true()
+};
+
+declare
+    %test:assertTrue
+function xqtares:assertTrue-assertion-when-false() {
+    fn:false()
+};
+
+declare
+    %test:assertTrue
+function xqtares:assertTrue-assertion-when-error() {
+    fn:error(xs:QName("xqtares:error1"))
+};
+
+declare
+    %test:assertFalse
+function xqtares:assertFalse-assertion-when-true() {
+    fn:true()
+};
+
+declare
+    %test:assertFalse
+function xqtares:assertFalse-assertion-when-false() {
+    fn:false()
+};
+
+declare
+    %test:assertFalse
+function xqtares:assertFalse-assertion-when-error() {
+    fn:error(xs:QName("xqtares:error1"))
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-error() {
+    fn:error(xs:QName("xqtares:error1"))
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-unexpected-error() {
+    fn:error(xs:QName("xqtares:error2"))
+};
+
+declare
+    %test:assertError("err:XPTY0004")
+function xqtares:assertError-assertion-when-expected-error() {
+    array:put(["a", "b", "c", "d"], 1.5, "x")?*
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-different-error() {
+    array:put(["a", "b", "c", "d"], 1.5, "x")?*
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-true() {
+    fn:true()
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-false() {
+    fn:false()
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-empty() {
+    ()
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-non-empty() {
+    (<non-error/>, "non-error", 123)
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-element() {
+    <non-error/>
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-string() {
+    "non-error"
+};
+
+declare
+    %test:assertError("xqtares:error1")
+function xqtares:assertError-assertion-when-integer() {
+    xs:integer(123)
+};
diff --git a/exist-core/src/test/xquery/xquery3/parseIetfDate.xqm b/exist-core/src/test/xquery/xquery3/parseIetfDate.xqm
index 35e75dfde80..20be2097374 100644
--- a/exist-core/src/test/xquery/xquery3/parseIetfDate.xqm
+++ b/exist-core/src/test/xquery/xquery3/parseIetfDate.xqm
@@ -51,8 +51,10 @@ declare
     %test:args('') %test:assertError("FORG0010")
     %test:args('asdfa') %test:assertError("FORG0010")
 
-    %test:args(0) %test:assertError("FORG0010")
-    %test:args(1) %test:assertError("FORG0010")
+    %test:args(0) %test:assertError("XPTY0004")
+    %test:args(1) %test:assertError("XPTY0004")
+    %test:args('0') %test:assertError("FORG0010")
+    %test:args('1') %test:assertError("FORG0010")
 
     %test:args('-1') %test:assertError("FORG0010")
     %test:args('Tue, 30 Feb 2019 13:10:56 GMT') %test:assertError("FORG0010")
diff --git a/exist-core/src/test/xquery/xquery3/serialize.xql b/exist-core/src/test/xquery/xquery3/serialize.xql
index c3d4a26c22d..cea85ce4a88 100644
--- a/exist-core/src/test/xquery/xquery3/serialize.xql
+++ b/exist-core/src/test/xquery/xquery3/serialize.xql
@@ -234,7 +234,7 @@ function ser:serialize-empty-sequence() {
 
 declare
     %test:args(1234)
-    %test:assertEquals('"1234"')
+    %test:assertEquals(1234)
     %test:args('Hello "world"!')
     %test:assertEquals('"Hello ""world""!"')
 function ser:adaptive-simple-atomic($atomic as xs:anyAtomicType) {
@@ -243,7 +243,7 @@ function ser:adaptive-simple-atomic($atomic as xs:anyAtomicType) {
 
 declare
     %test:args(1234)
-    %test:assertEquals('"1234"')
+    %test:assertEquals(1234)
     %test:args('Hello "world"!')
     %test:assertEquals('"Hello ""world""!"')
 function ser:adaptive-simple-atomic-map-params($atomic as xs:anyAtomicType) {
diff --git a/extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/LuceneIndexKeys.java b/extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/LuceneIndexKeys.java
index a80500407b2..52c743babc6 100644
--- a/extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/LuceneIndexKeys.java
+++ b/extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/LuceneIndexKeys.java
@@ -50,7 +50,7 @@ public class LuceneIndexKeys extends BasicFunction {
                                     "containing three int values: a) the overall frequency of the key within the node set, " +
                                     "b) the number of distinct documents in the node set the key occurs in, " +
                                     "c) the current position of the key in the whole list of keys returned."),
-                            new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE, "The maximum number of keys to return")
+                            new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE, "The maximum number of keys to return")
                     },
                     new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference"))
     };
diff --git a/extensions/indexes/range/src/main/java/org/exist/xquery/modules/range/IndexKeys.java b/extensions/indexes/range/src/main/java/org/exist/xquery/modules/range/IndexKeys.java
index 8d3c03a3920..005920464ae 100644
--- a/extensions/indexes/range/src/main/java/org/exist/xquery/modules/range/IndexKeys.java
+++ b/extensions/indexes/range/src/main/java/org/exist/xquery/modules/range/IndexKeys.java
@@ -42,7 +42,7 @@ public class IndexKeys extends BasicFunction {
                         "containing three int values: a) the overall frequency of the key within the node set, " +
                         "b) the number of distinct documents in the node set the key occurs in, " +
                         "c) the current position of the key in the whole list of keys returned."),
-                new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys")
+                new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys")
             },
             new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference")),
         new FunctionSignature(
@@ -58,7 +58,7 @@ public class IndexKeys extends BasicFunction {
                                 "containing three int values: a) the overall frequency of the key within the node set, " +
                                 "b) the number of distinct documents in the node set the key occurs in, " +
                                 "c) the current position of the key in the whole list of keys returned."),
-                        new FunctionParameterSequenceType("max-number-returned", Type.INT, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys")
+                        new FunctionParameterSequenceType("max-number-returned", Type.INTEGER, Cardinality.ZERO_OR_ONE , "The maximum number of returned keys")
                 },
                 new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE, "the results of the eval of the $function-reference"))
     };
diff --git a/extensions/indexes/range/src/test/xquery/range/conditions.xql b/extensions/indexes/range/src/test/xquery/range/conditions.xql
index bed3116e3aa..1b60aae239a 100644
--- a/extensions/indexes/range/src/test/xquery/range/conditions.xql
+++ b/extensions/indexes/range/src/test/xquery/range/conditions.xql
@@ -25,7 +25,7 @@ xquery version "3.1";
  : Test conditions for complex range configuration elements.
  :
  :)
-module namespace ct="http://exist-db.org/xquery/range/conditions/test";
+module namespace ct="http://exist-db.org/xquery/range/test/conditions";
 
 import module namespace range="http://exist-db.org/xquery/range" at "java:org.exist.xquery.modules.range.RangeIndexModule";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
diff --git a/extensions/indexes/range/src/test/xquery/range/field-type.xql b/extensions/indexes/range/src/test/xquery/range/field-type.xql
index 01570a8b038..05a6902dc86 100644
--- a/extensions/indexes/range/src/test/xquery/range/field-type.xql
+++ b/extensions/indexes/range/src/test/xquery/range/field-type.xql
@@ -21,7 +21,7 @@
  :)
 xquery version "3.1";
 
-module namespace rt="http://exist-db.org/xquery/range/combined-range-function-signature/test";
+module namespace rt="http://exist-db.org/xquery/range/test/combined-range-function-signature";
 
 declare namespace test="http://exist-db.org/xquery/xqsuite";
 
diff --git a/extensions/indexes/range/src/test/xquery/range/optimizer.xql b/extensions/indexes/range/src/test/xquery/range/optimizer.xql
index b95dd5f0923..cac8d3c8984 100644
--- a/extensions/indexes/range/src/test/xquery/range/optimizer.xql
+++ b/extensions/indexes/range/src/test/xquery/range/optimizer.xql
@@ -27,7 +27,7 @@ xquery version "3.0";
  : Expressions use the @test:stats annotation to retrieve execution statistics
  : for each test function. All comparisons should be fully optimized.
  :)
-module namespace ot="http://exist-db.org/xquery/range/optimizer/test";
+module namespace ot="http://exist-db.org/xquery/range/test/optimizer";
 
 import module namespace range="http://exist-db.org/xquery/range" at "java:org.exist.xquery.modules.range.RangeIndexModule";
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
diff --git a/extensions/indexes/range/src/test/xquery/range/types.xql b/extensions/indexes/range/src/test/xquery/range/types.xql
index a6b4574b389..2ece6bc2de8 100644
--- a/extensions/indexes/range/src/test/xquery/range/types.xql
+++ b/extensions/indexes/range/src/test/xquery/range/types.xql
@@ -21,7 +21,7 @@
  :)
 xquery version "3.0";
 
-module namespace tt="http://exist-db.org/xquery/range/types/test";
+module namespace tt="http://exist-db.org/xquery/range/test/types";
 
 import module namespace test="http://exist-db.org/xquery/xqsuite" at "resource:org/exist/xquery/lib/xqsuite/xqsuite.xql";
 
diff --git a/extensions/modules/cache/src/test/xquery/modules/cache/cache.xqm b/extensions/modules/cache/src/test/xquery/modules/cache/cache.xqm
index 248438f99c1..fcb1340300b 100644
--- a/extensions/modules/cache/src/test/xquery/modules/cache/cache.xqm
+++ b/extensions/modules/cache/src/test/xquery/modules/cache/cache.xqm
@@ -164,7 +164,7 @@ function c:exercise-expireAfterAccess() {
             c:_destroy(),
             c:_create-expireAfterAccess(),
             c:_populate(5),
-            util:wait($c:expireAfterAccess * 1.1),
+            util:wait(xs:integer(fn:ceiling($c:expireAfterAccess * 1.1))),
             c:_cleanup()
         )
     return
diff --git a/extensions/modules/expathrepo/expathrepo-trigger-test/src/test/java/org/exist/repo/ExampleModuleTest.java b/extensions/modules/expathrepo/expathrepo-trigger-test/src/test/java/org/exist/repo/ExampleModuleTest.java
index 878142db41c..56c7b17a843 100644
--- a/extensions/modules/expathrepo/expathrepo-trigger-test/src/test/java/org/exist/repo/ExampleModuleTest.java
+++ b/extensions/modules/expathrepo/expathrepo-trigger-test/src/test/java/org/exist/repo/ExampleModuleTest.java
@@ -114,7 +114,7 @@ public void sayHello_noName() throws XPathException, PermissionDeniedException,
     public void add() throws XPathException, PermissionDeniedException, EXistException {
         final String query =
                 "declare namespace myjmod = \"https://my-organisation.com/exist-db/ns/app/my-java-module\";\n" +
-                        "myjmod:add(123, 456)";
+                        "myjmod:add(xs:int(123), xs:int(456))";
         final Sequence result = executeQuery(query);
 
         assertTrue(result.hasOne());
diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailFolderFunctions.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailFolderFunctions.java
index 99a743366db..d85f05ba947 100644
--- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailFolderFunctions.java
+++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailFolderFunctions.java
@@ -63,7 +63,7 @@ public class MailFolderFunctions extends BasicFunction
 			"Opens a mail folder.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-store-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The mail store handle retrieved from mail:get-mail-store()" ),
+				new FunctionParameterSequenceType( "mail-store-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The mail store handle retrieved from mail:get-mail-store()" ),
 				new FunctionParameterSequenceType( "foldername", Type.STRING, Cardinality.EXACTLY_ONE, "The name of the folder to open" )
 			},
 			new FunctionReturnSequenceType( Type.LONG, Cardinality.ZERO_OR_ONE, "an xs:long representing the folder handle." )
@@ -74,7 +74,7 @@ public class MailFolderFunctions extends BasicFunction
 			"Closes a mail folder.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-folder-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" ),
+				new FunctionParameterSequenceType( "mail-folder-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" ),
 				new FunctionParameterSequenceType( "expunge", Type.BOOLEAN, Cardinality.EXACTLY_ONE, "A boolean that specifies whether to expunge the folder on close." )
 			},
 			new SequenceType( Type.ITEM, Cardinality.EMPTY_SEQUENCE )
@@ -128,7 +128,7 @@ private Sequence getMailFolder( Sequence[] args, Sequence contextSequence ) thro
 		
 		// save the folder and return the handle of the folder
 			
-		return( new IntegerValue( this, MailModule.storeFolder( context, folder ) ) );
+		return( new IntegerValue( this, MailModule.storeFolder( context, folder ), Type.LONG ) );
 	}
 	
 	private Sequence closeMailFolder( Sequence[] args, Sequence contextSequence ) throws XPathException
diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java
index d342422c9da..a92ee0b264b 100644
--- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java
+++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailSessionFunctions.java
@@ -90,6 +90,6 @@ public Sequence eval( Sequence[] args, Sequence contextSequence ) throws XPathEx
 		
 		// store the session and return the handle of the session
 
-        return new IntegerValue( this, MailModule.storeSession( context, session ) );
+        return new IntegerValue( this, MailModule.storeSession( context, session ), Type.LONG );
 	}
 }
diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailStoreFunctions.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailStoreFunctions.java
index 720101e9b53..5993b1a808d 100644
--- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailStoreFunctions.java
+++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MailStoreFunctions.java
@@ -62,7 +62,7 @@ public class MailStoreFunctions extends BasicFunction
 			"Opens a mail store. Host/User/Password/Protocol values will be obtained from the session.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The JavaMail session handle retrieved from mail:get-mail-session()" )
+				new FunctionParameterSequenceType( "mail-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The JavaMail session handle retrieved from mail:get-mail-session()" )
 			},
 			new FunctionReturnSequenceType( Type.LONG, Cardinality.ZERO_OR_ONE, "an xs:long representing the store handle." )
 			),
@@ -72,7 +72,7 @@ public class MailStoreFunctions extends BasicFunction
 			"Closes a mail store.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-store-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The mail store handle retrieved from mail:get-mail-store()" )
+				new FunctionParameterSequenceType( "mail-store-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The mail store handle retrieved from mail:get-mail-store()" )
 			},
 			new SequenceType( Type.ITEM, Cardinality.EMPTY_SEQUENCE )
 			)
@@ -128,7 +128,7 @@ private Sequence getMailStore( Sequence[] args, Sequence contextSequence ) throw
 		
 		// save the store and return the handle of the store
 			
-		return( new IntegerValue( this, MailModule.storeStore( context, store ) ) );
+		return( new IntegerValue( this, MailModule.storeStore( context, store ), Type.LONG ) );
 	}
 
 	private Sequence closeMailStore( Sequence[] args, Sequence contextSequence ) throws XPathException
diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageFunctions.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageFunctions.java
index 19680c7929f..581fafc0e17 100644
--- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageFunctions.java
+++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageFunctions.java
@@ -72,7 +72,7 @@ public class MessageFunctions extends BasicFunction {
                     new SequenceType[]
                             {
 
-                                    new FunctionParameterSequenceType("message-list-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()"),
+                                    new FunctionParameterSequenceType("message-list-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()"),
                                     new FunctionParameterSequenceType("message-numbers", Type.INTEGER, Cardinality.ZERO_OR_MORE, "The messages to retrieve using the numbers from the message-list '//mail:message/@number' ")
 
                             },
diff --git a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java
index b58a0e654f4..906b373bb6c 100644
--- a/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java
+++ b/extensions/modules/mail/src/main/java/org/exist/xquery/modules/mail/MessageListFunctions.java
@@ -89,7 +89,7 @@ public class MessageListFunctions extends BasicFunction
 			"Returns a message list of all messages in a folder.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-folder-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" )
+				new FunctionParameterSequenceType( "mail-folder-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" )
 			},
 			new FunctionReturnSequenceType( Type.LONG, Cardinality.ZERO_OR_ONE, "an xs:long representing the message list handle." )
 			),
@@ -107,7 +107,7 @@ public class MessageListFunctions extends BasicFunction
 			"The format string should conform to Java SimpleDateFormat specifications and the date string must conform to the specified format string.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "mail-folder-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" ),
+				new FunctionParameterSequenceType( "mail-folder-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The mail folder handle retrieved from mail:get-mail-folder()" ),
 				new FunctionParameterSequenceType( "search-parameters", Type.ELEMENT, Cardinality.EXACTLY_ONE, "The xml fragment defining the search terms" )
 			},
 			new FunctionReturnSequenceType( Type.LONG, Cardinality.ZERO_OR_ONE, "an xs:long representing the message list handle." )
@@ -118,7 +118,7 @@ public class MessageListFunctions extends BasicFunction
 			"Returns a message list of all messages in a folder as XML.  If there are no messages in the list, an empty sequence will be returned",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "message-list-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()" ),
+				new FunctionParameterSequenceType( "message-list-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()" ),
 				new FunctionParameterSequenceType( "include-headers", Type.BOOLEAN, Cardinality.EXACTLY_ONE, "A boolean specifying whether to include message headers" )
 			},
 			new FunctionReturnSequenceType( Type.ELEMENT, Cardinality.ZERO_OR_ONE, "the list of all messages in a folder as XML" )
@@ -129,7 +129,7 @@ public class MessageListFunctions extends BasicFunction
 			"Closes a message list.",
 			new SequenceType[]
 			{
-				new FunctionParameterSequenceType( "message-list-handle", Type.INTEGER, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()" )
+				new FunctionParameterSequenceType( "message-list-handle", Type.LONG, Cardinality.EXACTLY_ONE, "The message list handle retrieved from mail:get-message-list() or mail:search-message-list()" )
 			},
 			new SequenceType( Type.ITEM, Cardinality.EMPTY_SEQUENCE )
 			)
@@ -207,7 +207,7 @@ private Sequence getMessageList( Sequence[] args, Sequence contextSequence ) thr
 		
 		// save the message list and return the handle of the message list
 			
-		return( new IntegerValue( this, MailModule.storeMessageList( context, msgList, folderHandle ) ) );
+		return( new IntegerValue( this, MailModule.storeMessageList( context, msgList, folderHandle ), Type.LONG ) );
 	}
 
 	private Sequence searchMessageList( Sequence[] args, Sequence contextSequence ) throws XPathException
@@ -239,7 +239,7 @@ private Sequence searchMessageList( Sequence[] args, Sequence contextSequence )
 		
 		// save the message list and return the handle of the message list
 			
-		return( new IntegerValue( this, MailModule.storeMessageList( context, msgList, folderHandle ) ) );
+		return( new IntegerValue( this, MailModule.storeMessageList( context, msgList, folderHandle ), Type.LONG ) );
 	}
 
 	private void prefetchMessages( Folder folder, Message[] msgList ) throws MessagingException