125 files changed, 57 insertions, 57 deletions

diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs
index fd6d01d2d..fd9871659 100644
--- a/test/Tests/Writers/Powerpoint.hs
+++ b/test/Tests/Writers/Powerpoint.hs
@@ -15,13 +15,13 @@ import Data.List (unzip4)
 
 modifyPptxName :: FilePath -> String -> FilePath
 modifyPptxName fp suffix =
-  addExtension (dropExtension fp ++ suffix) "pptx"
+  addExtension (takeDirectory fp ++ suffix) "pptx"
 
 pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree)
 pptxTests name opts native pptx =
-  let referenceDoc = "pptx/reference_depth.pptx"
-      movedLayoutsReferenceDoc = "pptx/reference_moved_layouts.pptx"
-      deletedLayoutsReferenceDoc = "pptx/reference_deleted_layouts.pptx"
+  let referenceDoc = "pptx/reference-depth.pptx"
+      movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx"
+      deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx"
   in
     ( ooxmlTest
       writePowerpoint
@@ -34,19 +34,19 @@ pptxTests name opts native pptx =
       name
       opts{writerReferenceDoc=Just referenceDoc}
       native
-      (modifyPptxName pptx "_templated")
+      (modifyPptxName pptx "/templated")
     , ooxmlTest
       writePowerpoint
       name
       opts{writerReferenceDoc=Just movedLayoutsReferenceDoc}
       native
-      (modifyPptxName pptx "_moved_layouts")
+      (modifyPptxName pptx "/moved-layouts")
     , ooxmlTest
       writePowerpoint
       name
       opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc}
       native
-      (modifyPptxName pptx "_deleted_layouts")
+      (modifyPptxName pptx "/deleted-layouts")
     )
 
 groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree]
