Moving some of the tests into subdirectories

56 files changed, 102 insertions, 102 deletions

diff --git a/tests/EX-locNote-element-1.pot b/tests/LocNote/EX-locNote-element-1.pot
index df06564..f889052 100644
--- a/tests/EX-locNote-element-1.pot
+++ b/tests/LocNote/EX-locNote-element-1.pot
@@ -12,7 +12,7 @@ msgstr ""
 #. (itstool) path: body/msg
 #. The variable {0} has three possible values: 'printer', 'stacker' and
 #. 'stapler options'.
-#: tests/EX-locNote-element-1.xml:12
+#: tests/LocNote/EX-locNote-element-1.xml:12
 msgid "The {0} has been disabled."
 msgstr ""
 
diff --git a/tests/EX-locNote-element-1.xml b/tests/LocNote/EX-locNote-element-1.xml
index ee04041..ee04041 100644
--- a/tests/EX-locNote-element-1.xml
+++ b/tests/LocNote/EX-locNote-element-1.xml
diff --git a/tests/EX-locNote-selector-2.pot b/tests/LocNote/EX-locNote-selector-2.pot
index 4ea79df..6932284 100644
--- a/tests/EX-locNote-selector-2.pot
+++ b/tests/LocNote/EX-locNote-selector-2.pot
@@ -11,7 +11,7 @@ msgstr ""
 
 #. (itstool) path: data/value
 #. Keep the leading space!
-#: tests/EX-locNote-selector-2.xml:5
+#: tests/LocNote/EX-locNote-selector-2.xml:5
 #, no-wrap
 msgid ""
 " Variant {0} = {1} ({2})"
@@ -20,7 +20,7 @@ msgstr ""
 #. (itstool) path: value/span
 #. %1\$s is the original text's date in the format YYYY-MM-DD HH:MM always
 #. in GMT
-#: tests/EX-locNote-selector-2.xml:8
+#: tests/LocNote/EX-locNote-selector-2.xml:8
 #, no-wrap
 msgid ""
 "%1\\$s"
@@ -29,7 +29,7 @@ msgstr ""
 #. (itstool) path: data/value
 #. %1\$s is the original text's date in the format YYYY-MM-DD HH:MM always
 #. in GMT
-#: tests/EX-locNote-selector-2.xml:8
+#: tests/LocNote/EX-locNote-selector-2.xml:8
 #, no-wrap
 msgid ""
 "Translated from English content dated <_:span-1/> GMT."
diff --git a/tests/EX-locNote-selector-2.xml b/tests/LocNote/EX-locNote-selector-2.xml
index 4b38f6a..4b38f6a 100644
--- a/tests/EX-locNote-selector-2.xml
+++ b/tests/LocNote/EX-locNote-selector-2.xml
diff --git a/tests/EX-locNotePointer-attribute-1.pot b/tests/LocNote/EX-locNotePointer-attribute-1.pot
index 178b2a1..7233c02 100644
--- a/tests/EX-locNotePointer-attribute-1.pot
+++ b/tests/LocNote/EX-locNotePointer-attribute-1.pot
@@ -11,13 +11,13 @@ msgstr ""
 
 #. (itstool) path: msg/data
 #. Indicates that the resource file {0} could not be loaded.
-#: tests/EX-locNotePointer-attribute-1.xml:12
+#: tests/LocNote/EX-locNotePointer-attribute-1.xml:12
 msgid "Cannot find the file {0}."
 msgstr ""
 
 #. (itstool) path: msg/data
 #. A division by 0 was going to be computed.
-#: tests/EX-locNotePointer-attribute-1.xml:16
+#: tests/LocNote/EX-locNotePointer-attribute-1.xml:16
 msgid "Invalid parameter."
 msgstr ""
 
diff --git a/tests/EX-locNotePointer-attribute-1.xml b/tests/LocNote/EX-locNotePointer-attribute-1.xml
index c897140..c897140 100644
--- a/tests/EX-locNotePointer-attribute-1.xml
+++ b/tests/LocNote/EX-locNotePointer-attribute-1.xml
diff --git a/tests/EX-locNoteRef-attribute-1.pot b/tests/LocNote/EX-locNoteRef-attribute-1.pot
index 05367fe..aba63f0 100644
--- a/tests/EX-locNoteRef-attribute-1.pot
+++ b/tests/LocNote/EX-locNoteRef-attribute-1.pot
@@ -11,7 +11,7 @@ msgstr ""
 
 #. (itstool) path: body/msg
 #. (itstool) link: ErrorsInfo.html/#NotFound
-#: tests/EX-locNoteRef-attribute-1.xml:10
+#: tests/LocNote/EX-locNoteRef-attribute-1.xml:10
 msgid "Cannot find {0} on {1}."
 msgstr ""
 
