From ec6c61918e312bc485b65f1d728b5be82cfa4940 Mon Sep 17 00:00:00 2001
From: Bert Frees <bertfrees@gmail.com>
Date: Wed, 13 Jan 2016 20:56:35 +0100
Subject: [PATCH] Clean up tests generated from DP2 tests

Delete tests that are covered by another test or that will be covered by
new ones to be added later.
---
 .../engine/impl/MarkerIndicatorTest.java      |  18 +-
 .../dotify/engine/impl/TakenFromDP2Test.java  | 189 ------------------
 .../test_01-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_01-input.obfl  |   2 +-
 .../test_02-expected.pef                      |  48 -----
 .../test_format.xprocspec/test_02-input.obfl  |  51 -----
 .../test_03-expected.pef                      |  28 ---
 .../test_format.xprocspec/test_03-input.obfl  |  42 ----
 .../test_04-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_04-input.obfl  |   2 +-
 .../test_05-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_05-input.obfl  |   2 +-
 .../test_06-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_06-input.obfl  |  31 ---
 .../test_07-expected.pef                      | 124 ------------
 .../test_format.xprocspec/test_07-input.obfl  | 112 -----------
 .../test_08-expected.pef                      |  44 ----
 .../test_format.xprocspec/test_08-input.obfl  |  37 ----
 .../test_09-expected.pef                      |  22 --
 .../test_format.xprocspec/test_09-input.obfl  |  17 --
 .../test_10-expected.pef                      |  26 ---
 .../test_format.xprocspec/test_10-input.obfl  |  20 --
 .../test_11-expected.pef                      |  29 ---
 .../test_format.xprocspec/test_11-input.obfl  |  20 --
 .../test_12-expected.pef                      |  21 --
 .../test_format.xprocspec/test_12-input.obfl  |  17 --
 .../test_13-expected.pef                      |  19 --
 .../test_format.xprocspec/test_13-input.obfl  |  20 --
 .../test_14-expected.pef                      |  19 --
 .../test_format.xprocspec/test_14-input.obfl  |  18 --
 .../test_15-expected.pef                      |  19 --
 .../test_format.xprocspec/test_15-input.obfl  |  18 --
 .../test_16-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_16-input.obfl  |   2 +-
 .../test_17-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_17-input.obfl  |   2 +-
 .../test_18-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_18-input.obfl  |  23 ---
 .../test_19-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_19-input.obfl  |  20 --
 .../test_20-expected.pef                      |  56 ------
 .../test_format.xprocspec/test_20-input.obfl  |  52 -----
 .../test_21-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_21-input.obfl  |   2 +-
 .../test_22-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_22-input.obfl  |   2 +-
 .../test_23-expected.pef                      |  20 --
 .../test_format.xprocspec/test_23-input.obfl  |  17 --
 .../test_24-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_24-input.obfl  |  17 --
 .../test_25-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_25-input.obfl  |   2 +-
 .../test_26-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_26-input.obfl  |   2 +-
 .../test_27-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_27-input.obfl  |   2 +-
 .../test_28-expected.pef                      |  22 --
 .../test_format.xprocspec/test_28-input.obfl  |  19 --
 .../test_29-expected.pef                      |  22 --
 .../test_format.xprocspec/test_29-input.obfl  |  19 --
 .../test_30-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_30-input.obfl  |  21 --
 .../test_31-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_31-input.obfl  |   2 +-
 .../test_32-expected.pef                      |  21 --
 .../test_format.xprocspec/test_32-input.obfl  |  18 --
 .../test_33-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_33-input.obfl  |   2 +-
 .../test_34-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_34-input.obfl  |   2 +-
 .../test_35-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_35-input.obfl  |   2 +-
 .../test_36-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_36-input.obfl  |   2 +-
 .../test_37-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_37-input.obfl  |   2 +-
 .../test_38-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_38-input.obfl  |   2 +-
 .../test_39-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_39-input.obfl  |   2 +-
 .../test_40-expected.pef                      |  20 --
 .../test_format.xprocspec/test_40-input.obfl  |  20 --
 .../test_41-expected.pef                      |  24 ---
 .../test_format.xprocspec/test_41-input.obfl  |  23 ---
 .../test_42-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_42-input.obfl  |   2 +-
 .../test_43-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_43-input.obfl  |   2 +-
 .../test_44-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_44-input.obfl  |   2 +-
 .../test_45-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_45-input.obfl  |   2 +-
 .../test_46-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_46-input.obfl  |   2 +-
 .../test_47-expected.pef                      |  30 ---
 .../test_format.xprocspec/test_47-input.obfl  |  42 ----
 .../test_48-expected.pef                      |  67 -------
 .../test_format.xprocspec/test_48-input.obfl  |  86 --------
 .../test_49-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_49-input.obfl  |   2 +-
 .../test_50-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_50-input.obfl  |   2 +-
 .../test_51-expected.pef                      |   2 +-
 .../test_format.xprocspec/test_51-input.obfl  |   2 +-
 .../test_52-expected.pef                      |  42 ----
 .../test_format.xprocspec/test_52-input.obfl  |  43 ----
 .../test_53-expected.pef                      |  60 ------
 .../test_format.xprocspec/test_53-input.obfl  |  55 -----
 .../test_54-expected.pef                      |  41 ----
 .../test_format.xprocspec/test_54-input.obfl  |  44 ----
 .../test_55-expected.pef                      |  27 ---
 .../test_format.xprocspec/test_55-input.obfl  |  26 ---
 .../test_56-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_56-input.obfl  |  28 ---
 .../test_57-expected.pef                      |  23 ---
 .../test_format.xprocspec/test_57-input.obfl  |  28 ---
 .../test_01-expected.pef                      |  23 ---
 .../test_01-input.obfl                        |  27 ---
 .../test_02-expected.pef                      |   2 +-
 .../test_02-input.obfl                        |   2 +-
 .../test_03-expected.pef                      |   2 +-
 .../test_03-input.obfl                        |   2 +-
 .../test_04-expected.pef                      |   2 +-
 .../test_04-input.obfl                        |   2 +-
 .../test_05-expected.pef                      |   2 +-
 .../test_05-input.obfl                        |   2 +-
 .../test_06-expected.pef                      |   2 +-
 .../test_06-input.obfl                        |   2 +-
 .../test_07-expected.pef                      |  22 --
 .../test_07-input.obfl                        |  19 --
 .../test_08-expected.pef                      |   2 +-
 .../test_08-input.obfl                        |   2 +-
 .../test_09-expected.pef                      |   2 +-
 .../test_09-input.obfl                        |   2 +-
 .../test_10-expected.pef                      |  22 --
 .../test_10-input.obfl                        |  17 --
 .../test_11-expected.pef                      |   2 +-
 .../test_11-input.obfl                        |   2 +-
 .../test_12-expected.pef                      |   2 +-
 .../test_12-input.obfl                        |   2 +-
 .../test_13-expected.pef                      |   2 +-
 .../test_13-input.obfl                        |   2 +-
 .../test_14-expected.pef                      |   2 +-
 .../test_14-input.obfl                        |   2 +-
 .../test_15-expected.pef                      |   2 +-
 .../test_15-input.obfl                        |   2 +-
 .../test_16-expected.pef                      |   2 +-
 .../test_16-input.obfl                        |   2 +-
 .../test_17-expected.pef                      |   2 +-
 .../test_17-input.obfl                        |   2 +-
 .../test_18-expected.pef                      |   2 +-
 .../test_18-input.obfl                        |   2 +-
 .../test_19-expected.pef                      |   2 +-
 .../test_19-input.obfl                        |   2 +-
 .../test_20-expected.pef                      |   2 +-
 .../test_20-input.obfl                        |   2 +-
 .../test_21-expected.pef                      |   2 +-
 .../test_21-input.obfl                        |   2 +-
 .../test_22-expected.pef                      |  69 -------
 .../test_22-input.obfl                        |  25 ---
 .../test_23-expected.pef                      |   2 +-
 .../test_23-input.obfl                        |   2 +-
 .../test_24-expected.pef                      |   2 +-
 .../test_24-input.obfl                        |   2 +-
 .../test_25-expected.pef                      |   2 +-
 .../test_25-input.obfl                        |   2 +-
 .../test_26-expected.pef                      |  40 ----
 .../test_26-input.obfl                        |  42 ----
 .../test_27-expected.pef                      |   2 +-
 .../test_27-input.obfl                        |   2 +-
 .../test_28-expected.pef                      |   2 +-
 .../test_28-input.obfl                        |   2 +-
 .../test_29-expected.pef                      |   2 +-
 .../test_29-input.obfl                        |   2 +-
 174 files changed, 106 insertions(+), 2623 deletions(-)
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-input.obfl
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-expected.pef
 delete mode 100644 dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-input.obfl

diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/MarkerIndicatorTest.java b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/MarkerIndicatorTest.java
index d51e89a2..9cab01fb 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/MarkerIndicatorTest.java
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/MarkerIndicatorTest.java
@@ -11,20 +11,14 @@ public class MarkerIndicatorTest extends AbstractFormatterEngineTest {
 	public void testPageMargin_01() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/marker-indicator-input.obfl", "resource-files/marker-indicator-expected.pef", false);
 	}
-	
-	@Test
-	public void testFormat_55() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_55-input.obfl",
-		        "resource-files/test_format.xprocspec/test_55-expected.pef", true);
-	}
 	@Test
-	public void testFormat_56() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_56-input.obfl",
-		        "resource-files/test_format.xprocspec/test_56-expected.pef", true);
+	public void testObflToPef_27() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
+		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl",
+		        "resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef", false);
 	}
 	@Test
-	public void testFormat_57() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_57-input.obfl",
-		        "resource-files/test_format.xprocspec/test_57-expected.pef", true);
+	public void testObflToPef_28() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
+		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl",
+		        "resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef", false);
 	}
 }
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/TakenFromDP2Test.java b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/TakenFromDP2Test.java
index 5b5eb155..77238f1d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/TakenFromDP2Test.java
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/TakenFromDP2Test.java
@@ -9,11 +9,6 @@
 
 public class TakenFromDP2Test extends AbstractFormatterEngineTest {
 	
-	@Test
-	public void testObflToPef_01() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_01-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_01-expected.pef", false);
-	}
 	@Test
 	public void testObflToPef_02() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_02-input.obfl",
@@ -43,12 +38,6 @@ public void testObflToPef_06() throws LayoutEngineException, IOException, PagedM
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_06-input.obfl",
 		        "resource-files/test_obfl-to-pef.xprocspec/test_06-expected.pef", false);
 	}
-	@Ignore // depends on a custom translator
-	@Test
-	public void testObflToPef_07() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_07-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_07-expected.pef", false);
-	}
 	@Test
 	public void testObflToPef_08() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_08-input.obfl",
@@ -59,13 +48,6 @@ public void testObflToPef_09() throws LayoutEngineException, IOException, PagedM
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_09-input.obfl",
 		        "resource-files/test_obfl-to-pef.xprocspec/test_09-expected.pef", false);
 	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	        // (breaks lines according to css line breaking rules)
-	@Test
-	public void testObflToPef_10() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_10-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_10-expected.pef", false);
-	}
 	@Test
 	public void testObflToPef_11() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_11-input.obfl",
@@ -122,11 +104,6 @@ public void testObflToPef_21() throws LayoutEngineException, IOException, PagedM
 		        "resource-files/test_obfl-to-pef.xprocspec/test_21-expected.pef", false);
 	}
 	@Test
-	public void testObflToPef_22() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_22-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_22-expected.pef", false);
-	}
-	@Test
 	public void testObflToPef_23() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_23-input.obfl",
 		        "resource-files/test_obfl-to-pef.xprocspec/test_23-expected.pef", false);
@@ -141,21 +118,6 @@ public void testObflToPef_25() throws LayoutEngineException, IOException, PagedM
 		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_25-input.obfl",
 		        "resource-files/test_obfl-to-pef.xprocspec/test_25-expected.pef", false);
 	}
-	@Test
-	public void testObflToPef_26() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_26-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_26-expected.pef", false);
-	}
-	@Test
-	public void testObflToPef_27() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef", false);
-	}
-	@Test
-	public void testObflToPef_28() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl",
-		        "resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef", false);
-	}
 	@Ignore // regression in dotify 2.0.0-SNAPSHOT?
 	@Test
 	public void testObflToPef_29() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
@@ -167,21 +129,6 @@ public void testFormat_01() throws LayoutEngineException, IOException, PagedMedi
 		testPEF("resource-files/test_format.xprocspec/test_01-input.obfl",
 		        "resource-files/test_format.xprocspec/test_01-expected.pef", false);
 	}
-	@Ignore // * depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	        // * position of middle field of header/footer depends on width of
-	        //   fields in left and right corner, so centering is not perfect
-	        //   (not sure if this is a requirement though)
-	@Test
-	public void testFormat_02() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_02-input.obfl",
-		        "resource-files/test_format.xprocspec/test_02-expected.pef", false);
-	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_03() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_03-input.obfl",
-		        "resource-files/test_format.xprocspec/test_03-expected.pef", false);
-	}
 	@Ignore // is this a page numbering bug?
 	@Test
 	public void testFormat_04() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
@@ -193,57 +140,6 @@ public void testFormat_05() throws LayoutEngineException, IOException, PagedMedi
 		testPEF("resource-files/test_format.xprocspec/test_05-input.obfl",
 		        "resource-files/test_format.xprocspec/test_05-expected.pef", false);
 	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_06() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_06-input.obfl",
-		        "resource-files/test_format.xprocspec/test_06-expected.pef", false);
-	}
-	@Test
-	public void testFormat_07() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_07-input.obfl",
-		        "resource-files/test_format.xprocspec/test_07-expected.pef", false);
-	}
-	@Test
-	public void testFormat_08() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_08-input.obfl",
-		        "resource-files/test_format.xprocspec/test_08-expected.pef", false);
-	}
-	@Test
-	public void testFormat_09() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_09-input.obfl",
-		        "resource-files/test_format.xprocspec/test_09-expected.pef", false);
-	}
-	@Test
-	public void testFormat_10() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_10-input.obfl",
-		        "resource-files/test_format.xprocspec/test_10-expected.pef", false);
-	}
-	@Test
-	public void testFormat_11() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_11-input.obfl",
-		        "resource-files/test_format.xprocspec/test_11-expected.pef", false);
-	}
-	@Test
-	public void testFormat_12() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_12-input.obfl",
-		        "resource-files/test_format.xprocspec/test_12-expected.pef", false);
-	}
-	@Test
-	public void testFormat_13() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_13-input.obfl",
-		        "resource-files/test_format.xprocspec/test_13-expected.pef", false);
-	}
-	@Test
-	public void testFormat_14() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_14-input.obfl",
-		        "resource-files/test_format.xprocspec/test_14-expected.pef", false);
-	}
-	@Test
-	public void testFormat_15() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_15-input.obfl",
-		        "resource-files/test_format.xprocspec/test_15-expected.pef", false);
-	}
 	@Test
 	public void testFormat_16() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_16-input.obfl",
