diff --git a/src/main/resources/content/xml/schema/xprocspec.rng b/src/main/resources/content/xml/schema/xprocspec.rng
index a49adef..4327b0e 100644
--- a/src/main/resources/content/xml/schema/xprocspec.rng
+++ b/src/main/resources/content/xml/schema/xprocspec.rng
@@ -50,7 +50,10 @@
             </attribute>
         </optional>
         <optional>
-            <ref name="pending-attribute"/>
+            <choice>
+                <ref name="pending-attribute"/>
+                <ref name="focus-attribute"/>
+            </choice>
         </optional>
     </define>
     
@@ -158,7 +161,10 @@
             </a:documentation>
             <ref name="scenario.common"/>
             <optional>
-                <ref name="focus-attribute"/>
+                <choice>
+                    <ref name="pending-attribute"/>
+                    <ref name="focus-attribute"/>
+                </choice>
             </optional>
             <optional>
                 <choice>
@@ -253,6 +259,16 @@
                         with eachother.</p>
                 </a:documentation>
             </attribute>
+            <optional>
+                <attribute name="base-uri">
+                    <a:documentation xmlns="http://www.w3.org/1999/xhtml">If the `base-uri` attribute is `temp-dir`, then the base URI in the context
+                        will be the temporary directory used for the test, instead of the base URI of the xprocspec document.
+                        This can be used with for instance `base-uri()` and `resolve-uri('...')`</a:documentation>
+                    <choice>
+                        <value>temp-dir</value>
+                    </choice>
+                </attribute>
+            </optional>
         </element>
     </define>
 
@@ -274,6 +290,16 @@
                         subsequent evaluations of the step does not conflict with eachother.</p>
                 </a:documentation>
             </attribute>
+            <optional>
+                <attribute name="base-uri">
+                    <a:documentation xmlns="http://www.w3.org/1999/xhtml">If the `base-uri` attribute is `temp-dir`, then the base URI in the context
+                        will be the temporary directory used for the test, instead of the base URI of the xprocspec document.
+                        This can be used with for instance `base-uri()` and `resolve-uri('...')`</a:documentation>
+                    <choice>
+                        <value>temp-dir</value>
+                    </choice>
+                </attribute>
+            </optional>
         </element>
     </define>
 
@@ -306,7 +332,10 @@
         <ref name="common-attributes"/>
         <ref name="common-elements"/>
         <optional>
-            <ref name="pending-attribute"/>
+            <choice>
+                <ref name="pending-attribute"/>
+                <ref name="focus-attribute"/>
+            </choice>
         </optional>
         <ref name="label"/>
     </define>
diff --git a/src/main/resources/content/xml/xproc/compile/description-to-invocation.xsl b/src/main/resources/content/xml/xproc/compile/description-to-invocation.xsl
index e668768..649b8c9 100644
--- a/src/main/resources/content/xml/xproc/compile/description-to-invocation.xsl
+++ b/src/main/resources/content/xml/xproc/compile/description-to-invocation.xsl
@@ -65,13 +65,15 @@
         </xsl:text>
                                     <p:with-option name="{@name}" select="{@select}">
                                         <xsl:copy-of select="namespace::*"/>
+                                        <xsl:if test="not(@xml:base)">
+                                            <xsl:attribute name="xml:base" select="if (@base-uri='temp-dir') then $temp-dir else $test-base-uri"/>
+                                        </xsl:if>
                                         <p:inline>
                                             <context>
-                                                <xsl:attribute name="xml:base" select="$test-base-uri"/>
+                                                <xsl:attribute name="xml:base" select="if (@base-uri='temp-dir') then $temp-dir else $test-base-uri"/>
                                             </context>
                                         </p:inline>
                                     </p:with-option>
-                                    <!-- TODO: ability to set custom context for p:with-option ? -->
                                 </xsl:for-each>
 
                                 <xsl:variable name="parameter-ports" select="/*/x:step-declaration/*/p:input[@kind='parameter']"/>
@@ -98,13 +100,16 @@
                                             <xsl:text>
         </xsl:text>
                                             <p:with-param name="{@name}" select="{@select}" port="{$parameter-port}">
+                                                <xsl:copy-of select="namespace::*"/>
+                                                <xsl:if test="not(@xml:base)">
+                                                    <xsl:attribute name="xml:base" select="if (@base-uri='temp-dir') then $temp-dir else $test-base-uri"/>
+                                                </xsl:if>
                                                 <p:inline>
                                                     <context>
-                                                        <xsl:attribute name="xml:base" select="$test-base-uri"/>
+                                                        <xsl:attribute name="xml:base" select="if (@base-uri='temp-dir') then $temp-dir else $test-base-uri"/>
                                                     </context>
                                                 </p:inline>
                                             </p:with-param>
-                                            <!-- TODO: ability to set custom context for p:with-param ? -->
                                         </xsl:for-each>
                                     </xsl:otherwise>
                                 </xsl:choose>
