diff --git a/testfiles-lua/cases.mlr b/testfiles-lua/cases.mlr
index ab7b075..35edb39 100644
--- a/testfiles-lua/cases.mlr
+++ b/testfiles-lua/cases.mlr
@@ -106,9 +106,6 @@
   </mfrac>
   <mo lspace="0" rspace="0">.</mo>
 </math>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mi>𝑏</mi>
-</math>
 <math display="block" xmlns="http://www.w3.org/1998/Math/MathML">
   <munder>
     <mo lspace="0" movablelimits="true" rspace="0.167em">∑</mo>
@@ -120,7 +117,7 @@
   </munder>
   <mover>
     <mi>𝑏</mi>
-    <mo stretchy="false">_</mo>
+    <mo stretchy="true">.</mo>
   </mover>
   <msup>
     <mi>𝑐</mi>
diff --git a/testfiles-lua/test_xml.mlr b/testfiles-lua/test_xml.mlr
index 94a71cc..bc4dd76 100644
--- a/testfiles-lua/test_xml.mlr
+++ b/testfiles-lua/test_xml.mlr
@@ -1,20 +1,3 @@
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mstyle displaystyle="true" scriptlevel="0">
-    <mi>𝑎</mi>
-    <mo lspace="0.278em" rspace="0.278em">=</mo>
-    <mi>𝑏</mi>
-  </mstyle>
-</math>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mi>𝑎</mi>
-  <mo lspace="0.278em" rspace="0.278em">=</mo>
-  <mi>𝑏</mi>
-</math>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mi>𝑎</mi>
-  <mo lspace="0.278em" rspace="0.278em">=</mo>
-  <mi>𝑏</mi>
-</math>
 <math xmlns="http://www.w3.org/1998/Math/MathML">
   <mi>𝑎</mi>
   <mo lspace="0.278em" rspace="0.278em">=</mo>
@@ -80,7 +63,6 @@
               <mo lspace="0.278em" rspace="0.278em">=</mo>
               <mi>𝑏</mi>
             </math></mtext>
-            <mi />
           </mtd>
         </mtr>
         <mtr>
@@ -89,7 +71,6 @@
           </mtd>
           <mtd columnalign="left">
             <mtext>else</mtext>
-            <mi />
           </mtd>
         </mtr>
       </mtable>
@@ -146,9 +127,6 @@
 <math display="block" xmlns="http://www.w3.org/1998/Math/MathML">
   <mtable columnalign="right left right left" columnspacing="0 .8em 0" displaystyle="true">
     <mtr>
-      <mtd intent=":equationlabel">
-        <mtext>(1)</mtext>
-      </mtd>
       <mtd>
         <mi>𝑎</mi>
         <mi>𝑏</mi>
@@ -178,9 +156,6 @@
       </mtd>
     </mtr>
     <mtr>
-      <mtd intent=":equationlabel">
-        <mtext>(2)</mtext>
-      </mtd>
       <mtd>
         <mo fence="true" lspace="0" maxsize="17.861pt" minsize="17.861pt" rspace="0" symmetric="true">(</mo>
         <mn>1</mn>
@@ -201,9 +176,6 @@
       </mtd>
     </mtr>
     <mtr>
-      <mtd intent=":equationlabel">
-        <mtext>(3)</mtext>
-      </mtd>
       <mtd>
         <mn>5</mn>
       </mtd>
diff --git a/testfiles-lua/test_xml.mlt b/testfiles-lua/test_xml.mlt
index ff1a82b..004279b 100644
--- a/testfiles-lua/test_xml.mlt
+++ b/testfiles-lua/test_xml.mlt
@@ -1,17 +1,21 @@
 \DocumentMetadata{
   uncompress,
   pdfversion = 2.0,
-  testphase = phase-I,
+  testphase = {phase-III,table,math},
 }
 \input{regression-test}
 \documentclass{article}
-\usepackage[l3build]{luamml-demo}
-
 \usepackage{unicode-math}
 
 \begin{document}
-\tagstructbegin{tag=Document}
-\LuaMMLTagAF{} {
+\ExplSyntaxOn
+\luamml_set_filename:n {
+    \jobname .mml
+  }
+\luamml_process:  
+\luamml_begin_single_file:
+\ExplSyntaxOff
+
 \[
   \begin{pmatrix}
     1 & 0 & 0 \\
@@ -24,26 +28,21 @@
     2 & \text{else}
   \end{cases}
 \]
-}
-\LuaMMLTagAF{} {
+
 \[
   x = \frac{-b \pm \sqrt{b^2-4ac}}{2a}.
 \]
-}
-\LuaMMLTagAF{} {
+
 \[
   \sum_a\underline c\dot bc'
 \]
-}
 
-\LuaMMLTagAF{} {
 \begin{align}
   abc&=def & e^{\mathrm{i}\pi}&=-1\\
   \Big(1+2&=3\Big)\\
   5
 \end{align}
-}
 
-Es gilt \LuaMMLTagAF{}{$\sin(x)-\sin(x+2\pi)=0$}.
-\tagstructend
+Es gilt $\sin(x)-\sin(x+2\pi)=0$.
+
 \end{document}