@@ -254,22 +150,6 @@ public void testFormat_17() throws LayoutEngineException, IOException, PagedMedi
 		testPEF("resource-files/test_format.xprocspec/test_17-input.obfl",
 		        "resource-files/test_format.xprocspec/test_17-expected.pef", false);
 	}
-	@Test
-	public void testFormat_18() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_18-input.obfl",
-		        "resource-files/test_format.xprocspec/test_18-expected.pef", false);
-	}
-	@Test
-	public void testFormat_19() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_19-input.obfl",
-		        "resource-files/test_format.xprocspec/test_19-expected.pef", false);
-	}
-	@Ignore // leader issue
-	@Test
-	public void testFormat_20() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_20-input.obfl",
-		        "resource-files/test_format.xprocspec/test_20-expected.pef", false);
-	}
 	@Ignore // leader issue
 	@Test
 	public void testFormat_21() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
@@ -284,16 +164,6 @@ public void testFormat_22() throws LayoutEngineException, IOException, PagedMedi
 		        "resource-files/test_format.xprocspec/test_22-expected.pef", false);
 	}
 	@Test
-	public void testFormat_23() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_23-input.obfl",
-		        "resource-files/test_format.xprocspec/test_23-expected.pef", false);
-	}
-	@Test
-	public void testFormat_24() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_24-input.obfl",
-		        "resource-files/test_format.xprocspec/test_24-expected.pef", false);
-	}
-	@Test
 	public void testFormat_25() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_25-input.obfl",
 		        "resource-files/test_format.xprocspec/test_25-expected.pef", false);
@@ -309,31 +179,11 @@ public void testFormat_27() throws LayoutEngineException, IOException, PagedMedi
 		        "resource-files/test_format.xprocspec/test_27-expected.pef", false);
 	}
 	@Test
-	public void testFormat_28() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_28-input.obfl",
-		        "resource-files/test_format.xprocspec/test_28-expected.pef", false);
-	}
-	@Test
-	public void testFormat_29() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_29-input.obfl",
-		        "resource-files/test_format.xprocspec/test_29-expected.pef", false);
-	}
-	@Test
-	public void testFormat_30() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_30-input.obfl",
-		        "resource-files/test_format.xprocspec/test_30-expected.pef", false);
-	}
-	@Test
 	public void testFormat_31() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_31-input.obfl",
 		        "resource-files/test_format.xprocspec/test_31-expected.pef", false);
 	}
 	@Test
-	public void testFormat_32() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_32-input.obfl",
-		        "resource-files/test_format.xprocspec/test_32-expected.pef", false);
-	}
-	@Test
 	public void testFormat_33() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_33-input.obfl",
 		        "resource-files/test_format.xprocspec/test_33-expected.pef", false);
@@ -369,16 +219,6 @@ public void testFormat_39() throws LayoutEngineException, IOException, PagedMedi
 		        "resource-files/test_format.xprocspec/test_39-expected.pef", false);
 	}
 	@Test
-	public void testFormat_40() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_40-input.obfl",
-		        "resource-files/test_format.xprocspec/test_40-expected.pef", false);
-	}
-	@Test
-	public void testFormat_41() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_41-input.obfl",
-		        "resource-files/test_format.xprocspec/test_41-expected.pef", false);
-	}
-	@Test
 	public void testFormat_42() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_42-input.obfl",
 		        "resource-files/test_format.xprocspec/test_42-expected.pef", false);
@@ -404,17 +244,6 @@ public void testFormat_46() throws LayoutEngineException, IOException, PagedMedi
 		        "resource-files/test_format.xprocspec/test_46-expected.pef", false);
 	}
 	@Test
-	public void testFormat_47() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_47-input.obfl",
-		        "resource-files/test_format.xprocspec/test_47-expected.pef", false);
-	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_48() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_48-input.obfl",
-		        "resource-files/test_format.xprocspec/test_48-expected.pef", false);
-	}
-	@Test
 	public void testFormat_49() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
 		testPEF("resource-files/test_format.xprocspec/test_49-input.obfl",
 		        "resource-files/test_format.xprocspec/test_49-expected.pef", false);
@@ -430,22 +259,4 @@ public void testFormat_51() throws LayoutEngineException, IOException, PagedMedi
 		testPEF("resource-files/test_format.xprocspec/test_51-input.obfl",
 		        "resource-files/test_format.xprocspec/test_51-expected.pef", false);
 	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_52() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_52-input.obfl",