diff --git a/tests/EX-locNoteRef-attribute-1.xml b/tests/LocNote/EX-locNoteRef-attribute-1.xml
index 2a645a4..2a645a4 100644
--- a/tests/EX-locNoteRef-attribute-1.xml
+++ b/tests/LocNote/EX-locNoteRef-attribute-1.xml
diff --git a/tests/EX-locNoteRefPointer-attribute-1.pot b/tests/LocNote/EX-locNoteRefPointer-attribute-1.pot
index 4ed7edc..94b8ab1 100644
--- a/tests/EX-locNoteRefPointer-attribute-1.pot
+++ b/tests/LocNote/EX-locNoteRefPointer-attribute-1.pot
@@ -11,13 +11,13 @@ msgstr ""
 
 #. (itstool) path: string/data
 #. (itstool) link: Comments.html#FileNotFound
-#: tests/EX-locNoteRefPointer-attribute-1.xml:10
+#: tests/LocNote/EX-locNoteRefPointer-attribute-1.xml:10
 msgid "Cannot find the file {0}."
 msgstr ""
 
 #. (itstool) path: string/data
 #. (itstool) link: Comments.html#DivByZero
-#: tests/EX-locNoteRefPointer-attribute-1.xml:13
+#: tests/LocNote/EX-locNoteRefPointer-attribute-1.xml:13
 msgid "Invalid parameter."
 msgstr ""
 
diff --git a/tests/EX-locNoteRefPointer-attribute-1.xml b/tests/LocNote/EX-locNoteRefPointer-attribute-1.xml
index 8039812..8039812 100644
--- a/tests/EX-locNoteRefPointer-attribute-1.xml
+++ b/tests/LocNote/EX-locNoteRefPointer-attribute-1.xml
diff --git a/tests/LocNote1.pot b/tests/LocNote/LocNote1.pot
index e9ba94c..31951e3 100644
--- a/tests/LocNote1.pot
+++ b/tests/LocNote/LocNote1.pot
@@ -10,39 +10,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: locNoteRule/locNote
-#: tests/LocNote1.xml:5
+#: tests/LocNote/LocNote1.xml:5
 msgid "This text will be displayed over the image."
 msgstr ""
 
 #. (itstool) path: locNoteRule/locNote
-#: tests/LocNote1.xml:8
+#: tests/LocNote/LocNote1.xml:8
 msgid "Do not translate the word \"Chobe\""
 msgstr ""
 
 #. (itstool) path: locNote/code
-#: tests/LocNote1.xml:11
+#: tests/LocNote/LocNote1.xml:11
 msgid "{0}"
 msgstr ""
 
 #. (itstool) path: locNoteRule/locNote
-#: tests/LocNote1.xml:11
+#: tests/LocNote/LocNote1.xml:11
 msgid "The variable <_:code-1/> has three possible values: 'printer', 'stacker' and 'stapler options'."
 msgstr ""
 
 #. (itstool) path: body/msg
-#: tests/LocNote1.xml:17
+#: tests/LocNote/LocNote1.xml:17
 msgid "This is a hippoptamus: <_:img-1/>."
 msgstr ""
 
 #. (itstool) path: body/msg
-#: tests/LocNote1.xml:18
+#: tests/LocNote/LocNote1.xml:18
 msgid "This is an elephant: <_:img-1/>."
 msgstr ""
 
 #. (itstool) path: body/msg
 #. The variable {0} has three possible values: 'printer', 'stacker' and
 #. 'stapler options'.
-#: tests/LocNote1.xml:19
+#: tests/LocNote/LocNote1.xml:19
 msgid "The {0} has been disabled."
 msgstr ""
 
diff --git a/tests/LocNote1.xml b/tests/LocNote/LocNote1.xml
index 80ac98d..80ac98d 100644
--- a/tests/LocNote1.xml
+++ b/tests/LocNote/LocNote1.xml
diff --git a/tests/LocNote2.pot b/tests/LocNote/LocNote2.pot
index 95cf676..06e5ecc 100644
--- a/tests/LocNote2.pot
+++ b/tests/LocNote/LocNote2.pot
@@ -10,24 +10,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: locNoteRule/locNote
-#: tests/LocNote2.xml:6
+#: tests/LocNote/LocNote2.xml:6
 msgid "Do not translate the word \"Chobe\""
 msgstr ""
 
 #. (itstool) path: body/msg
-#: tests/LocNote2.xml:11
+#: tests/LocNote/LocNote2.xml:11
 msgid "This is a hippoptamus: <_:img-1/>."
 msgstr ""
 
 #. (itstool) path: body/msg