diff --git a/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl b/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
index 7914b02..8c78577 100644
--- a/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
+++ b/src/main/resources/content/xml/xproc/preprocess/preprocess.xpl
@@ -453,7 +453,7 @@
             <p:add-attribute match="/*" attribute-name="test-grammar" attribute-value="Unknown"/>
         </p:otherwise>
     </p:choose>
-
+    
     <p:for-each name="for-each">
         <p:output port="scenarios" sequence="true"/>
         <p:variable name="base" select="base-uri(/*)"/>
@@ -710,7 +710,7 @@
                                 <p:identity/>
                             </p:otherwise>
                         </p:choose>
-                        <p:delete match="//@focus"/>
+                        <p:delete match="//x:description/*//@focus"/>
 
                         <p:choose>
                             <p:when test="//x:scenario[@xfail='true']">
diff --git a/src/main/resources/content/xml/xproc/xprocspec.xpl b/src/main/resources/content/xml/xproc/xprocspec.xpl
index 0446bf9..f2705b5 100644
--- a/src/main/resources/content/xml/xproc/xprocspec.xpl
+++ b/src/main/resources/content/xml/xproc/xprocspec.xpl
@@ -31,7 +31,28 @@
     <p:variable name="logfile" select="if ($enable-log='true')
                                        then concat($temp-dir,'xprocspec-log-',replace($start-time,'[^\d]',''),'.xml')
                                        else ''"/>
-
+    
+    <!-- If there's multiple input documents and some of them has a focus attribute on the root element; don't process the documents without a focus attribute -->
+    <p:split-sequence test="/*/@focus" name="focus-split"/>
+    <p:count/>
+    <p:choose>
+        <p:when test=".='0'">
+            <p:identity>
+                <p:input port="source">
+                    <p:pipe port="not-matched" step="focus-split"/>
+                </p:input>
+            </p:identity>
+        </p:when>
+        <p:otherwise>
+            <p:for-each>
+                <p:iteration-source>
+                    <p:pipe port="matched" step="focus-split"/>
+                </p:iteration-source>
+                <p:delete match="/*/@focus"/>
+            </p:for-each>
+        </p:otherwise>
+    </p:choose>
+    
     <!--
         * Converts any other XProc test syntaxes (currently supported: XProc Test Suite).
         * Splits the x:description documents into multiple documents; one for each x:scenario with no dependencies between them.
diff --git a/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec b/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
index 201783b..4ed82b4 100644
--- a/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
+++ b/src/test/xprocspec/tests/regression-tests/issue-4_temp-dir-option.xprocspec
@@ -2,7 +2,7 @@
 <?xml-model href="http://www.daisy.org/ns/xprocspec/xprocspec.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
 <x:description xmlns:x="http://www.daisy.org/ns/xprocspec" xmlns:ex="http://example.net/ns" script="../../steps/temp-dir-option.xpl">
 
-    <x:scenario label="temp-dir" pending="Not clear yet whether this is a bug or not; see #44">
+    <x:scenario label="temp-dir option">
         <x:call step="ex:temp-dir-option">
             <x:option name="temp-dir" select="'xprocspec temp-dir value'"/>
             <x:option name="output-dir" select="$temp-dir"/>
@@ -11,8 +11,21 @@
             <x:document type="port" port="result"/>
         </x:context>
         <x:expect type="count" label="there should be one document on the result port" min="1" max="1"/>
-        <x:expect type="xpath" label="the value of the output-dir option should not equal the temp-dir value" test="/*/@output-dir" equals="/*/@temp-dir" xfail="true"/>
+        <x:expect type="xpath" label="the value of the output-dir option should equal the temp-dir value (options can reference previous options, temp-dir is overridden)" test="/*/@output-dir" equals="/*/@temp-dir"/>
         <x:expect type="xpath" label="the value of the $temp-dir variable should not equal the temp-dir value" test="$temp-dir" equals="/*/@temp-dir" xfail="true"/>
     </x:scenario>
+    
+    <x:scenario label="temp-dir base-uri">
+        <x:call step="ex:temp-dir-option">
+            <x:option name="temp-dir" select="base-uri()" base-uri="temp-dir"/>
+            <x:option name="output-dir" select="base-uri()"/>
+        </x:call>
+        <x:context label="the result">
+            <x:document type="port" port="result"/>
+        </x:context>
+        <x:expect type="count" label="there should be one document on the result port" min="1" max="1"/>
+        <x:expect type="xpath" label="the value of the output-dir option should not equal the temp-dir value" test="/*/@output-dir" equals="/*/@temp-dir" xfail="true"/>
+        <x:expect type="xpath" label="the value of the $temp-dir variable should equal the temp-dir value" test="$temp-dir" equals="/*/@temp-dir"/>
+    </x:scenario>
 
 </x:description>