diff --git a/test/testdata/xdmf_1tet/testdata.xmf b/test/testdata/linear_tet.xmf
similarity index 69%
rename from test/testdata/xdmf_1tet/testdata.xmf
rename to test/testdata/linear_tet.xmf
index 40af7f4..ee50a45 100644
--- a/test/testdata/xdmf_1tet/testdata.xmf
+++ b/test/testdata/linear_tet.xmf
@@ -7,16 +7,28 @@
       <Grid Name="Grid">
         <Time Value="123"/>
         <Geometry Type="XYZ">
-          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="4">0 0 0 1 0 0 0 1 0 0 0 1</DataItem>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="4">
+          	0.0 0.0 0.0
+          	1.0 0.0 0.0
+          	0.0 1.0 0.0
+          	0.0 0.0 1.0
+          </DataItem>
         </Geometry>
         <Topology Dimensions="1" Type="Mixed">
-          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">6 0 1 2 3</DataItem>
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">
+          	6 0 1 2 3
+          </DataItem>
         </Topology>
         <Attribute Center="Cell" Name="Temperature field" Type="Scalar">
           <DataItem DataType="Int" Dimensions="1" Format="XML" Precision="4">56</DataItem>
         </Attribute>
         <Attribute Center="Node" Name="Density" Type="Vector">
-          <DataItem DataType="Float" Dimensions="4" Format="XML" Precision="4">1 2 4 7</DataItem>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="4">
+            1.0 2.0 3.0
+          	4.0 5.0 6.0
+          	7.0 8.0 9.0
+          	10.0 11.0 12.0
+          </DataItem>
         </Attribute>
       </Grid>
     </Grid>
diff --git a/test/testdata/quad_tet.xmf b/test/testdata/quad_tet.xmf
new file mode 100644
index 0000000..640b2db
--- /dev/null
+++ b/test/testdata/quad_tet.xmf
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.1">
+  <Domain>
+    <Grid CollectionType="Temporal" GridType="Collection" Name="Collection">
+      <Geometry Type="None"/>
+      <Topology Dimensions="0" Type="NoTopology"/>
+      <Grid Name="Grid">
+        <Time Value="123"/>
+        <Geometry Type="XYZ">
+          <DataItem DataType="Float" Dimensions="30" Format="XML" Precision="4">
+          0.0 0.0 0.0
+          1.0 0.0 0.0
+          0.0 1.0 0.0
+          0.0 0.0 1.0
+          0.5 0.0 0.0
+          0.5 0.5 0.0
+          0.0 0.5 0.0
+          0.0 0.0 0.5
+          0.5 0.0 0.5
+          0.0 0.5 0.5
+          </DataItem>
+        </Geometry>
+        <Topology Dimensions="1" Type="Mixed">
+          <DataItem DataType="Int" Dimensions="11" Format="XML" Precision="4">
+          38 0 1 2 3 4 5 6 7 8 9
+          </DataItem>
+        </Topology>
+      </Grid>
+    </Grid>
+  </Domain>
+</Xdmf>