-#: tests/LocNote2.xml:12
+#: tests/LocNote/LocNote2.xml:12
 msgid "This is an elephant: <_:img-1/>."
 msgstr ""
 
 #. (itstool) path: body/msg
 #. The variable {0} has three possible values: 'printer', 'stacker' and
 #. 'stapler options'.
-#: tests/LocNote2.xml:13
+#: tests/LocNote/LocNote2.xml:13
 msgid "The {0} has been disabled."
 msgstr ""
 
diff --git a/tests/LocNote2.xml b/tests/LocNote/LocNote2.xml
index ba59ce3..ba59ce3 100644
--- a/tests/LocNote2.xml
+++ b/tests/LocNote/LocNote2.xml
diff --git a/tests/LocNote2_LinkedRules.xml b/tests/LocNote/LocNote2_LinkedRules.xml
index 51ecaaa..51ecaaa 100644
--- a/tests/LocNote2_LinkedRules.xml
+++ b/tests/LocNote/LocNote2_LinkedRules.xml
diff --git a/tests/LocNote3.pot b/tests/LocNote/LocNote3.pot
index 61996a0..3d5c420 100644
--- a/tests/LocNote3.pot
+++ b/tests/LocNote/LocNote3.pot
@@ -11,25 +11,25 @@ msgstr ""
 
 #. (itstool) path: msg/data
 #. The variable {0} is the name of the host.
-#: tests/LocNote3.xml:5
+#: tests/LocNote/LocNote3.xml:5
 msgid "Host {0} cannot be found."
 msgstr ""
 
 #. (itstool) path: msg/data
 #. The variable {0} is the name of the host.
-#: tests/LocNote3.xml:8
+#: tests/LocNote/LocNote3.xml:8
 msgid "The connection with {0} has been lost."
 msgstr ""
 
 #. (itstool) path: msg/data
 #. {0} is a filename
-#: tests/LocNote3.xml:11
+#: tests/LocNote/LocNote3.xml:11
 msgid "{0} not found."
 msgstr ""
 
 #. (itstool) path: msg/data
 #. (itstool) link: myLocNotes.htm#CannotLog
-#: tests/LocNote3.xml:14
+#: tests/LocNote/LocNote3.xml:14
 msgid "Cannot log with this username."
 msgstr ""
 
diff --git a/tests/LocNote3.xml b/tests/LocNote/LocNote3.xml
index 1deab5c..1deab5c 100644
--- a/tests/LocNote3.xml
+++ b/tests/LocNote/LocNote3.xml
diff --git a/tests/LocNote4.pot b/tests/LocNote/LocNote4.pot
index 9d8beb0..16b00f9 100644
--- a/tests/LocNote4.pot
+++ b/tests/LocNote/LocNote4.pot
@@ -11,25 +11,25 @@ msgstr ""
 
 #. (itstool) path: span/span
 #. (itstool) link: http://en.wikipedia.org/wiki/Doppelganger
-#: tests/LocNote4.xml:5
+#: tests/LocNote/LocNote4.xml:5
 msgid "doppelgänger"
 msgstr ""
 
 #. (itstool) path: span/b
 #. If possible keep the non-English terms in the translated version too
-#: tests/LocNote4.xml:6
+#: tests/LocNote/LocNote4.xml:6
 msgid "serious"
 msgstr ""
 
 #. (itstool) path: span/span
 #. (itstool) link: http://en.wikipedia.org/wiki/Aficionado
-#: tests/LocNote4.xml:6
+#: tests/LocNote/LocNote4.xml:6
 msgid "aficionado"
 msgstr ""
 
 #. (itstool) path: p/span
 #. If possible keep the non-English terms in the translated version too
-#: tests/LocNote4.xml:4
+#: tests/LocNote/LocNote4.xml:4
 msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a <_:b-2/> baseball <_:span-3/>."
 msgstr ""
 
diff --git a/tests/LocNote4.xml b/tests/LocNote/LocNote4.xml
index 2a0d252..2a0d252 100644
--- a/tests/LocNote4.xml
+++ b/tests/LocNote/LocNote4.xml
diff --git a/tests/Translate1.ll.po b/tests/Translate/Translate1.ll.po
index e57b5c5..f286c22 100644
--- a/tests/Translate1.ll.po
+++ b/tests/Translate/Translate1.ll.po
@@ -11,37 +11,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par
-#: tests/Translate1.xml:15
+#: tests/Translate/Translate1.xml:15
 msgid "Text with an image: <img alt=\"Image description\" src=\"img.png\"/>."
 msgstr ""
 "Texte avec une image : <img alt=\"Description d'image\" src=\"img.png\"/>."
 
 #. (itstool) path: body/par@title
-#: tests/Translate1.xml:16
+#: tests/Translate/Translate1.xml:16
 msgid "Text"
 msgstr "Texte"
 
 #. (itstool) path: body/par
