diff --git a/topics/transformation/xbgf/tests/massage2.baseline b/topics/transformation/xbgf/tests/massage2.baseline
deleted file mode 100644
index 4fd90f93..00000000
--- a/topics/transformation/xbgf/tests/massage2.baseline
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- program
-
-
- fun
-
-
-
-
-
-
-
-
- function
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage2.bgf b/topics/transformation/xbgf/tests/massage2.bgf
deleted file mode 100644
index d1179a3a..00000000
--- a/topics/transformation/xbgf/tests/massage2.bgf
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- program
-
-
- fun
-
-
-
- function
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage3.baseline b/topics/transformation/xbgf/tests/massage3.baseline
deleted file mode 100644
index dae8fb2c..00000000
--- a/topics/transformation/xbgf/tests/massage3.baseline
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- program
-
-
- fun
-
-
-
- function
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage3.bgf b/topics/transformation/xbgf/tests/massage3.bgf
deleted file mode 100644
index df4fab23..00000000
--- a/topics/transformation/xbgf/tests/massage3.bgf
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
- program
-
-
- fun
-
-
-
-
-
-
-
-
- function
-
-
-
-
-
-
-
-
-
diff --git a/topics/transformation/xbgf/tests/massage6.baseline b/topics/transformation/xbgf/tests/massage_ch_ep.baseline
similarity index 62%
rename from topics/transformation/xbgf/tests/massage6.baseline
rename to topics/transformation/xbgf/tests/massage_ch_ep.baseline
index 5b47057f..a91619ae 100644
--- a/topics/transformation/xbgf/tests/massage6.baseline
+++ b/topics/transformation/xbgf/tests/massage_ch_ep.baseline
@@ -1,12 +1,13 @@
+
- A
+ foo
- X
+ bar
-
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ep.bgf b/topics/transformation/xbgf/tests/massage_ch_ep.bgf
new file mode 100644
index 00000000..aa0c81e8
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ep.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage3.xbgf b/topics/transformation/xbgf/tests/massage_ch_ep.xbgf
similarity index 77%
rename from topics/transformation/xbgf/tests/massage3.xbgf
rename to topics/transformation/xbgf/tests/massage_ch_ep.xbgf
index d4fdf9d3..a6079f2a 100644
--- a/topics/transformation/xbgf/tests/massage3.xbgf
+++ b/topics/transformation/xbgf/tests/massage_ch_ep.xbgf
@@ -1,3 +1,4 @@
+
@@ -10,7 +11,7 @@
- function
+ bar
@@ -19,12 +20,9 @@
- function
+ bar
-
-
-
-
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_eq.baseline b/topics/transformation/xbgf/tests/massage_ch_eq.baseline
new file mode 100644
index 00000000..1127ddab
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_eq.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_eq.bgf b/topics/transformation/xbgf/tests/massage_ch_eq.bgf
new file mode 100644
index 00000000..eb9f7c98
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_eq.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_eq.xbgf b/topics/transformation/xbgf/tests/massage_ch_eq.xbgf
new file mode 100644
index 00000000..3a7ecd35
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_eq.xbgf
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_es.baseline b/topics/transformation/xbgf/tests/massage_ch_es.baseline
new file mode 100644
index 00000000..a91619ae
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_es.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_es.bgf b/topics/transformation/xbgf/tests/massage_ch_es.bgf
new file mode 100644
index 00000000..48ca9f5c
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_es.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage2.xbgf b/topics/transformation/xbgf/tests/massage_ch_es.xbgf
similarity index 71%
rename from topics/transformation/xbgf/tests/massage2.xbgf
rename to topics/transformation/xbgf/tests/massage_ch_es.xbgf
index 8ef5040b..0e60cf49 100644
--- a/topics/transformation/xbgf/tests/massage2.xbgf
+++ b/topics/transformation/xbgf/tests/massage_ch_es.xbgf
@@ -1,30 +1,28 @@
+
-
-
-
- function
-
-
-
-
+
- function
+ bar
-
+
-
- program
-
+
+
+
+ bar
+
+
+
-
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ex.baseline b/topics/transformation/xbgf/tests/massage_ch_ex.baseline
new file mode 100644
index 00000000..1127ddab
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ex.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ex.bgf b/topics/transformation/xbgf/tests/massage_ch_ex.bgf
new file mode 100644
index 00000000..70ba682f
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ex.bgf
@@ -0,0 +1,16 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ex.xbgf b/topics/transformation/xbgf/tests/massage_ch_ex.xbgf
new file mode 100644
index 00000000..272b9615
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ex.xbgf
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ps.baseline b/topics/transformation/xbgf/tests/massage_ch_ps.baseline
new file mode 100644
index 00000000..a91619ae
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ps.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ps.bgf b/topics/transformation/xbgf/tests/massage_ch_ps.bgf
new file mode 100644
index 00000000..f35a291c
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ps.bgf
@@ -0,0 +1,24 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_ps.xbgf b/topics/transformation/xbgf/tests/massage_ch_ps.xbgf
new file mode 100644
index 00000000..e56b4baa
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_ps.xbgf
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_qp.baseline b/topics/transformation/xbgf/tests/massage_ch_qp.baseline
new file mode 100644
index 00000000..a91619ae
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_qp.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage6.bgf b/topics/transformation/xbgf/tests/massage_ch_qp.bgf
similarity index 72%
rename from topics/transformation/xbgf/tests/massage6.bgf
rename to topics/transformation/xbgf/tests/massage_ch_qp.bgf
index cce6130f..1671e250 100644
--- a/topics/transformation/xbgf/tests/massage6.bgf
+++ b/topics/transformation/xbgf/tests/massage_ch_qp.bgf
@@ -1,23 +1,24 @@
+
- A
+ foo
-
+
- X
+ bar
-
+
-
+
- X
+ bar
-
+
-
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage6.xbgf b/topics/transformation/xbgf/tests/massage_ch_qp.xbgf
similarity index 77%
rename from topics/transformation/xbgf/tests/massage6.xbgf
rename to topics/transformation/xbgf/tests/massage_ch_qp.xbgf
index e546c6fb..128961df 100644
--- a/topics/transformation/xbgf/tests/massage6.xbgf
+++ b/topics/transformation/xbgf/tests/massage_ch_qp.xbgf
@@ -1,3 +1,4 @@
+
@@ -7,14 +8,14 @@
- X
+ bar
- X
+ bar
@@ -23,10 +24,9 @@
- X
+ bar
-
-
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_qs.baseline b/topics/transformation/xbgf/tests/massage_ch_qs.baseline
new file mode 100644
index 00000000..a91619ae
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_qs.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_qs.bgf b/topics/transformation/xbgf/tests/massage_ch_qs.bgf
new file mode 100644
index 00000000..b311c7cb
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_qs.bgf
@@ -0,0 +1,24 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_qs.xbgf b/topics/transformation/xbgf/tests/massage_ch_qs.xbgf
new file mode 100644
index 00000000..fea98887
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_qs.xbgf
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xp.baseline b/topics/transformation/xbgf/tests/massage_ch_xp.baseline
new file mode 100644
index 00000000..0f42f197
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xp.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xp.bgf b/topics/transformation/xbgf/tests/massage_ch_xp.bgf
new file mode 100644
index 00000000..f949ff6c
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xp.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xp.xbgf b/topics/transformation/xbgf/tests/massage_ch_xp.xbgf
new file mode 100644
index 00000000..588654d5
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xp.xbgf
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xq.baseline b/topics/transformation/xbgf/tests/massage_ch_xq.baseline
new file mode 100644
index 00000000..1127ddab
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xq.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xq.bgf b/topics/transformation/xbgf/tests/massage_ch_xq.bgf
new file mode 100644
index 00000000..8356d1ef
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xq.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xq.xbgf b/topics/transformation/xbgf/tests/massage_ch_xq.xbgf
new file mode 100644
index 00000000..03fda332
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xq.xbgf
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xs.baseline b/topics/transformation/xbgf/tests/massage_ch_xs.baseline
new file mode 100644
index 00000000..a91619ae
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xs.baseline
@@ -0,0 +1,13 @@
+
+
+
+ foo
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xs.bgf b/topics/transformation/xbgf/tests/massage_ch_xs.bgf
new file mode 100644
index 00000000..93ffe53f
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xs.bgf
@@ -0,0 +1,20 @@
+
+
+
+ foo
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_ch_xs.xbgf b/topics/transformation/xbgf/tests/massage_ch_xs.xbgf
new file mode 100644
index 00000000..abd2d133
--- /dev/null
+++ b/topics/transformation/xbgf/tests/massage_ch_xs.xbgf
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+ bar
+
+
+
+
+ bar
+
+
+
+
+
+
+
+
+ bar
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage1.baseline b/topics/transformation/xbgf/tests/massage_sel_s.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/massage1.baseline
rename to topics/transformation/xbgf/tests/massage_sel_s.baseline
diff --git a/topics/transformation/xbgf/tests/massage1.bgf b/topics/transformation/xbgf/tests/massage_sel_s.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/massage1.bgf
rename to topics/transformation/xbgf/tests/massage_sel_s.bgf
diff --git a/topics/transformation/xbgf/tests/massage1.xbgf b/topics/transformation/xbgf/tests/massage_sel_s.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/massage1.xbgf
rename to topics/transformation/xbgf/tests/massage_sel_s.xbgf
diff --git a/topics/transformation/xbgf/tests/testcopy b/topics/transformation/xbgf/tests/testcopy
new file mode 100755
index 00000000..c2c6e556
--- /dev/null
+++ b/topics/transformation/xbgf/tests/testcopy
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo Copying...
+cp $1.bgf $2.bgf
+cp $1.baseline $2.baseline
+cp $1.xbgf $2.xbgf
+echo Test case copied.
diff --git a/topics/transformation/xbgf/tests/testrename b/topics/transformation/xbgf/tests/testrename
new file mode 100755
index 00000000..5def4d0a
--- /dev/null
+++ b/topics/transformation/xbgf/tests/testrename
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo Attempting...
+svn mv $1.bgf $2.bgf
+svn mv $1.baseline $2.baseline
+svn mv $1.xbgf $2.xbgf
+rm -f $1.out $1.log
+echo Test case renamed.