@@ -63,112 +63,112 @@ groupPptxTests pairs =
 tests :: [TestTree]
 tests = groupPptxTests [ pptxTests "Inline formatting"
                          def
-                         "pptx/inline_formatting.native"
-                         "pptx/inline_formatting.pptx"
+                         "pptx/inline-formatting/input.native"
+                         "pptx/inline-formatting/output.pptx"
                        , pptxTests "Slide breaks (default slide-level)"
                          def
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks/output.pptx"
                        , pptxTests "slide breaks (slide-level set to 1)"
                          def{ writerSlideLevel = Just 1 }
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks_slide_level_1.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks-slide-level-1/output.pptx"
                        , pptxTests "lists"
                          def
-                         "pptx/lists.native"
-                         "pptx/lists.pptx"
+                         "pptx/lists/input.native"
+                         "pptx/lists/output.pptx"
                        , pptxTests "start ordered list at specified num"
                          def
-                         "pptx/start_numbering_at.native"
-                         "pptx/start_numbering_at.pptx"
+                         "pptx/start-numbering-at/input.native"
+                         "pptx/start-numbering-at/output.pptx"
                        , pptxTests "tables"
                          def
-                         "pptx/tables.native"
-                         "pptx/tables.pptx"
+                         "pptx/tables/input.native"
+                         "pptx/tables/output.pptx"
                        , pptxTests "table of contents"
                          def{ writerTableOfContents = True }
-                         "pptx/slide_breaks.native"
-                         "pptx/slide_breaks_toc.pptx"
+                         "pptx/slide-breaks/input.native"
+                         "pptx/slide-breaks-toc/output.pptx"
                        , pptxTests "end notes"
                          def
-                         "pptx/endnotes.native"
-                         "pptx/endnotes.pptx"
+                         "pptx/endnotes/input.native"
+                         "pptx/endnotes/output.pptx"
                        , pptxTests "end notes, with table of contents"
                          def { writerTableOfContents = True }
-                         "pptx/endnotes.native"
-                         "pptx/endnotes_toc.pptx"
+                         "pptx/endnotes/input.native"
+                         "pptx/endnotes-toc/output.pptx"
                        , pptxTests "images"
                          def
-                         "pptx/images.native"
-                         "pptx/images.pptx"
+                         "pptx/images/input.native"
+                         "pptx/images/output.pptx"
                        , pptxTests "two-column layout"
                          def
-                         "pptx/two_column.native"
-                         "pptx/two_column.pptx"
+                         "pptx/two-column/input.native"
+                         "pptx/two-column/output.pptx"
                        , pptxTests "speaker notes"
                          def
-                         "pptx/speaker_notes.native"
-                         "pptx/speaker_notes.pptx"
+                         "pptx/speaker-notes/input.native"
+                         "pptx/speaker-notes/output.pptx"
                        , pptxTests "speaker notes after a separating block"
                          def
-                         "pptx/speaker_notes_afterseps.native"
-                         "pptx/speaker_notes_afterseps.pptx"
+                         "pptx/speaker-notes-afterseps/input.native"
+                         "pptx/speaker-notes-afterseps/output.pptx"
                        , pptxTests "speaker notes after a separating header"
                          def
-                         "pptx/speaker_notes_afterheader.native"
-                         "pptx/speaker_notes_afterheader.pptx"
+                         "pptx/speaker-notes-afterheader/input.native"
+                         "pptx/speaker-notes-afterheader/output.pptx"
                        , pptxTests "speaker notes after metadata"
                          def
-                         "pptx/speaker_notes_after_metadata.native"
-                         "pptx/speaker_notes_after_metadata.pptx"
+                         "pptx/speaker-notes-after-metadata/input.native"
+                         "pptx/speaker-notes-after-metadata/output.pptx"
                        , pptxTests "remove empty slides"
                          def
-                         "pptx/remove_empty_slides.native"
-                         "pptx/remove_empty_slides.pptx"
+                         "pptx/remove-empty-slides/input.native"
+                         "pptx/remove-empty-slides/output.pptx"
                        , pptxTests "raw ooxml"
                          def
-                         "pptx/raw_ooxml.native"
-                         "pptx/raw_ooxml.pptx"
+                         "pptx/raw-ooxml/input.native"
+                         "pptx/raw-ooxml/output.pptx"
                        , pptxTests "metadata, custom properties"
                          def
-                         "pptx/document-properties.native"
-                         "pptx/document-properties.pptx"
+                         "pptx/document-properties/input.native"
+                         "pptx/document-properties/output.pptx"
                        , pptxTests "metadata, short description"
                          def
-                         "pptx/document-properties-short-desc.native"
-                         "pptx/document-properties-short-desc.pptx"
+                         "pptx/document-properties-short-desc/input.native"
+                         "pptx/document-properties-short-desc/output.pptx"
                        , pptxTests "inline code and code blocks"
                          def
-                         "pptx/code.native"
-                         "pptx/code.pptx"
+                         "pptx/code/input.native"
+                         "pptx/code/output.pptx"
                        , pptxTests "inline code and code blocks, custom formatting"
                          def { writerVariables = Context $ M.fromList
                                  [(pack "monofont", toVal $ pack "Consolas")] }
-                         "pptx/code.native"
-                         "pptx/code-custom.pptx"
+                         "pptx/code/input.native"
+                         "pptx/code-custom/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a h1 it's used as the "
                                     <> "slide title")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-with-image.native"
-                         "pptx/slide-level-0-h1-with-image.pptx"
+                         "pptx/slide-level-0/h1-with-image/input.native"
+                         "pptx/slide-level-0/h1-with-image/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a h2 it's used as the "
                                     <> "slide title")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h2-with-image.native"
-                         "pptx/slide-level-0-h2-with-image.pptx"
+                         "pptx/slide-level-0/h2-with-image/input.native"
+                         "pptx/slide-level-0/h2-with-image/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a heading it's used as the "
                                     <> "slide title (works with a table)")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-with-table.native"
-                         "pptx/slide-level-0-h1-with-table.pptx"
+                         "pptx/slide-level-0/h1-with-table/input.native"
+                         "pptx/slide-level-0/h1-with-table/output.pptx"
                        , pptxTests ("Using slide level 0, if the first thing on "
                                     <> "a slide is a heading it's used as the "
                                     <> "slide title (two headings forces a "
                                     <> "slide break though)")
                          def { writerSlideLevel = Just 0 }
-                         "pptx/slide-level-0-h1-h2-with-table.native"
-                         "pptx/slide-level-0-h1-h2-with-table.pptx"
+                         "pptx/slide-level-0/h1-h2-with-table/input.native"
+                         "pptx/slide-level-0/h1-h2-with-table/output.pptx"
                        ]
diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx
index 9282e6354..9282e6354 100644
--- a/test/pptx/code-custom_deleted_layouts.pptx
+++ b/test/pptx/code-custom/deleted-layouts.pptx
diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx
index a14eeb6c8..a14eeb6c8 100644
--- a/test/pptx/code-custom_moved_layouts.pptx
+++ b/test/pptx/code-custom/moved-layouts.pptx
diff --git a/test/pptx/code-custom.pptx b/test/pptx/code-custom/output.pptx
index 5e9c2c630..5e9c2c630 100644
--- a/test/pptx/code-custom.pptx
+++ b/test/pptx/code-custom/output.pptx
diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/code-custom/templated.pptx
index 0e640f373..0e640f373 100644
--- a/test/pptx/code-custom_templated.pptx
+++ b/test/pptx/code-custom/templated.pptx
diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code/deleted-layouts.pptx
index 0f503f553..0f503f553 100644
--- a/test/pptx/code_deleted_layouts.pptx
+++ b/test/pptx/code/deleted-layouts.pptx
diff --git a/test/pptx/code.native b/test/pptx/code/input.native
index be7f512f7..be7f512f7 100644
--- a/test/pptx/code.native
+++ b/test/pptx/code/input.native
diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code/moved-layouts.pptx
index 4d66b1310..4d66b1310 100644
--- a/test/pptx/code_moved_layouts.pptx
+++ b/test/pptx/code/moved-layouts.pptx
diff --git a/test/pptx/code.pptx b/test/pptx/code/output.pptx
index aab0cc6f5..aab0cc6f5 100644
--- a/test/pptx/code.pptx
+++ b/test/pptx/code/output.pptx
diff --git a/test/pptx/code_templated.pptx b/test/pptx/code/templated.pptx
index a03109217..a03109217 100644
--- a/test/pptx/code_templated.pptx
+++ b/test/pptx/code/templated.pptx
diff --git a/test/pptx/document-properties-short-desc_deleted_layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
index e4cf6bd7b..e4cf6bd7b 100644
--- a/test/pptx/document-properties-short-desc_deleted_layouts.pptx
+++ b/test/pptx/document-properties-short-desc/deleted-layouts.pptx
diff --git a/test/pptx/document-properties-short-desc.native b/test/pptx/document-properties-short-desc/input.native
index fe3193dc1..fe3193dc1 100644
--- a/test/pptx/document-properties-short-desc.native
+++ b/test/pptx/document-properties-short-desc/input.native
diff --git a/test/pptx/document-properties-short-desc_moved_layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx
index 8834f885f..8834f885f 100644
--- a/test/pptx/document-properties-short-desc_moved_layouts.pptx
+++ b/test/pptx/document-properties-short-desc/moved-layouts.pptx
diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc/output.pptx
index de5e68151..de5e68151 100644
--- a/test/pptx/document-properties-short-desc.pptx
+++ b/test/pptx/document-properties-short-desc/output.pptx
diff --git a/test/pptx/document-properties-short-desc_templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx
index d39dc0c91..d39dc0c91 100644
--- a/test/pptx/document-properties-short-desc_templated.pptx
+++ b/test/pptx/document-properties-short-desc/templated.pptx
diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx
index a00c8059d..a00c8059d 100644
--- a/test/pptx/document-properties_deleted_layouts.pptx
+++ b/test/pptx/document-properties/deleted-layouts.pptx
diff --git a/test/pptx/document-properties.native b/test/pptx/document-properties/input.native
index 59ca53f4d..59ca53f4d 100644
--- a/test/pptx/document-properties.native
+++ b/test/pptx/document-properties/input.native
diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx
index c1d2d5282..c1d2d5282 100644
--- a/test/pptx/document-properties_moved_layouts.pptx
+++ b/test/pptx/document-properties/moved-layouts.pptx
diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties/output.pptx
index 6bcbd1b9c..6bcbd1b9c 100644
--- a/test/pptx/document-properties.pptx
+++ b/test/pptx/document-properties/output.pptx
diff --git a/test/pptx/document-properties_templated.pptx b/test/pptx/document-properties/templated.pptx
index 841ae8c42..841ae8c42 100644
--- a/test/pptx/document-properties_templated.pptx
+++ b/test/pptx/document-properties/templated.pptx
diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx
index 46708544c..46708544c 100644
--- a/test/pptx/endnotes_toc_deleted_layouts.pptx
+++ b/test/pptx/endnotes-toc/deleted-layouts.pptx
diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx
index d1200bd7d..d1200bd7d 100644
--- a/test/pptx/endnotes_toc_moved_layouts.pptx
+++ b/test/pptx/endnotes-toc/moved-layouts.pptx
diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes-toc/output.pptx
index a028b346f..a028b346f 100644
--- a/test/pptx/endnotes_toc.pptx
+++ b/test/pptx/endnotes-toc/output.pptx
diff --git a/test/pptx/endnotes_toc_templated.pptx b/test/pptx/endnotes-toc/templated.pptx
index 38a0c437d..38a0c437d 100644
--- a/test/pptx/endnotes_toc_templated.pptx
+++ b/test/pptx/endnotes-toc/templated.pptx
diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx
index 5c69a6310..5c69a6310 100644
--- a/test/pptx/endnotes_deleted_layouts.pptx
+++ b/test/pptx/endnotes/deleted-layouts.pptx
diff --git a/test/pptx/endnotes.native b/test/pptx/endnotes/input.native
index f6caeb62f..f6caeb62f 100644
--- a/test/pptx/endnotes.native
+++ b/test/pptx/endnotes/input.native
diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx
index 0d4c491b9..0d4c491b9 100644
--- a/test/pptx/endnotes_moved_layouts.pptx
+++ b/test/pptx/endnotes/moved-layouts.pptx
diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes/output.pptx
index 9d46036fe..9d46036fe 100644
--- a/test/pptx/endnotes.pptx
+++ b/test/pptx/endnotes/output.pptx
diff --git a/test/pptx/endnotes_templated.pptx b/test/pptx/endnotes/templated.pptx
index 863cc29d4..863cc29d4 100644
--- a/test/pptx/endnotes_templated.pptx
+++ b/test/pptx/endnotes/templated.pptx
diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images/deleted-layouts.pptx
index 053928863..053928863 100644
--- a/test/pptx/images_deleted_layouts.pptx
+++ b/test/pptx/images/deleted-layouts.pptx
diff --git a/test/pptx/images.native b/test/pptx/images/input.native
index 54827e5cc..54827e5cc 100644
--- a/test/pptx/images.native
+++ b/test/pptx/images/input.native
diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images/moved-layouts.pptx
index 7951a09f6..7951a09f6 100644
--- a/test/pptx/images_moved_layouts.pptx
+++ b/test/pptx/images/moved-layouts.pptx
diff --git a/test/pptx/images.pptx b/test/pptx/images/output.pptx
index 89325e577..89325e577 100644
--- a/test/pptx/images.pptx
+++ b/test/pptx/images/output.pptx
diff --git a/test/pptx/images_templated.pptx b/test/pptx/images/templated.pptx
index 7c0ed9a17..7c0ed9a17 100644
--- a/test/pptx/images_templated.pptx
+++ b/test/pptx/images/templated.pptx
diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx
index bbd5bfeb4..bbd5bfeb4 100644
--- a/test/pptx/inline_formatting_deleted_layouts.pptx
+++ b/test/pptx/inline-formatting/deleted-layouts.pptx
diff --git a/test/pptx/inline_formatting.native b/test/pptx/inline-formatting/input.native
index 164176af2..164176af2 100644
--- a/test/pptx/inline_formatting.native
+++ b/test/pptx/inline-formatting/input.native
diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx
index 427492130..427492130 100644
--- a/test/pptx/inline_formatting_moved_layouts.pptx
+++ b/test/pptx/inline-formatting/moved-layouts.pptx
diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline-formatting/output.pptx
index 473b9498d..473b9498d 100644
--- a/test/pptx/inline_formatting.pptx
+++ b/test/pptx/inline-formatting/output.pptx
diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline-formatting/templated.pptx
index dd778a102..dd778a102 100644
--- a/test/pptx/inline_formatting_templated.pptx
+++ b/test/pptx/inline-formatting/templated.pptx
diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists/deleted-layouts.pptx
index 6512e44bb..6512e44bb 100644
--- a/test/pptx/lists_deleted_layouts.pptx
+++ b/test/pptx/lists/deleted-layouts.pptx
diff --git a/test/pptx/lists.native b/test/pptx/lists/input.native
index 61249c7fe..61249c7fe 100644
--- a/test/pptx/lists.native
+++ b/test/pptx/lists/input.native
diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists/moved-layouts.pptx
index 2947c3211..2947c3211 100644
--- a/test/pptx/lists_moved_layouts.pptx
+++ b/test/pptx/lists/moved-layouts.pptx
diff --git a/test/pptx/lists.pptx b/test/pptx/lists/output.pptx
index ffc2eb9f7..ffc2eb9f7 100644
--- a/test/pptx/lists.pptx
+++ b/test/pptx/lists/output.pptx
diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists/templated.pptx
index 2493e7890..2493e7890 100644
--- a/test/pptx/lists_templated.pptx
+++ b/test/pptx/lists/templated.pptx
diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx
index 2ea155657..2ea155657 100644
--- a/test/pptx/raw_ooxml_deleted_layouts.pptx
+++ b/test/pptx/raw-ooxml/deleted-layouts.pptx
diff --git a/test/pptx/raw_ooxml.native b/test/pptx/raw-ooxml/input.native
index ae5bdd140..ae5bdd140 100644
--- a/test/pptx/raw_ooxml.native
+++ b/test/pptx/raw-ooxml/input.native
diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx
index e58304172..e58304172 100644
--- a/test/pptx/raw_ooxml_moved_layouts.pptx
+++ b/test/pptx/raw-ooxml/moved-layouts.pptx
diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw-ooxml/output.pptx
index 29164af15..29164af15 100644
--- a/test/pptx/raw_ooxml.pptx
+++ b/test/pptx/raw-ooxml/output.pptx
diff --git a/test/pptx/raw_ooxml_templated.pptx b/test/pptx/raw-ooxml/templated.pptx
index 0f20f9826..0f20f9826 100644
--- a/test/pptx/raw_ooxml_templated.pptx
+++ b/test/pptx/raw-ooxml/templated.pptx
diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference-deleted-layouts.pptx
index a9a74ecd5..a9a74ecd5 100644
--- a/test/pptx/reference_deleted_layouts.pptx
+++ b/test/pptx/reference-deleted-layouts.pptx
diff --git a/test/pptx/reference_depth.pptx b/test/pptx/reference-depth.pptx
index 97f444788..97f444788 100644
--- a/test/pptx/reference_depth.pptx
+++ b/test/pptx/reference-depth.pptx
diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference-moved-layouts.pptx
index 72c4f3fd7..72c4f3fd7 100644
--- a/test/pptx/reference_moved_layouts.pptx
+++ b/test/pptx/reference-moved-layouts.pptx
diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx
index 7ae4a5fab..7ae4a5fab 100644
--- a/test/pptx/remove_empty_slides_deleted_layouts.pptx
+++ b/test/pptx/remove-empty-slides/deleted-layouts.pptx
diff --git a/test/pptx/remove_empty_slides.native b/test/pptx/remove-empty-slides/input.native
index 51c042281..51c042281 100644
--- a/test/pptx/remove_empty_slides.native
+++ b/test/pptx/remove-empty-slides/input.native
diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx
index 2572f2447..2572f2447 100644
--- a/test/pptx/remove_empty_slides_moved_layouts.pptx
+++ b/test/pptx/remove-empty-slides/moved-layouts.pptx
diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/remove-empty-slides/output.pptx
index c6df8e18e..c6df8e18e 100644
--- a/test/pptx/remove_empty_slides.pptx
+++ b/test/pptx/remove-empty-slides/output.pptx
diff --git a/test/pptx/remove_empty_slides_templated.pptx b/test/pptx/remove-empty-slides/templated.pptx
index 1df48c5ad..1df48c5ad 100644
--- a/test/pptx/remove_empty_slides_templated.pptx
+++ b/test/pptx/remove-empty-slides/templated.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
index 2c7fd4d8b..2c7fd4d8b 100644
--- a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
index 8471b1d10..8471b1d10 100644
--- a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx
index 449339778..449339778 100644
--- a/test/pptx/slide_breaks_slide_level_1.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/output.pptx
diff --git a/test/pptx/slide_breaks_slide_level_1_templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx
index e2815159a..e2815159a 100644
--- a/test/pptx/slide_breaks_slide_level_1_templated.pptx
+++ b/test/pptx/slide-breaks-slide-level-1/templated.pptx
diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
index 1e0b76d46..1e0b76d46 100644
--- a/test/pptx/slide_breaks_toc_deleted_layouts.pptx
+++ b/test/pptx/slide-breaks-toc/deleted-layouts.pptx
diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx
index 918264bc5..918264bc5 100644
--- a/test/pptx/slide_breaks_toc_moved_layouts.pptx
+++ b/test/pptx/slide-breaks-toc/moved-layouts.pptx
diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide-breaks-toc/output.pptx
index 9dbfa41a0..9dbfa41a0 100644
--- a/test/pptx/slide_breaks_toc.pptx
+++ b/test/pptx/slide-breaks-toc/output.pptx
diff --git a/test/pptx/slide_breaks_toc_templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx
index b83f3f596..b83f3f596 100644
--- a/test/pptx/slide_breaks_toc_templated.pptx
+++ b/test/pptx/slide-breaks-toc/templated.pptx
diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx
index 86dfad3b2..86dfad3b2 100644
--- a/test/pptx/slide_breaks_deleted_layouts.pptx
+++ b/test/pptx/slide-breaks/deleted-layouts.pptx
diff --git a/test/pptx/slide_breaks.native b/test/pptx/slide-breaks/input.native
index 084c61737..084c61737 100644
--- a/test/pptx/slide_breaks.native
+++ b/test/pptx/slide-breaks/input.native
diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx
index 90b3b94a6..90b3b94a6 100644
--- a/test/pptx/slide_breaks_moved_layouts.pptx
+++ b/test/pptx/slide-breaks/moved-layouts.pptx
diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide-breaks/output.pptx
index e06d9079d..e06d9079d 100644
--- a/test/pptx/slide_breaks.pptx
+++ b/test/pptx/slide-breaks/output.pptx
diff --git a/test/pptx/slide_breaks_templated.pptx b/test/pptx/slide-breaks/templated.pptx
index 71ba99701..71ba99701 100644
--- a/test/pptx/slide_breaks_templated.pptx
+++ b/test/pptx/slide-breaks/templated.pptx
diff --git a/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
index 5e776e05c..5e776e05c 100644
--- a/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-h2-with-table.native b/test/pptx/slide-level-0/h1-h2-with-table/input.native
index c6e65ecf5..c6e65ecf5 100644
--- a/test/pptx/slide-level-0-h1-h2-with-table.native
+++ b/test/pptx/slide-level-0/h1-h2-with-table/input.native
diff --git a/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
index 35204de1b..35204de1b 100644
--- a/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-h2-with-table.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
index 197a6833f..197a6833f 100644
--- a/test/pptx/slide-level-0-h1-h2-with-table.pptx
+++ b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx
diff --git a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx
index 5c659952e..5c659952e 100644
--- a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx
+++ b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx
diff --git a/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
index 16c61d1be..16c61d1be 100644
--- a/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-with-image.native b/test/pptx/slide-level-0/h1-with-image/input.native
index 0f5033b54..0f5033b54 100644
--- a/test/pptx/slide-level-0-h1-with-image.native
+++ b/test/pptx/slide-level-0/h1-with-image/input.native
diff --git a/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
index 395036069..395036069 100644
--- a/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-with-image.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx
index 2f3a53f5c..2f3a53f5c 100644
--- a/test/pptx/slide-level-0-h1-with-image.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/output.pptx
diff --git a/test/pptx/slide-level-0-h1-with-image_templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx
index d306375e9..d306375e9 100644
--- a/test/pptx/slide-level-0-h1-with-image_templated.pptx
+++ b/test/pptx/slide-level-0/h1-with-image/templated.pptx
diff --git a/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
index 0eb7c0b08..0eb7c0b08 100644
--- a/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-with-table.native b/test/pptx/slide-level-0/h1-with-table/input.native
index b961e900d..b961e900d 100644
--- a/test/pptx/slide-level-0-h1-with-table.native
+++ b/test/pptx/slide-level-0/h1-with-table/input.native
diff --git a/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
index 197499bc3..197499bc3 100644
--- a/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx
+++ b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx
diff --git a/test/pptx/slide-level-0-h1-with-table.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx
index 44dbbf90c..44dbbf90c 100644
--- a/test/pptx/slide-level-0-h1-with-table.pptx
+++ b/test/pptx/slide-level-0/h1-with-table/output.pptx
diff --git a/test/pptx/slide-level-0-h1-with-table_templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx
index 87b45dda2..87b45dda2 100644
--- a/test/pptx/slide-level-0-h1-with-table_templated.pptx
+++ b/test/pptx/slide-level-0/h1-with-table/templated.pptx
diff --git a/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
index afc096ce6..afc096ce6 100644
--- a/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx
+++ b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx
diff --git a/test/pptx/slide-level-0-h2-with-image.native b/test/pptx/slide-level-0/h2-with-image/input.native
index 5def0cb92..5def0cb92 100644
--- a/test/pptx/slide-level-0-h2-with-image.native
+++ b/test/pptx/slide-level-0/h2-with-image/input.native
diff --git a/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
index 395036069..395036069 100644
--- a/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx
+++ b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx
diff --git a/test/pptx/slide-level-0-h2-with-image.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx
index 948659d6a..948659d6a 100644
--- a/test/pptx/slide-level-0-h2-with-image.pptx
+++ b/test/pptx/slide-level-0/h2-with-image/output.pptx
diff --git a/test/pptx/slide-level-0-h2-with-image_templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx
index d306375e9..d306375e9 100644
--- a/test/pptx/slide-level-0-h2-with-image_templated.pptx
+++ b/test/pptx/slide-level-0/h2-with-image/templated.pptx
diff --git a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
index 1298870e2..1298870e2 100644
--- a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx
+++ b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx
diff --git a/test/pptx/speaker_notes_after_metadata.native b/test/pptx/speaker-notes-after-metadata/input.native
index 6fda4b1ab..6fda4b1ab 100644
--- a/test/pptx/speaker_notes_after_metadata.native
+++ b/test/pptx/speaker-notes-after-metadata/input.native
diff --git a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
index b844a0b51..b844a0b51 100644
--- a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx
+++ b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx
diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx
index 6343bffe4..6343bffe4 100644
--- a/test/pptx/speaker_notes_after_metadata.pptx
+++ b/test/pptx/speaker-notes-after-metadata/output.pptx
diff --git a/test/pptx/speaker_notes_after_metadata_templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx
index 8d27c4c68..8d27c4c68 100644
--- a/test/pptx/speaker_notes_after_metadata_templated.pptx
+++ b/test/pptx/speaker-notes-after-metadata/templated.pptx
diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
index 853b918cb..853b918cb 100644
--- a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx
+++ b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx
diff --git a/test/pptx/speaker_notes_afterheader.native b/test/pptx/speaker-notes-afterheader/input.native
index 0f7dd95d7..0f7dd95d7 100644
--- a/test/pptx/speaker_notes_afterheader.native
+++ b/test/pptx/speaker-notes-afterheader/input.native
diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
index 9fff9f855..9fff9f855 100644
--- a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx
+++ b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx
diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker-notes-afterheader/output.pptx
index d581681aa..d581681aa 100644
--- a/test/pptx/speaker_notes_afterheader.pptx
+++ b/test/pptx/speaker-notes-afterheader/output.pptx
diff --git a/test/pptx/speaker_notes_afterheader_templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx
index d8d8481df..d8d8481df 100644
--- a/test/pptx/speaker_notes_afterheader_templated.pptx
+++ b/test/pptx/speaker-notes-afterheader/templated.pptx
diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
index 9fec1c279..9fec1c279 100644
--- a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx
+++ b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx
diff --git a/test/pptx/speaker_notes_afterseps.native b/test/pptx/speaker-notes-afterseps/input.native
index 4fd7b1ccb..4fd7b1ccb 100644
--- a/test/pptx/speaker_notes_afterseps.native
+++ b/test/pptx/speaker-notes-afterseps/input.native
diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
index de697cbd8..de697cbd8 100644
--- a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx
+++ b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx
diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker-notes-afterseps/output.pptx
index 9542fe8b5..9542fe8b5 100644
--- a/test/pptx/speaker_notes_afterseps.pptx
+++ b/test/pptx/speaker-notes-afterseps/output.pptx
diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx
index 5a3d15d57..5a3d15d57 100644
--- a/test/pptx/speaker_notes_afterseps_templated.pptx
+++ b/test/pptx/speaker-notes-afterseps/templated.pptx
diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx
index 6a5ad524f..6a5ad524f 100644
--- a/test/pptx/speaker_notes_deleted_layouts.pptx
+++ b/test/pptx/speaker-notes/deleted-layouts.pptx
diff --git a/test/pptx/speaker_notes.native b/test/pptx/speaker-notes/input.native
index 4eeca2107..4eeca2107 100644
--- a/test/pptx/speaker_notes.native
+++ b/test/pptx/speaker-notes/input.native
diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx
index f95df9622..f95df9622 100644
--- a/test/pptx/speaker_notes_moved_layouts.pptx
+++ b/test/pptx/speaker-notes/moved-layouts.pptx
diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker-notes/output.pptx
index 0ab1302da..0ab1302da 100644
--- a/test/pptx/speaker_notes.pptx
+++ b/test/pptx/speaker-notes/output.pptx
diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker-notes/templated.pptx
index 930377fbf..930377fbf 100644
--- a/test/pptx/speaker_notes_templated.pptx
+++ b/test/pptx/speaker-notes/templated.pptx
diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx
index d9cf91804..d9cf91804 100644
--- a/test/pptx/start_numbering_at_deleted_layouts.pptx
+++ b/test/pptx/start-numbering-at/deleted-layouts.pptx
diff --git a/test/pptx/start_numbering_at.native b/test/pptx/start-numbering-at/input.native
index ecffbb0ef..ecffbb0ef 100644
--- a/test/pptx/start_numbering_at.native
+++ b/test/pptx/start-numbering-at/input.native
diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx
index e1b2d4de8..e1b2d4de8 100644
--- a/test/pptx/start_numbering_at_moved_layouts.pptx
+++ b/test/pptx/start-numbering-at/moved-layouts.pptx
diff --git a/test/pptx/start_numbering_at.pptx b/test/pptx/start-numbering-at/output.pptx
index 4320128b3..4320128b3 100644
--- a/test/pptx/start_numbering_at.pptx
+++ b/test/pptx/start-numbering-at/output.pptx
diff --git a/test/pptx/start_numbering_at_templated.pptx b/test/pptx/start-numbering-at/templated.pptx
index efc56ac7a..efc56ac7a 100644
--- a/test/pptx/start_numbering_at_templated.pptx
+++ b/test/pptx/start-numbering-at/templated.pptx
diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables/deleted-layouts.pptx
index a52222551..a52222551 100644
--- a/test/pptx/tables_deleted_layouts.pptx
+++ b/test/pptx/tables/deleted-layouts.pptx
diff --git a/test/pptx/tables.native b/test/pptx/tables/input.native
index 27b843f2b..27b843f2b 100644
--- a/test/pptx/tables.native
+++ b/test/pptx/tables/input.native
diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables/moved-layouts.pptx
index 56608a039..56608a039 100644
--- a/test/pptx/tables_moved_layouts.pptx
+++ b/test/pptx/tables/moved-layouts.pptx
diff --git a/test/pptx/tables.pptx b/test/pptx/tables/output.pptx
index e41219844..e41219844 100644
--- a/test/pptx/tables.pptx
+++ b/test/pptx/tables/output.pptx
diff --git a/test/pptx/tables_templated.pptx b/test/pptx/tables/templated.pptx
index 0a8c3e8d9..0a8c3e8d9 100644
--- a/test/pptx/tables_templated.pptx
+++ b/test/pptx/tables/templated.pptx
diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx
index 60a244f94..60a244f94 100644
--- a/test/pptx/two_column_deleted_layouts.pptx
+++ b/test/pptx/two-column/deleted-layouts.pptx
diff --git a/test/pptx/two_column.native b/test/pptx/two-column/input.native
index 086f74889..086f74889 100644
--- a/test/pptx/two_column.native
+++ b/test/pptx/two-column/input.native
diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two-column/moved-layouts.pptx
index a17f96b18..a17f96b18 100644
--- a/test/pptx/two_column_moved_layouts.pptx
+++ b/test/pptx/two-column/moved-layouts.pptx
diff --git a/test/pptx/two_column.pptx b/test/pptx/two-column/output.pptx
index 270a7eeac..270a7eeac 100644
--- a/test/pptx/two_column.pptx
+++ b/test/pptx/two-column/output.pptx
diff --git a/test/pptx/two_column_templated.pptx b/test/pptx/two-column/templated.pptx
index 6d9470372..6d9470372 100644
--- a/test/pptx/two_column_templated.pptx
+++ b/test/pptx/two-column/templated.pptx