-#: tests/Translate1.xml:16
+#: tests/Translate/Translate1.xml:16
 msgid "This is the first paragraph. It has some <_:verbatim-1/>."
 msgstr "C'est le premier paragraphe. Il contient du texte <_:verbatim-1/>."
 
 #. (itstool) path: 封面/汇集
-#: tests/Translate1.xml:21
+#: tests/Translate/Translate1.xml:21
 msgid "The Lord of the Rings"
 msgstr "Le Seigneur des Anneaux"
 
 #. (itstool) path: 封面/标题
-#: tests/Translate1.xml:22
+#: tests/Translate/Translate1.xml:22
 msgid "The Return of the King"
 msgstr "Le retour du Roi"
 
 #. (itstool) path: 章节/头注
-#: tests/Translate1.xml:26
+#: tests/Translate/Translate1.xml:26
 msgid "Minas Tirith"
 msgstr "Minas Tirith"
 
 #. (itstool) path: 章节/段落识别
-#: tests/Translate1.xml:27
+#: tests/Translate/Translate1.xml:27
 msgid "<_:姓名-1/> looked out from the shelter of <_:姓名-2/>'s cloak."
 msgstr "<_:姓名-1/> regarda depuis l'abri du manteau de <_:姓名-2/>."
diff --git a/tests/Translate1.ll.xml b/tests/Translate/Translate1.ll.xml
index 72b30fe..72b30fe 100644
--- a/tests/Translate1.ll.xml
+++ b/tests/Translate/Translate1.ll.xml
diff --git a/tests/Translate1.pot b/tests/Translate/Translate1.pot
index 0cc5de3..7302484 100644
--- a/tests/Translate1.pot
+++ b/tests/Translate/Translate1.pot
@@ -10,37 +10,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par
-#: tests/Translate1.xml:15
+#: tests/Translate/Translate1.xml:15
 msgid "Text with an image: <img alt=\"Image description\" src=\"img.png\"/>."
 msgstr ""
 
 #. (itstool) path: body/par@title
-#: tests/Translate1.xml:16
+#: tests/Translate/Translate1.xml:16
 msgid "Text"
 msgstr ""
 
 #. (itstool) path: body/par
-#: tests/Translate1.xml:16
+#: tests/Translate/Translate1.xml:16
 msgid "This is the first paragraph. It has some <_:verbatim-1/>."
 msgstr ""
 
 #. (itstool) path: 封面/汇集
-#: tests/Translate1.xml:21
+#: tests/Translate/Translate1.xml:21
 msgid "The Lord of the Rings"
 msgstr ""
 
 #. (itstool) path: 封面/标题
-#: tests/Translate1.xml:22
+#: tests/Translate/Translate1.xml:22
 msgid "The Return of the King"
 msgstr ""
 
 #. (itstool) path: 章节/头注
-#: tests/Translate1.xml:26
+#: tests/Translate/Translate1.xml:26
 msgid "Minas Tirith"
 msgstr ""
 
 #. (itstool) path: 章节/段落识别
-#: tests/Translate1.xml:27
+#: tests/Translate/Translate1.xml:27
 msgid "<_:姓名-1/> looked out from the shelter of <_:姓名-2/>'s cloak."
 msgstr ""
 
diff --git a/tests/Translate1.xml b/tests/Translate/Translate1.xml
index e10aa88..e10aa88 100644
--- a/tests/Translate1.xml
+++ b/tests/Translate/Translate1.xml
diff --git a/tests/Translate2.ll.po b/tests/Translate/Translate2.ll.po
index 7ee89c7..22fdef9 100644
--- a/tests/Translate2.ll.po
+++ b/tests/Translate/Translate2.ll.po
@@ -11,11 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par@title
-#: tests/Translate2.xml:8
+#: tests/Translate/Translate2.xml:8
 msgid "Text"
 msgstr "Texte"
 
 #. (itstool) path: body/par
-#: tests/Translate2.xml:8
+#: tests/Translate/Translate2.xml:8
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr "C'est le premier paragraphe. Il contient du texte <_:code-1/>."
diff --git a/tests/Translate2.ll.xml b/tests/Translate/Translate2.ll.xml
index 959c733..959c733 100644
--- a/tests/Translate2.ll.xml
+++ b/tests/Translate/Translate2.ll.xml
diff --git a/tests/Translate2.pot b/tests/Translate/Translate2.pot
index 66b110f..0f03da1 100644
--- a/tests/Translate2.pot
+++ b/tests/Translate/Translate2.pot
@@ -10,12 +10,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par@title
-#: tests/Translate2.xml:8
+#: tests/Translate/Translate2.xml:8
 msgid "Text"
 msgstr ""
 
 #. (itstool) path: body/par
-#: tests/Translate2.xml:8
+#: tests/Translate/Translate2.xml:8
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr ""
 
