diff --git a/topics/recovery/hunter/tests/0-chunks.bgf b/topics/recovery/hunter/tests/0-chunks-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/0-chunks.bgf
rename to topics/recovery/hunter/tests/0-chunks-nopp.bgf
diff --git a/topics/recovery/hunter/tests/0-chunks.edd b/topics/recovery/hunter/tests/0-chunks-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/0-chunks.edd
rename to topics/recovery/hunter/tests/0-chunks-nopp.edd
diff --git a/topics/recovery/hunter/tests/0-chunks.src b/topics/recovery/hunter/tests/0-chunks-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/0-chunks.src
rename to topics/recovery/hunter/tests/0-chunks-nopp.src
diff --git a/topics/recovery/hunter/tests/0-ignored.bgf b/topics/recovery/hunter/tests/0-ignored-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/0-ignored.bgf
rename to topics/recovery/hunter/tests/0-ignored-nopp.bgf
diff --git a/topics/recovery/hunter/tests/0-ignored.edd b/topics/recovery/hunter/tests/0-ignored-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/0-ignored.edd
rename to topics/recovery/hunter/tests/0-ignored-nopp.edd
diff --git a/topics/recovery/hunter/tests/0-ignored.src b/topics/recovery/hunter/tests/0-ignored-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/0-ignored.src
rename to topics/recovery/hunter/tests/0-ignored-nopp.src
diff --git a/topics/recovery/hunter/tests/0-simple.src b/topics/recovery/hunter/tests/0-simple.src
index 6ce7dd7f..efc02418 100644
--- a/topics/recovery/hunter/tests/0-simple.src
+++ b/topics/recovery/hunter/tests/0-simple.src
@@ -1,4 +1,3 @@
foo : bar
bar : wez
wez : foo
-
diff --git a/topics/recovery/hunter/tests/1-camel-except.bgf b/topics/recovery/hunter/tests/1-camel-except-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/1-camel-except.bgf
rename to topics/recovery/hunter/tests/1-camel-except-nopp.bgf
diff --git a/topics/recovery/hunter/tests/1-camel-except.edd b/topics/recovery/hunter/tests/1-camel-except-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/1-camel-except.edd
rename to topics/recovery/hunter/tests/1-camel-except-nopp.edd
diff --git a/topics/recovery/hunter/tests/1-camel-except-nopp.src b/topics/recovery/hunter/tests/1-camel-except-nopp.src
new file mode 100644
index 00000000..9a1b1430
--- /dev/null
+++ b/topics/recovery/hunter/tests/1-camel-except-nopp.src
@@ -0,0 +1,3 @@
+foo:BAR WEZ FOO
+Bar:wez foo bar
+WEZ:Foo Bar Wez
diff --git a/topics/recovery/hunter/tests/1-camel-except.src b/topics/recovery/hunter/tests/1-camel-except.src
deleted file mode 100644
index 70bf5a44..00000000
--- a/topics/recovery/hunter/tests/1-camel-except.src
+++ /dev/null
@@ -1,3 +0,0 @@
-foo : BAR WEZ FOO
-Bar : wez foo bar
-WEZ : Foo Bar Wez
diff --git a/topics/recovery/hunter/tests/1-comment.bgf b/topics/recovery/hunter/tests/1-comment-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/1-comment.bgf
rename to topics/recovery/hunter/tests/1-comment-nopp.bgf
diff --git a/topics/recovery/hunter/tests/1-comment.edd b/topics/recovery/hunter/tests/1-comment-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/1-comment.edd
rename to topics/recovery/hunter/tests/1-comment-nopp.edd
diff --git a/topics/recovery/hunter/tests/1-comment.src b/topics/recovery/hunter/tests/1-comment-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/1-comment.src
rename to topics/recovery/hunter/tests/1-comment-nopp.src
diff --git a/topics/recovery/hunter/tests/1-split-on-alpha.bgf b/topics/recovery/hunter/tests/1-split-on-alpha-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-alpha.bgf
rename to topics/recovery/hunter/tests/1-split-on-alpha-nopp.bgf
diff --git a/topics/recovery/hunter/tests/1-split-on-alpha.edd b/topics/recovery/hunter/tests/1-split-on-alpha-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-alpha.edd
rename to topics/recovery/hunter/tests/1-split-on-alpha-nopp.edd
diff --git a/topics/recovery/hunter/tests/1-split-on-alpha.src b/topics/recovery/hunter/tests/1-split-on-alpha-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-alpha.src
rename to topics/recovery/hunter/tests/1-split-on-alpha-nopp.src
diff --git a/topics/recovery/hunter/tests/1-split-on-whitespace.bgf b/topics/recovery/hunter/tests/1-split-on-whitespace-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-whitespace.bgf
rename to topics/recovery/hunter/tests/1-split-on-whitespace-nopp.bgf
diff --git a/topics/recovery/hunter/tests/1-split-on-whitespace.edd b/topics/recovery/hunter/tests/1-split-on-whitespace-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-whitespace.edd
rename to topics/recovery/hunter/tests/1-split-on-whitespace-nopp.edd
diff --git a/topics/recovery/hunter/tests/1-split-on-whitespace.src b/topics/recovery/hunter/tests/1-split-on-whitespace-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/1-split-on-whitespace.src
rename to topics/recovery/hunter/tests/1-split-on-whitespace-nopp.src
diff --git a/topics/recovery/hunter/tests/1-whitespace.bgf b/topics/recovery/hunter/tests/1-whitespace-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/1-whitespace.bgf
rename to topics/recovery/hunter/tests/1-whitespace-nopp.bgf
diff --git a/topics/recovery/hunter/tests/1-whitespace.edd b/topics/recovery/hunter/tests/1-whitespace-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/1-whitespace.edd
rename to topics/recovery/hunter/tests/1-whitespace-nopp.edd
diff --git a/topics/recovery/hunter/tests/1-whitespace.src b/topics/recovery/hunter/tests/1-whitespace-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/1-whitespace.src
rename to topics/recovery/hunter/tests/1-whitespace-nopp.src
diff --git a/topics/recovery/hunter/tests/2-camel-except.bgf b/topics/recovery/hunter/tests/2-camel-except-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel-except.bgf
rename to topics/recovery/hunter/tests/2-camel-except-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-camel-except.edd b/topics/recovery/hunter/tests/2-camel-except-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel-except.edd
rename to topics/recovery/hunter/tests/2-camel-except-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-camel-except.src b/topics/recovery/hunter/tests/2-camel-except-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel-except.src
rename to topics/recovery/hunter/tests/2-camel-except-nopp.src
diff --git a/topics/recovery/hunter/tests/2-camel.bgf b/topics/recovery/hunter/tests/2-camel-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel.bgf
rename to topics/recovery/hunter/tests/2-camel-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-camel.edd b/topics/recovery/hunter/tests/2-camel-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel.edd
rename to topics/recovery/hunter/tests/2-camel-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-camel.src b/topics/recovery/hunter/tests/2-camel-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-camel.src
rename to topics/recovery/hunter/tests/2-camel-nopp.src
diff --git a/topics/recovery/hunter/tests/2-contains.bgf b/topics/recovery/hunter/tests/2-contains-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-contains.bgf
rename to topics/recovery/hunter/tests/2-contains-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-contains.edd b/topics/recovery/hunter/tests/2-contains-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-contains.edd
rename to topics/recovery/hunter/tests/2-contains-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-contains.src b/topics/recovery/hunter/tests/2-contains-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-contains.src
rename to topics/recovery/hunter/tests/2-contains-nopp.src
diff --git a/topics/recovery/hunter/tests/2-lower-camel.bgf b/topics/recovery/hunter/tests/2-lower-camel-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-camel.bgf
rename to topics/recovery/hunter/tests/2-lower-camel-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-lower-camel.edd b/topics/recovery/hunter/tests/2-lower-camel-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-camel.edd
rename to topics/recovery/hunter/tests/2-lower-camel-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-lower-camel.src b/topics/recovery/hunter/tests/2-lower-camel-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-camel.src
rename to topics/recovery/hunter/tests/2-lower-camel-nopp.src
diff --git a/topics/recovery/hunter/tests/2-lower-except.bgf b/topics/recovery/hunter/tests/2-lower-except-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-except.bgf
rename to topics/recovery/hunter/tests/2-lower-except-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-lower-except.edd b/topics/recovery/hunter/tests/2-lower-except-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-except.edd
rename to topics/recovery/hunter/tests/2-lower-except-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-lower-except.src b/topics/recovery/hunter/tests/2-lower-except-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower-except.src
rename to topics/recovery/hunter/tests/2-lower-except-nopp.src
diff --git a/topics/recovery/hunter/tests/2-lower.bgf b/topics/recovery/hunter/tests/2-lower-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower.bgf
rename to topics/recovery/hunter/tests/2-lower-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-lower.edd b/topics/recovery/hunter/tests/2-lower-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower.edd
rename to topics/recovery/hunter/tests/2-lower-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-lower.src b/topics/recovery/hunter/tests/2-lower-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-lower.src
rename to topics/recovery/hunter/tests/2-lower-nopp.src
diff --git a/topics/recovery/hunter/tests/2-start-end-nopp.bgf b/topics/recovery/hunter/tests/2-start-end-nopp.bgf
new file mode 100644
index 00000000..91896950
--- /dev/null
+++ b/topics/recovery/hunter/tests/2-start-end-nopp.bgf
@@ -0,0 +1,21 @@
+
+
+
+ foo
+
+ x y z
+
+
+
+ bar
+
+ x y z
+
+
+
+ wez
+
+ foo
+
+
+
diff --git a/topics/recovery/hunter/tests/2-start-end-nopp.edd b/topics/recovery/hunter/tests/2-start-end-nopp.edd
new file mode 100644
index 00000000..918cf268
--- /dev/null
+++ b/topics/recovery/hunter/tests/2-start-end-nopp.edd
@@ -0,0 +1,9 @@
+
+
+ :
+ \n
+ “
+ ”
+ (
+ )
+
diff --git a/topics/recovery/hunter/tests/2-start-end-nopp.src b/topics/recovery/hunter/tests/2-start-end-nopp.src
new file mode 100644
index 00000000..48da22f9
--- /dev/null
+++ b/topics/recovery/hunter/tests/2-start-end-nopp.src
@@ -0,0 +1,3 @@
+(foo) : “x y z”
+(bar) : (x y z)
+(wez) : “foo”
diff --git a/topics/recovery/hunter/tests/2-start-end.src b/topics/recovery/hunter/tests/2-start-end.src
index 48da22f9..92409089 100644
--- a/topics/recovery/hunter/tests/2-start-end.src
+++ b/topics/recovery/hunter/tests/2-start-end.src
@@ -1,3 +1,3 @@
-(foo) : “x y z”
-(bar) : (x y z)
-(wez) : “foo”
+foo : “x y z”
+bar : (x y z)
+wez : “foo”
diff --git a/topics/recovery/hunter/tests/2-upper-camel.bgf b/topics/recovery/hunter/tests/2-upper-camel-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-camel.bgf
rename to topics/recovery/hunter/tests/2-upper-camel-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-upper-camel.edd b/topics/recovery/hunter/tests/2-upper-camel-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-camel.edd
rename to topics/recovery/hunter/tests/2-upper-camel-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-upper-camel.src b/topics/recovery/hunter/tests/2-upper-camel-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-camel.src
rename to topics/recovery/hunter/tests/2-upper-camel-nopp.src
diff --git a/topics/recovery/hunter/tests/2-upper-except.bgf b/topics/recovery/hunter/tests/2-upper-except-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-except.bgf
rename to topics/recovery/hunter/tests/2-upper-except-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-upper-except.edd b/topics/recovery/hunter/tests/2-upper-except-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-except.edd
rename to topics/recovery/hunter/tests/2-upper-except-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-upper-except.src b/topics/recovery/hunter/tests/2-upper-except-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-except.src
rename to topics/recovery/hunter/tests/2-upper-except-nopp.src
diff --git a/topics/recovery/hunter/tests/2-upper-lower-camel.bgf b/topics/recovery/hunter/tests/2-upper-lower-camel-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower-camel.bgf
rename to topics/recovery/hunter/tests/2-upper-lower-camel-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-upper-lower-camel.edd b/topics/recovery/hunter/tests/2-upper-lower-camel-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower-camel.edd
rename to topics/recovery/hunter/tests/2-upper-lower-camel-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-upper-lower-camel.src b/topics/recovery/hunter/tests/2-upper-lower-camel-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower-camel.src
rename to topics/recovery/hunter/tests/2-upper-lower-camel-nopp.src
diff --git a/topics/recovery/hunter/tests/2-upper-lower.bgf b/topics/recovery/hunter/tests/2-upper-lower-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower.bgf
rename to topics/recovery/hunter/tests/2-upper-lower-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-upper-lower.edd b/topics/recovery/hunter/tests/2-upper-lower-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower.edd
rename to topics/recovery/hunter/tests/2-upper-lower-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-upper-lower.src b/topics/recovery/hunter/tests/2-upper-lower-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper-lower.src
rename to topics/recovery/hunter/tests/2-upper-lower-nopp.src
diff --git a/topics/recovery/hunter/tests/2-upper.bgf b/topics/recovery/hunter/tests/2-upper-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper.bgf
rename to topics/recovery/hunter/tests/2-upper-nopp.bgf
diff --git a/topics/recovery/hunter/tests/2-upper.edd b/topics/recovery/hunter/tests/2-upper-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper.edd
rename to topics/recovery/hunter/tests/2-upper-nopp.edd
diff --git a/topics/recovery/hunter/tests/2-upper.src b/topics/recovery/hunter/tests/2-upper-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/2-upper.src
rename to topics/recovery/hunter/tests/2-upper-nopp.src
diff --git a/topics/recovery/hunter/tests/3-one-of.bgf b/topics/recovery/hunter/tests/3-one-of-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/3-one-of.bgf
rename to topics/recovery/hunter/tests/3-one-of-nopp.bgf
diff --git a/topics/recovery/hunter/tests/3-one-of.edd b/topics/recovery/hunter/tests/3-one-of-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/3-one-of.edd
rename to topics/recovery/hunter/tests/3-one-of-nopp.edd
diff --git a/topics/recovery/hunter/tests/3-one-of.src b/topics/recovery/hunter/tests/3-one-of-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/3-one-of.src
rename to topics/recovery/hunter/tests/3-one-of-nopp.src
diff --git a/topics/recovery/hunter/tests/4-neither-comma.bgf b/topics/recovery/hunter/tests/4-neither-comma-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-comma.bgf
rename to topics/recovery/hunter/tests/4-neither-comma-nopp.bgf
diff --git a/topics/recovery/hunter/tests/4-neither-comma.edd b/topics/recovery/hunter/tests/4-neither-comma-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-comma.edd
rename to topics/recovery/hunter/tests/4-neither-comma-nopp.edd
diff --git a/topics/recovery/hunter/tests/4-neither-comma.src b/topics/recovery/hunter/tests/4-neither-comma-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-comma.src
rename to topics/recovery/hunter/tests/4-neither-comma-nopp.src
diff --git a/topics/recovery/hunter/tests/4-neither-newline.bgf b/topics/recovery/hunter/tests/4-neither-newline-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-newline.bgf
rename to topics/recovery/hunter/tests/4-neither-newline-nopp.bgf
diff --git a/topics/recovery/hunter/tests/4-neither-newline.edd b/topics/recovery/hunter/tests/4-neither-newline-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-newline.edd
rename to topics/recovery/hunter/tests/4-neither-newline-nopp.edd
diff --git a/topics/recovery/hunter/tests/4-neither-newline.src b/topics/recovery/hunter/tests/4-neither-newline-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-newline.src
rename to topics/recovery/hunter/tests/4-neither-newline-nopp.src
diff --git a/topics/recovery/hunter/tests/4-neither-period.bgf b/topics/recovery/hunter/tests/4-neither-period-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-period.bgf
rename to topics/recovery/hunter/tests/4-neither-period-nopp.bgf
diff --git a/topics/recovery/hunter/tests/4-neither-period.edd b/topics/recovery/hunter/tests/4-neither-period-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-period.edd
rename to topics/recovery/hunter/tests/4-neither-period-nopp.edd
diff --git a/topics/recovery/hunter/tests/4-neither-period.src b/topics/recovery/hunter/tests/4-neither-period-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/4-neither-period.src
rename to topics/recovery/hunter/tests/4-neither-period-nopp.src
diff --git a/topics/recovery/hunter/tests/4-only-defining.bgf b/topics/recovery/hunter/tests/4-only-defining-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-defining.bgf
rename to topics/recovery/hunter/tests/4-only-defining-nopp.bgf
diff --git a/topics/recovery/hunter/tests/4-only-defining.edd b/topics/recovery/hunter/tests/4-only-defining-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-defining.edd
rename to topics/recovery/hunter/tests/4-only-defining-nopp.edd
diff --git a/topics/recovery/hunter/tests/4-only-defining.src b/topics/recovery/hunter/tests/4-only-defining-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-defining.src
rename to topics/recovery/hunter/tests/4-only-defining-nopp.src
diff --git a/topics/recovery/hunter/tests/4-only-terminator.bgf b/topics/recovery/hunter/tests/4-only-terminator-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-terminator.bgf
rename to topics/recovery/hunter/tests/4-only-terminator-nopp.bgf
diff --git a/topics/recovery/hunter/tests/4-only-terminator.edd b/topics/recovery/hunter/tests/4-only-terminator-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-terminator.edd
rename to topics/recovery/hunter/tests/4-only-terminator-nopp.edd
diff --git a/topics/recovery/hunter/tests/4-only-terminator.src b/topics/recovery/hunter/tests/4-only-terminator-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/4-only-terminator.src
rename to topics/recovery/hunter/tests/4-only-terminator-nopp.src
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-2.bgf b/topics/recovery/hunter/tests/5-decompose-nt-2-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-2.bgf
rename to topics/recovery/hunter/tests/5-decompose-nt-2-nopp.bgf
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-2.edd b/topics/recovery/hunter/tests/5-decompose-nt-2-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-2.edd
rename to topics/recovery/hunter/tests/5-decompose-nt-2-nopp.edd
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-2.src b/topics/recovery/hunter/tests/5-decompose-nt-2-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-2.src
rename to topics/recovery/hunter/tests/5-decompose-nt-2-nopp.src
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-3.bgf b/topics/recovery/hunter/tests/5-decompose-nt-3-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-3.bgf
rename to topics/recovery/hunter/tests/5-decompose-nt-3-nopp.bgf
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-3.edd b/topics/recovery/hunter/tests/5-decompose-nt-3-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-3.edd
rename to topics/recovery/hunter/tests/5-decompose-nt-3-nopp.edd
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-3.src b/topics/recovery/hunter/tests/5-decompose-nt-3-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-3.src
rename to topics/recovery/hunter/tests/5-decompose-nt-3-nopp.src
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-t.bgf b/topics/recovery/hunter/tests/5-decompose-nt-t-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-t.bgf
rename to topics/recovery/hunter/tests/5-decompose-nt-t-nopp.bgf
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-t.edd b/topics/recovery/hunter/tests/5-decompose-nt-t-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-t.edd
rename to topics/recovery/hunter/tests/5-decompose-nt-t-nopp.edd
diff --git a/topics/recovery/hunter/tests/5-decompose-nt-t.src b/topics/recovery/hunter/tests/5-decompose-nt-t-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/5-decompose-nt-t.src
rename to topics/recovery/hunter/tests/5-decompose-nt-t-nopp.src
diff --git a/topics/recovery/hunter/tests/5-glue.bgf b/topics/recovery/hunter/tests/5-glue-nopp.bgf
similarity index 100%
rename from topics/recovery/hunter/tests/5-glue.bgf
rename to topics/recovery/hunter/tests/5-glue-nopp.bgf
diff --git a/topics/recovery/hunter/tests/5-glue.edd b/topics/recovery/hunter/tests/5-glue-nopp.edd
similarity index 100%
rename from topics/recovery/hunter/tests/5-glue.edd
rename to topics/recovery/hunter/tests/5-glue-nopp.edd
diff --git a/topics/recovery/hunter/tests/5-glue.src b/topics/recovery/hunter/tests/5-glue-nopp.src
similarity index 100%
rename from topics/recovery/hunter/tests/5-glue.src
rename to topics/recovery/hunter/tests/5-glue-nopp.src
diff --git a/topics/recovery/hunter/tests/5-no-glue.src b/topics/recovery/hunter/tests/5-no-glue.src
index 66994c72..7858d3c0 100644
--- a/topics/recovery/hunter/tests/5-no-glue.src
+++ b/topics/recovery/hunter/tests/5-no-glue.src
@@ -1,4 +1,3 @@
foo : . / ? ( )
bar : wez
wez : foo
-
diff --git a/topics/recovery/hunter/tests/Makefile b/topics/recovery/hunter/tests/Makefile
index bd159c8f..33f1f31b 100644
--- a/topics/recovery/hunter/tests/Makefile
+++ b/topics/recovery/hunter/tests/Makefile
@@ -1,5 +1,11 @@
test:
+ echo 'Run make test-hunter to test Grammar Hunter or make test-edd to test EDD pretty-printer.'
+
+test-hunter:
ls -1 *.src | xargs -n1 -I _ basename _ .src | xargs -n1 ./testperform
+test-edd:
+ ls -1 *.src | grep -v 'nopp' | xargs -n1 -I _ basename _ .src | xargs -n1 ./testperformedd
+
clean:
rm -f *.out *.log *.gdt
diff --git a/topics/recovery/hunter/tests/testperformedd b/topics/recovery/hunter/tests/testperformedd
new file mode 100755
index 00000000..fa459dd7
--- /dev/null
+++ b/topics/recovery/hunter/tests/testperformedd
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo [Test EDD PP] $1
+rm -f $1.log
+../../../../shared/tools/bgf0edd2bnf $1.bgf $1.edd $1.out || exit -1
+diff $1.src $1.out || exit -1
diff --git a/topics/recovery/hunter/tests/testrenamesvn b/topics/recovery/hunter/tests/testrenamesvn
new file mode 100755
index 00000000..50e8667c
--- /dev/null
+++ b/topics/recovery/hunter/tests/testrenamesvn
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+svn mv $1.src $2.src
+svn mv $1.edd $2.edd
+svn mv $1.bgf $2.bgf
+rm -f $1.out $1.log
diff --git a/topics/recovery/hunter/tests/testsaveedd b/topics/recovery/hunter/tests/testsaveedd
new file mode 100755
index 00000000..8826cd95
--- /dev/null
+++ b/topics/recovery/hunter/tests/testsaveedd
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./testperformedd $1
+mv $1.out $1.src