-		        "resource-files/test_format.xprocspec/test_52-expected.pef", false);
-	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_53() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_53-input.obfl",
-		        "resource-files/test_format.xprocspec/test_53-expected.pef", false);
-	}
-	@Ignore // depends on org.daisy.pipeline.braille.dotify.impl.BrailleFilterFactoryImpl
-	@Test
-	public void testFormat_54() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
-		testPEF("resource-files/test_format.xprocspec/test_54-input.obfl",
-		        "resource-files/test_format.xprocspec/test_54-expected.pef", false);
-	}
 }
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-expected.pef
index b02323b4..a7f79d4a 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_01</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_01</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-input.obfl
index 8cf39d7e..ec4b88ba 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_01-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_01</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_01</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="30" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-expected.pef
deleted file mode 100644
index 21ed15c5..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-expected.pef
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_02</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="20" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row/>
-               <row>⠤⠤⠤</row>
-            </page>
-            <page>
-               <row/>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤</row>
-            </page>
-            <page>
-               <row/>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤</row>
-            </page>
-            <page>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-input.obfl
deleted file mode 100644
index 8e270bd7..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_02-input.obfl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_02</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="running-header" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="running-header" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="running-header/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </header>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="running-footer" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="running-footer" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="running-footer/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <marker-reference marker="print-page" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠤⠤⠤
-            </block>
-      <block break-before="page"><marker class="print-page/prev" value="​"/><marker class="print-page" value="⠤"/>⠤⠤⠤
-            </block>
-      <block break-before="page"><marker class="print-page/prev" value="⠤"/><marker class="print-page" value="⠤⠤"/><marker class="running-footer/prev" value="​"/><marker class="running-footer" value="⠤⠤"/>⠤⠤⠤
-            </block>
-      <block break-before="page"><marker class="print-page/prev" value="⠤⠤"/><marker class="print-page" value="​"/><marker class="running-header/prev" value="​"/><marker class="running-header" value="⠤⠤"/>⠤⠤⠤
-            </block>
-      <block break-before="page"><marker class="print-page/prev" value="​"/><marker class="print-page" value="⠤⠤⠤"/><marker class="running-footer/prev" value="⠤⠤"/><marker class="running-footer" value="​"/>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-expected.pef
deleted file mode 100644
index 8b37f596..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-expected.pef
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_03</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="20" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠀⠀⠀⠀⠀⠀⠀⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-input.obfl
deleted file mode 100644
index e18a8222..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_03-input.obfl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_03</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <layout-master name="b" page-width="20" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="running-footer" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="running-footer" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="running-footer/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <marker-reference marker="print-page" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><marker class="print-page/prev" value="​"/><marker class="print-page" value="⠤"/><marker class="running-footer/prev" value="​"/><marker class="running-footer" value="⠤⠤"/>⠤⠤⠤
-            </block>
-   </sequence>
-   <sequence master="b">
-      <block><marker class="print-page/entry" value="⠤"/><marker class="running-footer/entry" value="⠤⠤"/></block>
-      <block>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-expected.pef
index bea9ca02..780c78ce 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_04</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_04</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-input.obfl
index 0dffc799..540f27ea 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_04-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_04</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_04</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-expected.pef
index 6b5fca73..06979078 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_05</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_05</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-input.obfl
index 650d3055..bf52f52f 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_05-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_05</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_05</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="front" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-expected.pef
deleted file mode 100644
index ed1cb582..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_06</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="15" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤⠤⠀⠼⠁</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-input.obfl
deleted file mode 100644
index 0be2c68a..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_06-input.obfl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_06</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="print-page" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-               <string value=" "/>
-               <current-page number-format="default"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><marker class="print-page/prev" value="​"/><marker class="print-page" value="⠤⠤"/>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-expected.pef
deleted file mode 100644
index 868087f6..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-expected.pef
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_07</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="6" cols="10" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-input.obfl
deleted file mode 100644
index fe72ad34..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_07-input.obfl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_07</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="10" page-height="6" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block keep="all">⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block><block keep-with-next="1" keep="all">⠤⠤⠤</block>
-            <block keep-with-next="1" keep="all">⠤⠤⠤</block>
-            <block keep-with-next="1" keep="all">⠤⠤⠤</block>
-            <block keep="all">⠤⠤⠤</block>
-         </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block keep-with-next="1" keep="all">⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block>⠤⠤⠤</block>
-         <block><block>⠤⠤⠤</block>
-            <block keep-with-next="1" keep="all">⠤⠤⠤</block>
-         </block>
-         <block>⠤⠤⠤</block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block orphans="3">⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-         <block widows="3">⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-                ⠤⠤⠤⠤⠤⠤⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-expected.pef
deleted file mode 100644
index 7e78f75b..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-expected.pef
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_08</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="6" cols="10" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-            <page>
-               <row>⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-            <page>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-input.obfl
deleted file mode 100644
index 35f796d7..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_08-input.obfl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_08</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="10" page-height="6" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><block>⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-              </block>
-         <block orphans="3" border-top-style="solid" border-top-align="center" border-bottom-style="solid" border-bottom-align="center">⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-              </block>
-      </block>
-   </sequence>
-   <sequence master="body">
-      <block><block>⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-              </block>
-         <block widows="3" border-top-style="solid" border-top-align="center" border-bottom-style="solid" border-bottom-align="center">⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-                ⠿⠿⠿⠿⠿⠿⠿⠿⠿
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-expected.pef
deleted file mode 100644
index c16fabe0..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-expected.pef
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_09</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="6" cols="10" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-input.obfl
deleted file mode 100644
index a64e10ce..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_09-input.obfl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_09</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="10" page-height="6" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠤⠤⠤ </block>
-      <block break-before="page">⠤⠤⠤ </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-expected.pef
deleted file mode 100644
index 21b63281..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-expected.pef
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_10</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="15" cols="20" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠿⠿⠿</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠿⠿⠿⠿</row>
-               <row/>
-               <row>⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-input.obfl
deleted file mode 100644
index f6756229..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_10-input.obfl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_10</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="20" page-height="15" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠿⠿⠿⠿
-            </block>
-      <block break-before="page" align="center" border-top-style="solid" border-top-align="inner" border-bottom-style="solid" border-bottom-align="inner"><block align="center" margin-top="1" margin-bottom="1">⠿⠿⠿⠿
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-expected.pef
deleted file mode 100644
index 5de3ba19..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-expected.pef
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_11</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="15" cols="20" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row/>
-               <row>⠀⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠀⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠇⠀⠀⠀⠿⠿⠿⠿⠀⠀⠀⠸⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠀⠀⠸⠀</row>
-               <row>⠀⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⠀</row>
-               <row>⠀⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉⠉</row>
-               <row/>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-input.obfl
deleted file mode 100644
index e01f57d5..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_11-input.obfl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_11</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="20" page-height="15" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block align="center" margin-left="1" margin-right="1" margin-top="1" margin-bottom="1" border-left-style="solid" border-left-align="outer" border-right-style="solid" border-right-align="outer" border-top-style="solid" border-top-align="inner" border-bottom-style="solid" border-bottom-align="inner"><block align="center" margin-top="1" margin-bottom="1"><block align="center" margin-left="2" margin-right="2" border-left-style="solid" border-left-align="outer" border-right-style="solid" border-right-align="outer" border-top-style="solid" border-top-align="inner" border-bottom-style="solid" border-bottom-align="inner"><block align="center" margin-top="1" margin-bottom="1" margin-left="1" margin-right="1">⠿⠿⠿⠿
-                  </block>
-            </block>
-         </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-expected.pef
deleted file mode 100644
index 3e9cc7a2..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-expected.pef
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_12</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="15" cols="20" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠖⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠲</row>
-               <row>⠇⠀⠀⠀⠀⠀⠀⠀⠿⠿⠿⠿⠀⠀⠀⠀⠀⠀⠀⠸</row>
-               <row>⠓⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠒⠚</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-input.obfl
deleted file mode 100644
index a93629fa..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_12-input.obfl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_12</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="20" page-height="15" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block align="center" border-left-style="solid" border-left-align="outer" border-right-style="solid" border-right-align="outer" border-top-style="solid" border-top-align="center" border-bottom-style="solid" border-bottom-align="center">⠿⠿⠿⠿
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-expected.pef
deleted file mode 100644
index dc85a295..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-expected.pef
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_13</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="2" cols="30" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠆⠀⠤⠤⠤⠆⠀⠤⠤⠤⠆⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-input.obfl
deleted file mode 100644
index 38aee706..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_13-input.obfl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_13</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="30" page-height="2" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠤⠤⠤⠆
-                  ⠤⠤⠤⠆
-                  ⠤⠤⠤⠆
-                  ⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-expected.pef
deleted file mode 100644
index 3d1d39e7..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-expected.pef
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_14</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠀⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-input.obfl
deleted file mode 100644
index 5dc0ae5a..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_14-input.obfl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_14</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><block margin-left="2">⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-expected.pef
deleted file mode 100644
index 051bf5b2..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-expected.pef
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_15</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠀⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-input.obfl
deleted file mode 100644
index 0ddcf664..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_15-input.obfl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_15</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><block margin-left="2">⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-expected.pef
index eb4418b4..e6648201 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_16</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_16</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-input.obfl
index dc2223c3..184684d0 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_16-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_16</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_16</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-expected.pef
index 429c2438..db1d10bb 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_17</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_17</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-input.obfl
index 90cf821d..3ea7c0e1 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_17-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_17</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_17</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-expected.pef
deleted file mode 100644
index d26b2049..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_18</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="15" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠐⠐⠐⠐⠐⠐⠐⠐⠐⠐⠐⠐⠐⠀⠿</row>
-               <row>⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-input.obfl
deleted file mode 100644
index 19038c5e..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_18-input.obfl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_18</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><block first-line-indent="2">⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              </block>
-         <block><leader pattern="⠐" position="100%" align="right"/>
-                ⠿
-              </block>
-         <block>⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              </block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-expected.pef
deleted file mode 100644
index 141c5ccd..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_19</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠼⠁⠀⠤⠤⠤</row>
-               <row>⠼⠃⠀⠤⠤⠤</row>
-               <row>⠊⠀⠤⠤⠤</row>
-               <row>⠊⠊⠀⠤⠤⠤</row>
-               <row>⠼⠉⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-input.obfl
deleted file mode 100644
index abbb6da5..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_19-input.obfl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_19</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>1 ⠤⠤⠤ </block>
-      <block>2 ⠤⠤⠤ </block>
-      <block>i ⠤⠤⠤ </block>
-      <block>ii ⠤⠤⠤ </block>
-      <block>3 ⠤⠤⠤ </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-expected.pef
deleted file mode 100644
index 7ed7de3d..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-expected.pef
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_20</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="8" cols="14" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠀⠄⠄⠄⠄⠄⠄⠄⠀⠤⠀⠼⠃</row>
-               <row>⠿⠿⠀⠄⠄⠄⠄⠄⠄⠀⠤⠀⠼⠉</row>
-               <row>⠿⠿⠿⠀⠄⠄⠄⠄⠀⠤⠤⠀⠼⠙</row>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠁</row>
-            </page>
-            <page>
-               <row>⠀⠀⠀⠀⠀⠀⠿</row>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠃</row>
-            </page>
-            <page>
-               <row>⠀⠀⠀⠀⠀⠀⠿⠿</row>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠉</row>
-            </page>
-            <page>
-               <row>⠀⠀⠀⠀⠀⠿⠿⠿</row>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠙</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-input.obfl
deleted file mode 100644
index 51c4a684..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_20-input.obfl
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_20</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="14" page-height="8" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <current-page number-format="default"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠿
-              <leader pattern="⠄" position="100%" align="right"/>
-              ⠤
-              <page-number ref-id="chapter_1" number-format="default"/>
-      </block>
-      <block>⠿⠿
-              <leader pattern="⠄" position="100%" align="right"/>
-              ⠤
-              <page-number ref-id="chapter_2" number-format="default"/>
-      </block>
-      <block>⠿⠿⠿
-              <leader pattern="⠄" position="100%" align="right"/>
-              ⠤⠤
-              <page-number ref-id="chapter_3" number-format="default"/>
-      </block>
-      <block align="center" break-before="page" id="chapter_1"><marker class="print-page" value="⠤"/>⠿
-            </block>
-      <block>⠤⠤⠤
-            </block>
-      <block align="center" break-before="page" id="chapter_2">⠿⠿
-            </block>
-      <block>⠤⠤⠤
-            </block>
-      <block align="center" break-before="page" id="chapter_3"><marker class="print-page/prev" value="⠤"/><marker class="print-page" value="⠤⠤"/>⠿⠿⠿
-            </block>
-      <block>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-expected.pef
index 7e0b9efa..a1a5d4fb 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_21</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_21</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-input.obfl
index 60a5ad30..746216c2 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_21-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_21</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_21</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-expected.pef
index b39a6066..dc9af7da 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_22</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_22</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-input.obfl
index 731b957a..13d03639 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_22-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_22</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_22</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="14" page-height="8" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-expected.pef
deleted file mode 100644
index d85f3ccb..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-expected.pef
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_23</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-input.obfl
deleted file mode 100644
index 1249229d..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_23-input.obfl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_23</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠤⠤⠤<br/>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-expected.pef
deleted file mode 100644
index c8cab029..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_24</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="40" rows="25" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-input.obfl
deleted file mode 100644
index 4687f339..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_24-input.obfl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_24</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block vertical-align="before" vertical-position="5">⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-expected.pef
index 0cf1b20f..a923abc5 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_25</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_25</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-input.obfl
index f34ed35e..cbd2d488 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_25-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_25</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_25</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="12" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-expected.pef
index 2089c0c1..5647e527 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_26</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_26</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-input.obfl
index d247446a..900b701a 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_26-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_26</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_26</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="20" page-height="15" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-expected.pef
index 492fdfae..943e0766 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_27</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_27</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-input.obfl
index 5082de6f..a91ea241 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_27-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_27</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_27</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-expected.pef
deleted file mode 100644
index c142d840..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-expected.pef
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_28</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-input.obfl
deleted file mode 100644
index 2a2f9f99..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_28-input.obfl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_28</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-expected.pef
deleted file mode 100644
index 5cea2540..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-expected.pef
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_29</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-input.obfl
deleted file mode 100644
index d2b38a38..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_29-input.obfl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_29</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      <block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-expected.pef
deleted file mode 100644
index 977dbd6f..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_30</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row/>
-               <row rowgap="4">⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row/>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-input.obfl
deleted file mode 100644
index 8a254a3b..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_30-input.obfl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_30</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block margin-bottom="1"><block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      </block>
-      <block margin-top="1" margin-bottom="1"><block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      </block>
-      <block margin-top="1"><block row-spacing="2.0">⠿⠿⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿⠿⠿</block>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-expected.pef
index 16d6dba4..b249eb4a 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_31</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_31</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-input.obfl
index 4ccf2c62..57a85f9c 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_31-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_31</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_31</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-expected.pef
deleted file mode 100644
index bec03868..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-expected.pef
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_32</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="40" rows="25" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row rowgap="4">⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠿⠿⠿⠿⠿⠿⠿⠿</row>
-               <row/>
-               <row>⠿⠿⠿⠿⠿⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-input.obfl
deleted file mode 100644
index c854e871..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_32-input.obfl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_32</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block margin-bottom="1"><block row-spacing="2.0" align="center">⠿⠿⠿⠿⠿⠿⠿⠿ </block>
-      </block>
-      <block>⠿⠿⠿⠿⠿⠿⠿⠿ </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-expected.pef
index 052591e9..5f3adc78 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_33</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_33</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-input.obfl
index 5e4135d8..cb7d00c8 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_33-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_33</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_33</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-expected.pef
index c8cfae4d..974044fd 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_34</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_34</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-input.obfl
index 79c3eae7..33d89f02 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_34-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_34</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_34</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-expected.pef
index da6ee8fe..d891d70d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_35</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_35</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-input.obfl
index 3f31f10e..34af79dd 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_35-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_35</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_35</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-expected.pef
index b940bdf4..bf7339ef 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_36</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_36</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-input.obfl
index f8f5ad4c..9d25adfb 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_36-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_36</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_36</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-expected.pef
index d7f333d9..4135b245 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_37</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_37</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-input.obfl
index 8e3bf1a7..29075060 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_37-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_37</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_37</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-expected.pef
index 82d4ff7f..bd30f753 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_38</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_38</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-input.obfl
index b233b3fe..3fe86dae 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_38-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_38</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_38</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-expected.pef
index 16168c4f..5aa1e786 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_39</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_39</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-input.obfl
index f20b8f68..59e5c7b5 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_39-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_39</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_39</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-expected.pef
deleted file mode 100644
index ecd1cc1d..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-expected.pef
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_40</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="25" cols="40" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠼⠁</row>
-               <row>⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-input.obfl
deleted file mode 100644
index e750fdf7..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_40-input.obfl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_40</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="40" page-height="25" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><page-number ref-id="foo" number-format="default"/>
-      </block>
-      <block/>
-      <block id="foo">⠿
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-expected.pef
deleted file mode 100644
index c11396e5..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-expected.pef
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_41</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="8" cols="12" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠿⠿⠿⠿⠿⠀⠿⠿⠿⠤</row>
-               <row>⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿</row>
-               <row>⠿⠿⠿⠿⠿⠿</row>
-               <row>⠼⠁⠀⠿⠿⠿</row>
-               <row>⠂⠀⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-input.obfl
deleted file mode 100644
index c706ce33..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_41-input.obfl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_41</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="12" page-height="8" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠿⠿⠿­⠿⠿⠿ ⠿⠿⠿­⠿⠿⠿
-            </block>
-      <block hyphenate="false">⠿⠿⠿⠿⠿⠿ ⠿⠿⠿⠿⠿⠿
-            </block>
-      <block>1 ⠿⠿⠿
-            </block>
-      <block>⠂ ⠿⠿⠿
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-expected.pef
index 9ef3666f..3b2e93e4 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_42</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_42</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-input.obfl
index 3fafbac4..02d95a40 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_42-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_42</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_42</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-expected.pef
index 4a9f7edf..d949345d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_43</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_43</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-input.obfl
index 7e1d0276..da1b532c 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_43-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_43</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_43</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-expected.pef
index 02f2de74..9809a7ac 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_44</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_44</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-input.obfl
index 4446c93e..d48e8333 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_44-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_44</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_44</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-expected.pef
index 6382ec86..a1585129 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_45</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_45</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-input.obfl
index 118afc12..81fa3166 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_45-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_45</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_45</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-expected.pef
index 6cb24b1d..c6282cb1 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_46</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_46</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-input.obfl
index 3c034dd6..52ed0fa5 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_46-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_46</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_46</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-expected.pef
deleted file mode 100644
index 9830eabe..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-expected.pef
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_47</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="15" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿</row>
-               <row>⠿</row>
-               <row>⠿</row>
-               <row>⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-               <row>⠆⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠿</row>
-               <row>⠿</row>
-               <row>⠿</row>
-               <row>⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-               <row>⠆⠆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-input.obfl
deleted file mode 100644
index b9920b44..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_47-input.obfl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_47</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value="⠆"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-         <footer>
-            <field>
-               <string value="⠆⠆"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠿ </block>
-      <block>⠿ </block>
-      <block>⠿ </block>
-      <block>⠿ </block>
-      <block>⠿ </block>
-      <block>⠿ </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-expected.pef
deleted file mode 100644
index 34be2cfd..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-expected.pef
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_48</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="20" rows="6" rowgap="0" duplex="true">
-         <section>
-            <!-- right -->
-            <page>
-               <!-- print page 1 -->
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠼⠁⠒⠼⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠁⠒⠼⠁</row> <!-- 1-1   ...   1-1 -->
-            </page>
-            <!-- left -->
-            <page>
-               <!-- print page 2 -->
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠼⠃⠒⠼⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 2-2 -->
-            </page>
-            <!-- right -->
-            <page>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <!-- print page 3 -->
-               <row>⠁⠁⠁</row>
-               <!-- print page 4 -->
-               <row>⠼⠃⠒⠼⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠃⠒⠼⠉</row> <!-- 2-3   ...   2-3 -->
-            </page>
-            <!-- left -->
-            <page>
-               <row>⠁⠁⠁</row>
-               <!-- print page 5 -->
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠼⠙⠒⠼⠑⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 4-5 -->
-            </page>
-            <!-- right -->
-            <page>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <!-- print page 6 -->
-               <row/>
-               <row>⠼⠑⠒⠼⠑⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠙⠒⠼⠑</row> <!-- 5-5   ...   4-5 -->
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-input.obfl
deleted file mode 100644
index 489c0938..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_48-input.obfl
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_48</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="6" duplex="true" page-number-variable="page">
-      <template use-when="(= (% $page 2) 1)">
-         <header/>
-         <footer>
-            <field>
-               <marker-reference marker="print-page/prev" direction="forward" scope="page-content" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-               <marker-reference marker="dash-print-page" direction="backward" scope="page-content"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="print-page/prev" direction="forward" scope="page-content" text-style="def:tmp" start-offset="-1"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp" start-offset="-1"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-               <marker-reference marker="dash-print-page" direction="backward" scope="spread"/>
-            </field>
-         </footer>
-      </template>
-      <template use-when="(= (% $page 2) 0)">
-         <header/>
-         <footer>
-            <field>
-               <marker-reference marker="print-page/prev" direction="forward" scope="page-content" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-               <marker-reference marker="dash-print-page" direction="backward" scope="page-content"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-      </template>
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <!-- begin right page -->
-      <block><marker class="print-page/prev" value="​"/><marker class="print-page" value="1"/><marker class="dash-print-page/prev" value="​"/><marker class="dash-print-page" value="⠒1"/>⠁⠁⠁
-            </block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <!-- begin left page -->
-      <block><marker class="print-page/prev" value="1"/><marker class="print-page" value="2"/><marker class="dash-print-page/prev" value="⠒1"/><marker class="dash-print-page" value="⠒2"/>⠁⠁⠁
-            </block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <!-- begin right page -->
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block><marker class="print-page/prev" value="2"/><marker class="print-page" value="3"/><marker class="dash-print-page/prev" value="⠒2"/><marker class="dash-print-page" value="⠒3"/>⠁⠁⠁
-            </block>
-      <!-- begin left page -->
-      <block><marker class="print-page/prev" value="3"/><marker class="print-page" value="4"/><marker class="dash-print-page/prev" value="⠒3"/><marker class="dash-print-page" value="⠒4"/>⠁⠁⠁
-            </block>
-      <block><marker class="print-page/prev" value="4"/><marker class="print-page" value="5"/><marker class="dash-print-page/prev" value="⠒4"/><marker class="dash-print-page" value="⠒5"/>⠁⠁⠁
-            </block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <!-- begin right page -->
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-expected.pef
index d0f6fa30..bbc3b53c 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_49</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_49</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-input.obfl
index 2c4a7868..dbb81075 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_49-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_49</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_49</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="main" page-width="15" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-expected.pef
index 4aec6c7e..8406b589 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_50</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_50</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-input.obfl
index 4b6e0b08..2ea3659d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_50-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_50</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_50</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="main" page-width="10" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-expected.pef
index 6423ce7b..1ff891aa 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_51</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_51</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-input.obfl
index 198fbfd0..2d328f4f 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_51-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_51</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_format.xprocspec/test_51</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="main" page-width="10" page-height="5" duplex="true" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-expected.pef
deleted file mode 100644
index dd769f9b..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-expected.pef
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_52</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="20" rows="6" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <!-- 1 -->
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <!-- 2 -->
-               <row>⠁⠁⠁</row>
-               <row>⠁⠁⠁</row>
-               <row/>
-               <row>⠼⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 1 -->
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-input.obfl
deleted file mode 100644
index 5d3fdc83..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_52-input.obfl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_52</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="6" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <marker-reference marker="print-page/prev" direction="forward" scope="page-content" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block><marker class="print-page/prev" value="​"/><marker class="print-page" value="1"/>⠁⠁⠁
-            </block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block>⠁⠁⠁</block>
-      <block><marker class="print-page/prev" value="1"/><marker class="print-page" value="2"/>⠁⠁⠁
-            </block>
-      <block>⠁⠁⠁</block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-expected.pef
deleted file mode 100644
index 5f1119b1..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-expected.pef
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_53</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="10" rows="6" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <!-- 1 -->
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠼⠁⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 1 -->
-            </page>
-            <page>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <!-- 2 -->
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠼⠁⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 1 -->
-            </page>
-            <page>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <!-- 3 -->
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠼⠃⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 2 -->
-            </page>
-            <page>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <!-- 4 -->
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row>⠼⠉⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 3 -->
-            </page>
-            <page>
-               <row>⠁⠁⠁⠁⠁</row>
-               <row/>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠼⠙⠀⠀⠀⠀⠀⠀⠀⠀</row> <!-- 4 -->
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-input.obfl
deleted file mode 100644
index a6b1d5fe..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_53-input.obfl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_53</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="10" page-height="6" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <marker-reference marker="print-page/prev" direction="forward" scope="page-content" text-style="def:tmp"/>
-               <marker-reference marker="print-page" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="print-page/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><marker class="print-page/prev" value="​"/><marker class="print-page" value="1"/>⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              <marker class="print-page/prev" value="1"/>
-         <marker class="print-page" value="2"/>
-      </block>
-      <block>⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-            </block>
-      <block><marker class="print-page/prev" value="2"/><marker class="print-page" value="3"/>⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              <marker class="print-page/prev" value="3"/>
-         <marker class="print-page" value="4"/>
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-              ⠁⠁⠁⠁⠁
-            </block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-expected.pef
deleted file mode 100644
index 0a504035..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-expected.pef
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_54</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume rows="5" cols="10" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠿⠀⠀⠀⠀⠀⠀⠀⠀⠿</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤⠀⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠿⠿⠀⠀⠀⠀⠀⠀⠀⠿</row>
-            </page>
-         </section>
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠿⠿⠿⠀⠀⠀⠀⠿⠿⠿</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-input.obfl
deleted file mode 100644
index 86f473a7..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_54-input.obfl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_54</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="10" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <marker-reference marker="foo" direction="forward" scope="page" text-style="def:tmp"/>
-               <marker-reference marker="foo" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="foo/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="foo/prev" direction="forward" scope="page-content" text-style="def:tmp"/>
-               <marker-reference marker="foo" direction="backward" scope="sequence" text-style="defifndef:tmp"/>
-               <marker-reference marker="foo/entry" direction="backward" scope="sequence" text-style="ifndef:tmp"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><marker class="foo/prev" value="​"/><marker class="foo" value="⠿"/>⠤⠤⠤
-            </block>
-   </sequence>
-   <sequence master="a">
-      <block><marker class="foo/entry" value="⠿"/></block>
-      <block>⠤⠤⠤
-              <marker class="foo/prev" value="⠿"/>
-         <marker class="foo" value="⠿⠿"/>
-              ⠤⠤⠤
-            </block>
-   </sequence>
-   <sequence master="a">
-      <block><marker class="foo/entry" value="⠿⠿"/></block>
-      <block><marker class="foo/prev" value="⠿⠿"/><marker class="foo" value="⠿⠿⠿"/>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-expected.pef
deleted file mode 100644
index ce86c9dd..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-expected.pef
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_55</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="15" rows="5" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-input.obfl
deleted file mode 100644
index 707a38ed..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_55-input.obfl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_55</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-         <margin-region align="left" width="2">
-            <indicators/>
-         </margin-region>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block>⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-expected.pef
deleted file mode 100644
index 37c0de73..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_56</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="15" rows="5" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠿⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠿⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-input.obfl
deleted file mode 100644
index b0630170..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_56-input.obfl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_56</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-         <margin-region align="left" width="2">
-            <indicators>
-               <marker-indicator markers="indicator/pagenum" indicator="⠿"/>
-            </indicators>
-         </margin-region>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><marker class="indicator/pagenum" value="x"/>⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              <marker class="indicator/pagenum" value="x"/>
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              <marker class="indicator/pagenum" value="x"/>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-expected.pef
deleted file mode 100644
index a6279fe9..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_57</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="15" rows="5" rowgap="0" duplex="true">
-         <section>
-            <page>
-               <row>⠿⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠿⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠀⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-               <row>⠿⠤⠤⠤⠀⠤⠤⠤⠀⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-input.obfl
deleted file mode 100644
index 47f4763e..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_format.xprocspec/test_57-input.obfl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_57</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="body" page-width="15" page-height="5" duplex="true" page-number-variable="page">
-      <default-template>
-         <header/>
-         <footer/>
-         <margin-region align="left" width="1">
-            <indicators>
-               <marker-indicator markers="indicator/pagenum" indicator="⠿"/>
-            </indicators>
-         </margin-region>
-      </default-template>
-   </layout-master>
-   <sequence master="body">
-      <block><marker class="indicator/pagenum" value="x"/>⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              <marker class="indicator/pagenum" value="x"/>
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              ⠤⠤⠤ ⠤⠤⠤ ⠤⠤⠤
-              <marker class="indicator/pagenum" value="x"/>
-      </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-expected.pef
deleted file mode 100644
index f576036c..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-expected.pef
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_01</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="20" rows="5" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠤⠤⠤</row>
-               <row/>
-               <row/>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-input.obfl
deleted file mode 100644
index 60232b5d..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_01-input.obfl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_01</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="5" duplex="false">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="print-page" direction="backward" scope="sequence"/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><marker class="print-page" value="⠤"/>⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-expected.pef
index 631a8d64..7f1d87c0 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_02</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_02</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-input.obfl
index 94511833..e7ea236d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_02-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_02</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_02</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="40" page-height="25">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-expected.pef
index 697d43bb..555acef4 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_03</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_03</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-input.obfl
index 5ef4d062..7fbfabef 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_03-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_03</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_03</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="40" page-height="25">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-expected.pef
index a9607d92..27e5ec49 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_04</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_04</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-input.obfl
index 58da336a..a71a810f 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_04-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_04</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_04</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="10" page-height="25">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-expected.pef
index 4f9d6f6a..b26eb8e1 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_05</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_05</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-input.obfl
index 67ab99e8..38991f0b 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_05-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_05</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_05</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="20" page-height="10" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-expected.pef
index d6ffcf78..7fdf411d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_06</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_06</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-input.obfl
index c06fac2b..f39eec0e 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_06-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_06</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_06</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="20" page-height="10" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-expected.pef
deleted file mode 100644
index 145d597b..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-expected.pef
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_07</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="40" rows="25" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠞⠺⠕</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-input.obfl
deleted file mode 100644
index 658878f6..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_07-input.obfl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_07</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" duplex="false" page-width="40" page-height="25">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block><page-number ref-id="x" number-format="default"/>
-      </block>
-      <block break-before="page" id="x">⠤⠤⠤
-              </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-expected.pef
index af82a750..4a70e723 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_08</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_08</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-input.obfl
index 8e1c4eda..51947ed8 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_08-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_08</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_08</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="20" page-height="10" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-expected.pef
index ca64c581..e7760ce6 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_09</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_09</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-input.obfl
index e09bd497..0b693312 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_09-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_09</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_09</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="20" page-height="10" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-expected.pef
deleted file mode 100644
index 40e57326..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-expected.pef
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_10</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="20" rows="10" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠀⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-input.obfl
deleted file mode 100644
index 3a4eb6dc..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_10-input.obfl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_10</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="20" page-height="10" duplex="false">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠤⠤⠤⠀⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤⠤⠤⠀⠤⠤⠤⠤⠤⠤⠤⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-expected.pef
index fcbbc5e1..b479436e 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_11</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_11</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-input.obfl
index d3dceb2e..d1072ba1 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_11-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_11</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_11</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="40" page-height="25" row-spacing="2.0">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-expected.pef
index 3cefaf5e..4975004e 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_12</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_12</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-input.obfl
index ef8321c4..94dc5587 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_12-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_12</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_12</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="40" page-height="25">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-expected.pef
index 3c09705c..99759099 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_13</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_13</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-input.obfl
index b3fc1236..8f57f9f5 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_13-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_13</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_13</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="true" page-width="40" page-height="75">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-expected.pef
index 835feacd..9dd88ec2 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_14</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_14</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-input.obfl
index 38b98adb..864915d4 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_14-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_14</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_14</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="true" page-width="40" page-height="35">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-expected.pef
index 560a03e3..a6ba1c8d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_15</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_15</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-input.obfl
index 3ae892d5..80cf86b9 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_15-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_15</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_15</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="40" page-height="25" duplex="false" page-number-variable="page">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-expected.pef
index bf0b3c98..2066426b 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_16</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_16</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-input.obfl
index e0e0a0f4..51a66070 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_16-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_16</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_16</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="10" page-height="6" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-expected.pef
index cee8c637..7941efde 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_17</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_17</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-input.obfl
index 824d4293..3cc4694e 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_17-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_17</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_17</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="10" page-height="6" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-expected.pef
index c36f8ad5..36cbd7b1 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_18</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_18</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-input.obfl
index 34b00d99..1092a28a 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_18-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_18</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_18</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="10" page-height="6" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-expected.pef
index ae5e2fd9..e58aeedb 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_19</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_19</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-input.obfl
index d70c1a38..dc7a7989 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_19-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_19</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_19</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="10" page-height="6" duplex="false">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-expected.pef
index 8ec1a8df..8627b2ce 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_20</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_20</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-input.obfl
index 67d9f28c..f8a6096d 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_20-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_20</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_20</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="10" page-height="25">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-expected.pef
index 406c22ae..893002c4 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_21</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_21</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-input.obfl
index bfbb9d1b..90db33e5 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_21-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_21</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_21</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" duplex="false" page-width="10" page-height="5">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-expected.pef
deleted file mode 100644
index 2657362c..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-expected.pef
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_22</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="10" rows="5" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-      <volume cols="10" rows="5" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-input.obfl
deleted file mode 100644
index 8505ec76..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_22-input.obfl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_22</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" duplex="false" page-width="10" page-height="5">
-      <default-template>
-         <header/>
-         <footer/>
-      </default-template>
-   </layout-master>
-   <volume-template use-when="(= $volume 1)" sheets-in-volume-max="4"/>
-   <volume-template use-when="(&gt; $volume 1)" sheets-in-volume-max="3"/>
-   <sequence master="a">
-      <block>⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-                ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-expected.pef
index 0e787301..8b5bcaea 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_23</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_23</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-input.obfl
index 6c90af13..68983328 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_23-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_23</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_23</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="master" duplex="true" page-number-variable="page" page-width="10" page-height="5">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-expected.pef
index aa4bf341..f6a48430 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_24</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_24</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-input.obfl
index 4cbe80cd..3084f567 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_24-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_24</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_24</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="master" duplex="true" page-number-variable="page" page-width="10" page-height="5">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-expected.pef
index 5d061a53..8dad0f24 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_25</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_25</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-input.obfl
index 6f714ee1..bf70fd89 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_25-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_25</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_25</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="master" duplex="true" page-number-variable="page" page-width="10" page-height="6">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-expected.pef
deleted file mode 100644
index 72d30882..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-expected.pef
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
-   <head>
-      <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_26</dc:title>
-         <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-         <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
-      </meta>
-   </head>
-   <body>
-      <volume cols="11" rows="6" rowgap="0" duplex="false">
-         <section>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠀⠀⠀⠀⠀⠿⠀⠀⠀⠀⠀</row>
-            </page>
-            <page>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row>⠤⠤⠤⠤⠀⠤⠤⠤⠤</row>
-               <row/>
-               <row>⠀⠀⠀⠀⠀⠿⠀⠀⠀⠀⠀</row>
-            </page>
-         </section>
-      </volume>
-   </body>
-</pef>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-input.obfl
deleted file mode 100644
index 29f5b656..00000000
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_26-input.obfl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
-   <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_26</dc:title>
-      <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
-   </meta>
-   <layout-master name="a" page-width="11" page-height="6" duplex="false">
-      <default-template>
-         <header/>
-         <footer>
-            <field>
-               <string value=""/>
-            </field>
-            <field>
-               <marker-reference marker="foo" direction="backward" scope="sequence"/>
-            </field>
-            <field>
-               <string value=""/>
-            </field>
-         </footer>
-      </default-template>
-   </layout-master>
-   <sequence master="a">
-      <block>⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤
-              <marker class="foo" value="⠿"/>
-              ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-              ⠤⠤⠤⠤ ⠤⠤⠤⠤
-            </block>
-   </sequence>
-</obfl>
\ No newline at end of file
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef
index 26e2a93a..b6d79e84 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_27</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_27</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl
index e586574a..57760e10 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_27-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_27</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_27</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="15" page-height="5" duplex="true">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef
index 14827459..1caa1b2c 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_28</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_28</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl
index ab6b209a..440f2b22 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_28-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_28</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_28</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="body" page-width="15" page-height="5" duplex="true">
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-expected.pef b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-expected.pef
index abcadb7e..9ba1fbac 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-expected.pef
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-expected.pef
@@ -2,7 +2,7 @@
 <pef xmlns="http://www.daisy.org/ns/2008/pef" version="2008-1">
    <head>
       <meta>
-         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_29</dc:title>
+         <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_29</dc:title>
          <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
          <dc:format xmlns:dc="http://purl.org/dc/elements/1.1/">application/x-pef+xml</dc:format>
       </meta>
diff --git a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-input.obfl b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-input.obfl
index c1ea8b0f..995e5ada 100644
--- a/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-input.obfl
+++ b/dotify.formatter.impl/test/org/daisy/dotify/engine/impl/resource-files/test_obfl-to-pef.xprocspec/test_29-input.obfl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="und" hyphenate="false">
    <meta>
-      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_29</dc:title>
+      <dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">test_obfl-to-pef.xprocspec/test_29</dc:title>
       <dc:description xmlns:dc="http://purl.org/dc/elements/1.1/"/>
    </meta>
    <layout-master name="a" page-width="10" page-height="6" duplex="true" page-number-variable="page">