diff --git a/tests/Translate2.xml b/tests/Translate/Translate2.xml
index 2108aa2..2108aa2 100644
--- a/tests/Translate2.xml
+++ b/tests/Translate/Translate2.xml
diff --git a/tests/Translate2_LinkedRules.xml b/tests/Translate/Translate2_LinkedRules.xml
index d32f4f3..d32f4f3 100644
--- a/tests/Translate2_LinkedRules.xml
+++ b/tests/Translate/Translate2_LinkedRules.xml
diff --git a/tests/Translate3.ll.po b/tests/Translate/Translate3.ll.po
index 1775d0c..2243bb5 100644
--- a/tests/Translate3.ll.po
+++ b/tests/Translate/Translate3.ll.po
@@ -11,12 +11,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: head/title
-#: tests/Translate3.xml:6
+#: tests/Translate/Translate3.xml:6
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
 #. (itstool) path: body/p
-#: tests/Translate3.xml:9
+#: tests/Translate/Translate3.xml:9
 msgid ""
 "Everything started when Zebulon discovered that he had a <_:span-1/> who was "
 "a serious baseball <_:span-2/>."
diff --git a/tests/Translate3.ll.wrong.po b/tests/Translate/Translate3.ll.wrong.po
index 78b861c..4ee7f31 100644
--- a/tests/Translate3.ll.wrong.po
+++ b/tests/Translate/Translate3.ll.wrong.po
@@ -11,12 +11,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: head/title
-#: tests/Translate3.xml:6
+#: tests/Translate/Translate3.xml:6
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
 #. (itstool) path: body/p
-#: tests/Translate3.xml:9
+#: tests/Translate/Translate3.xml:9
 msgid ""
 "Everything started when Zebulon discovered that he had a <_:span-1/> who was "
 "a serious baseball <_:span-2/>."
diff --git a/tests/Translate3.ll.wrong.xml b/tests/Translate/Translate3.ll.wrong.xml
index d111f2b..d111f2b 100644
--- a/tests/Translate3.ll.wrong.xml
+++ b/tests/Translate/Translate3.ll.wrong.xml
diff --git a/tests/Translate3.ll.xml b/tests/Translate/Translate3.ll.xml
index 8dc1e7f..8dc1e7f 100644
--- a/tests/Translate3.ll.xml
+++ b/tests/Translate/Translate3.ll.xml
diff --git a/tests/Translate3.pot b/tests/Translate/Translate3.pot
index 240c28c..425b8f1 100644
--- a/tests/Translate3.pot
+++ b/tests/Translate/Translate3.pot
@@ -10,12 +10,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: head/title
-#: tests/Translate3.xml:6
+#: tests/Translate/Translate3.xml:6
 msgid "The Life of a Simple Man"
 msgstr ""
 
 #. (itstool) path: body/p
-#: tests/Translate3.xml:9
+#: tests/Translate/Translate3.xml:9
 msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
 msgstr ""
 
diff --git a/tests/Translate3.xml b/tests/Translate/Translate3.xml
index e25758c..e25758c 100644
--- a/tests/Translate3.xml
+++ b/tests/Translate/Translate3.xml
diff --git a/tests/Translate4.ll.po b/tests/Translate/Translate4.ll.po
index 22b8bec..6669e32 100644
--- a/tests/Translate4.ll.po
+++ b/tests/Translate/Translate4.ll.po
@@ -11,12 +11,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: head/title
-#: tests/Translate4.xml:3
+#: tests/Translate/Translate4.xml:3
 msgid "The Life of a Simple Man"
 msgstr "La vie d'un simple homme"
 
 #. (itstool) path: body/p
-#: tests/Translate4.xml:6
+#: tests/Translate/Translate4.xml:6
 msgid ""
 "Everything started when Zebulon discovered that he had a <_:fexp-1/> who was "
 "a serious baseball <_:fexp-2/>."
diff --git a/tests/Translate4.ll.xml b/tests/Translate/Translate4.ll.xml
index 873d1b5..873d1b5 100644
--- a/tests/Translate4.ll.xml
+++ b/tests/Translate/Translate4.ll.xml
diff --git a/tests/Translate4.pot b/tests/Translate/Translate4.pot
index 2c7a552..f3ed595 100644
--- a/tests/Translate4.pot
+++ b/tests/Translate/Translate4.pot
@@ -10,12 +10,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: head/title
-#: tests/Translate4.xml:3
+#: tests/Translate/Translate4.xml:3
 msgid "The Life of a Simple Man"
 msgstr ""
 
 #. (itstool) path: body/p
-#: tests/Translate4.xml:6
+#: tests/Translate/Translate4.xml:6
 msgid "Everything started when Zebulon discovered that he had a <_:fexp-1/> who was a serious baseball <_:fexp-2/>."
 msgstr ""
 
diff --git a/tests/Translate4.xml b/tests/Translate/Translate4.xml
index e353d09..e353d09 100644
--- a/tests/Translate4.xml
+++ b/tests/Translate/Translate4.xml
diff --git a/tests/Translate5.ll.po b/tests/Translate/Translate5.ll.po
index e2dfa0a..91e38be 100644
--- a/tests/Translate5.ll.po
+++ b/tests/Translate/Translate5.ll.po
@@ -11,12 +11,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: info/item
-#: tests/Translate5.xml:9
+#: tests/Translate/Translate5.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr "La vie d'un <_:b-1/>"
 
 #. (itstool) path: content/p
-#: tests/Translate5.xml:15
+#: tests/Translate/Translate5.xml:15
 msgid ""
 "Everything started when Zebulon discovered that he had a <_:span-1/> who was "
 "a serious baseball <_:span-2/>."
diff --git a/tests/Translate5.ll.xml b/tests/Translate/Translate5.ll.xml
index ccb9cbd..ccb9cbd 100644
--- a/tests/Translate5.ll.xml
+++ b/tests/Translate/Translate5.ll.xml
diff --git a/tests/Translate5.pot b/tests/Translate/Translate5.pot
index ac73acc..4bb7643 100644
--- a/tests/Translate5.pot
+++ b/tests/Translate/Translate5.pot
@@ -10,12 +10,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: info/item
-#: tests/Translate5.xml:9
+#: tests/Translate/Translate5.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr ""
 
 #. (itstool) path: content/p
-#: tests/Translate5.xml:15
+#: tests/Translate/Translate5.xml:15
 msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
 msgstr ""
 
diff --git a/tests/Translate5.xml b/tests/Translate/Translate5.xml
index a275360..a275360 100644
--- a/tests/Translate5.xml
+++ b/tests/Translate/Translate5.xml
diff --git a/tests/Translate6.ll.po b/tests/Translate/Translate6.ll.po
index e15cdff..2c1a6d3 100644
--- a/tests/Translate6.ll.po
+++ b/tests/Translate/Translate6.ll.po
@@ -11,27 +11,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: item/b
-#: tests/Translate6.xml:9
+#: tests/Translate/Translate6.xml:9
 msgid "Simple Man"
 msgstr "simple homme"
 
 #. (itstool) path: info/item
-#: tests/Translate6.xml:9
+#: tests/Translate/Translate6.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr "La vie d'un <_:b-1/>"
 
 #. (itstool) path: p/span
-#: tests/Translate6.xml:16
+#: tests/Translate/Translate6.xml:16
 msgid "doppelgänger"
 msgstr "double"
 
 #. (itstool) path: p/span
-#: tests/Translate6.xml:17
+#: tests/Translate/Translate6.xml:17
 msgid "aficionado"
 msgstr "passionné"
 
 #. (itstool) path: content/p
-#: tests/Translate6.xml:15
+#: tests/Translate/Translate6.xml:15
 msgid ""
 "Everything started when Zebulon discovered that he had a <_:span-1/> who was "
 "a serious baseball <_:span-2/>."
diff --git a/tests/Translate6.ll.xml b/tests/Translate/Translate6.ll.xml
index 7c30876..7c30876 100644
--- a/tests/Translate6.ll.xml
+++ b/tests/Translate/Translate6.ll.xml
diff --git a/tests/Translate6.pot b/tests/Translate/Translate6.pot
index d86bb52..4954d87 100644
--- a/tests/Translate6.pot
+++ b/tests/Translate/Translate6.pot
@@ -10,27 +10,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: item/b
-#: tests/Translate6.xml:9
+#: tests/Translate/Translate6.xml:9
 msgid "Simple Man"
 msgstr ""
 
 #. (itstool) path: info/item
-#: tests/Translate6.xml:9
+#: tests/Translate/Translate6.xml:9
 msgid "The Life of a <_:b-1/>"
 msgstr ""
 
 #. (itstool) path: p/span
-#: tests/Translate6.xml:16
+#: tests/Translate/Translate6.xml:16
 msgid "doppelgänger"
 msgstr ""
 
 #. (itstool) path: p/span
-#: tests/Translate6.xml:17
+#: tests/Translate/Translate6.xml:17
 msgid "aficionado"
 msgstr ""
 
 #. (itstool) path: content/p
-#: tests/Translate6.xml:15
+#: tests/Translate/Translate6.xml:15
 msgid "Everything started when Zebulon discovered that he had a <_:span-1/> who was a serious baseball <_:span-2/>."
 msgstr ""
 
diff --git a/tests/Translate6.xml b/tests/Translate/Translate6.xml
index 6374f32..6374f32 100644
--- a/tests/Translate6.xml
+++ b/tests/Translate/Translate6.xml
diff --git a/tests/Translate7.ll.po b/tests/Translate/Translate7.ll.po
index ff82f24..a1635f0 100644
--- a/tests/Translate7.ll.po
+++ b/tests/Translate/Translate7.ll.po
@@ -11,11 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/p
-#: tests/Translate7.xml:19
+#: tests/Translate/Translate7.xml:19
 msgid "For the implementation of ITS, apply the rules in the order:"
 msgstr "Pour l'implémentation d'ITS, appliquez les règles dans l'ordre :"
 
 #. (itstool) path: body/p
-#: tests/Translate7.xml:26
+#: tests/Translate/Translate7.xml:26
 msgid "<_:ph-1/> The last rule wins."
 msgstr "<_:ph-1/> La dernière règle gagne."
diff --git a/tests/Translate7.ll.xml b/tests/Translate/Translate7.ll.xml
index 1ac74b0..1ac74b0 100644
--- a/tests/Translate7.ll.xml
+++ b/tests/Translate/Translate7.ll.xml
diff --git a/tests/Translate7.pot b/tests/Translate/Translate7.pot
index 60ab061..4141b48 100644
--- a/tests/Translate7.pot
+++ b/tests/Translate/Translate7.pot
@@ -10,12 +10,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/p
-#: tests/Translate7.xml:19
+#: tests/Translate/Translate7.xml:19
 msgid "For the implementation of ITS, apply the rules in the order:"
 msgstr ""
 
 #. (itstool) path: body/p
-#: tests/Translate7.xml:26
+#: tests/Translate/Translate7.xml:26
 msgid "<_:ph-1/> The last rule wins."
 msgstr ""
 
diff --git a/tests/Translate7.xml b/tests/Translate/Translate7.xml
index dc75458..dc75458 100644
--- a/tests/Translate7.xml
+++ b/tests/Translate/Translate7.xml
diff --git a/tests/TranslateGlobal.ll.po b/tests/Translate/TranslateGlobal.ll.po
index 9f86d44..b612236 100644
--- a/tests/TranslateGlobal.ll.po
+++ b/tests/Translate/TranslateGlobal.ll.po
@@ -11,16 +11,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par@title
-#: tests/TranslateGlobal.xml:10
+#: tests/Translate/TranslateGlobal.xml:10
 msgid "Text"
 msgstr "Texte"
 
 #. (itstool) path: body/par
-#: tests/TranslateGlobal.xml:10
+#: tests/Translate/TranslateGlobal.xml:10
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr "Voici le premier paragraphe. Il contient du texte <_:code-1/>."
 
 #. (itstool) path: body/par
-#: tests/TranslateGlobal.xml:11
+#: tests/Translate/TranslateGlobal.xml:11
 msgid "Some additional text."
 msgstr "Du texte supplémentaire."
diff --git a/tests/TranslateGlobal.ll.xml b/tests/Translate/TranslateGlobal.ll.xml
index eed9b8b..eed9b8b 100644
--- a/tests/TranslateGlobal.ll.xml
+++ b/tests/Translate/TranslateGlobal.ll.xml
diff --git a/tests/TranslateGlobal.pot b/tests/Translate/TranslateGlobal.pot
index 5da4806..8393308 100644
--- a/tests/TranslateGlobal.pot
+++ b/tests/Translate/TranslateGlobal.pot
@@ -10,17 +10,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. (itstool) path: body/par@title
-#: tests/TranslateGlobal.xml:10
+#: tests/Translate/TranslateGlobal.xml:10
 msgid "Text"
 msgstr ""
 
 #. (itstool) path: body/par
-#: tests/TranslateGlobal.xml:10
+#: tests/Translate/TranslateGlobal.xml:10
 msgid "This is the first paragraph. It has some <_:code-1/>."
 msgstr ""
 
 #. (itstool) path: body/par
-#: tests/TranslateGlobal.xml:11
+#: tests/Translate/TranslateGlobal.xml:11
 msgid "Some additional text."
 msgstr ""
 
diff --git a/tests/TranslateGlobal.xml b/tests/Translate/TranslateGlobal.xml
index 3dc8dd5..3dc8dd5 100644
--- a/tests/TranslateGlobal.xml
+++ b/tests/Translate/TranslateGlobal.xml
diff --git a/tests/TranslateGlobal_LinkedRules.xml b/tests/Translate/TranslateGlobal_LinkedRules.xml
index 9a570d1..9a570d1 100644
--- a/tests/TranslateGlobal_LinkedRules.xml
+++ b/tests/Translate/TranslateGlobal_LinkedRules.xml
diff --git a/tests/run_tests.py b/tests/run_tests.py
index 1c4b1eb..ed88060 100644
--- a/tests/run_tests.py
+++ b/tests/run_tests.py
@@ -93,32 +93,32 @@ class ItstoolTests(unittest.TestCase):
 
     def test_LocNote1(self):
         # FIXME: only the third note appears currently, as notes on subnodes don't propagate to parent nodes
-        self._test_pot_generation('LocNote1.xml')
+        self._test_pot_generation('LocNote/LocNote1.xml')
 
     def test_LocNote2(self):
         # FIXME: only the third note appears currently, as notes on subnodes don't propagate to parent nodes
-        self._test_pot_generation('LocNote2.xml')
+        self._test_pot_generation('LocNote/LocNote2.xml')
 
     def test_LocNote3(self):
-        self._test_pot_generation('LocNote3.xml')
+        self._test_pot_generation('LocNote/LocNote3.xml')
 
     def test_LocNote4(self):
-        self._test_pot_generation('LocNote4.xml')
+        self._test_pot_generation('LocNote/LocNote4.xml')
 
     def test_EX_locNote_element_1(self):
-        self._test_pot_generation('EX-locNote-element-1.xml')
+        self._test_pot_generation('LocNote/EX-locNote-element-1.xml')
 
     def test_EX_locNote_selector_2(self):
-        self._test_pot_generation('EX-locNote-selector-2.xml')
+        self._test_pot_generation('LocNote/EX-locNote-selector-2.xml')
 
     def test_EX_locNotePointer_attribute_1(self):
-        self._test_pot_generation('EX-locNotePointer-attribute-1.xml')
+        self._test_pot_generation('LocNote/EX-locNotePointer-attribute-1.xml')
 
     def test_EX_locNoteRef_attribute_1(self):
-        self._test_pot_generation('EX-locNoteRef-attribute-1.xml')
+        self._test_pot_generation('LocNote/EX-locNoteRef-attribute-1.xml')
 
     def test_EX_locNoteRefPointer_attribute_1(self):
-        self._test_pot_generation('EX-locNoteRefPointer-attribute-1.xml')
+        self._test_pot_generation('LocNote/EX-locNoteRefPointer-attribute-1.xml')
 
     def test_PreserveSpace1(self):
         self._test_pot_generation('preservespace1xml.xml')
@@ -133,28 +133,28 @@ class ItstoolTests(unittest.TestCase):
         self._test_pot_generation('preservespace4xml.xml')
 
     def test_Translate1(self):
-        self._test_translation_process('Translate1.xml')
+        self._test_translation_process('Translate/Translate1.xml')
 
     def test_Translate2(self):
-        self._test_translation_process('Translate2.xml')
+        self._test_translation_process('Translate/Translate2.xml')
 
     def test_Translate3(self):
-        self._test_translation_process('Translate3.xml')
+        self._test_translation_process('Translate/Translate3.xml')
 
     def test_Translate4(self):
-        self._test_translation_process('Translate4.xml')
+        self._test_translation_process('Translate/Translate4.xml')
 
     def test_Translate5(self):
-        self._test_translation_process('Translate5.xml')
+        self._test_translation_process('Translate/Translate5.xml')
 
     def test_Translate6(self):
-        self._test_translation_process('Translate6.xml')
+        self._test_translation_process('Translate/Translate6.xml')
 
     def test_Translate7(self):
-        self._test_translation_process('Translate7.xml')
+        self._test_translation_process('Translate/Translate7.xml')
 
     def test_TranslateGlobal(self):
-        self._test_translation_process('TranslateGlobal.xml')
+        self._test_translation_process('Translate/TranslateGlobal.xml')
 
     def test_Locale1(self):
         self._test_translation_process('LocaleFilter/Locale1Xml.xml',
@@ -271,16 +271,16 @@ class ItstoolTests(unittest.TestCase):
 
     def test_Translate3_wrong1(self):
         """ Test that bad XML syntax in translation generates a proper exception """
-        self._test_translation_process('Translate3.xml', expected_status=1,
-                                       outputs=[('Translate3.ll.wrong.po', None, 'll')],
+        self._test_translation_process('Translate/Translate3.xml', expected_status=1,
+                                       outputs=[('Translate/Translate3.ll.wrong.po', None, 'll')],
                                        options='-s')
         #self.assertTrue("libxml2.parserError" in res['errors'])
 
     def test_Translate3_wrong2(self):
         """ Test that bad XML syntax in translation is handled gracefully """
-        self._test_translation_process('Translate3.xml',
-                                       outputs=[('Translate3.ll.wrong.po',
-                                                 'Translate3.ll.wrong.xml',
+        self._test_translation_process('Translate/Translate3.xml',
+                                       outputs=[('Translate/Translate3.ll.wrong.po',
+                                                 'Translate/Translate3.ll.wrong.xml',
                                                  'll')])