diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake
index 3570132c0a4bb46071475000fe6ba27e40548ba5..99a4fd16b87e44cc329ee05149a3f914c129ad7b 100644
--- a/Applications/CLI/Tests.cmake
+++ b/Applications/CLI/Tests.cmake
@@ -12,7 +12,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
 		WRAPPER time
 		TESTER numdiff
 		DIFF_DATA cube_${mesh_size}_result.dat
-		DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1_left_right.gml
+		DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml
 	)
 endforeach(mesh_size)
 
@@ -25,7 +25,7 @@ foreach(mesh_size 2e4 3e4 4e4 5e4 1e5 1e6)
 		WRAPPER time
 		TESTER numdiff
 		DIFF_DATA cube_${mesh_size}_result.dat
-		DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1_left_right.gml
+		DATA cube_${mesh_size}.prj cube_1x1x1_hex_${mesh_size}.vtu cube_1x1x1.gml
 	)
 endforeach(mesh_size)
 
@@ -39,7 +39,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
 		WRAPPER time
 		TESTER numdiff
 		DIFF_DATA square_${mesh_size}_result.dat
-		DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1_left_right.gml
+		DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml
 	)
 endforeach(mesh_size)
 
@@ -52,6 +52,6 @@ foreach(mesh_size 1e5 1e6)
 		WRAPPER time
 		TESTER numdiff
 		DIFF_DATA square_${mesh_size}_result.dat
-		DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1_left_right.gml
+		DATA square_${mesh_size}.prj square_1x1_quad_${mesh_size}.vtu square_1x1.gml
 	)
 endforeach(mesh_size)
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj.md5
index 50c6b07afa4ec80ab2d0b19694776e19b1aff031..0ea1ade1187013f4f9aa4c19c8c84055dcae5153 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e0.prj.md5
@@ -1 +1 @@
-0dc83c8f95c4c371d4fbf86d40154020
+08e6c2177ec6475e1cfd0e59bef5d05d
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj.md5
index 3262c6d2224f66ee1f861de96135a34de84dd914..bac30955c94c7e847bce6febe6331b51c6f1cf35 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e1.prj.md5
@@ -1 +1 @@
-1060d567d8391404dcedce50d8280937
+197b5b63a279c2597c56cc3783e799c8
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj.md5
index fd5b727a32ee1522b89cff6aa45e39fa67717f41..1d3e37992d970d420760eba8db455907944a6479 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e2.prj.md5
@@ -1 +1 @@
-dc2ea685c5cc4f4353cccb42554a0613
+2c48531469e4dbfc25853d64fa6b199d
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj.md5
index a85e9d0574a9e19c4b13a17384abba1afee04cf7..44b65c5636728ec16f27f5ea0f58cfd5eab1a4df 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3.prj.md5
@@ -1 +1 @@
-447e27121b45903b703e1459bbca6b46
+cb795be57a36fba2958bfc923f524685
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj.md5
index 41ebdebc7c9cc8bd17eb4e9a1d4ccb24f9076fb4..26baaa40b14f3713be7fdc72c58607057de27bdd 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e5.prj.md5
@@ -1 +1 @@
-ba97db47e810ae9105e0ba196888c7c9
+c1720b3eb4452281efc143ff6031881e
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj.md5
index 05d29c8ca3268421460b619d29a559d6e709bb7d..0c6e8f83d2ee73a607f2ca935f046cce97602282 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e6.prj.md5
@@ -1 +1 @@
-595c2a60970cee3525956c4b5ac01b4c
+adda6a0740b01f7eabd934999965190b
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1.gml.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1.gml.md5
new file mode 100644
index 0000000000000000000000000000000000000000..699d887fc64ec1459248f5b9c6232734afdac118
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1.gml.md5
@@ -0,0 +1 @@
+1a31691ad2af86018942cd34feb80b8d
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_left_right.gml.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_left_right.gml.md5
deleted file mode 100644
index 149e8696cffb57083fb5ba55168301a7be62079c..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_left_right.gml.md5
+++ /dev/null
@@ -1 +0,0 @@
-b24b837cae7dfc37366383d6bcd88925
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj.md5
index 6859b410ce005aedb047d4c40a44d1b371a9a288..b941a9ab027ede1397ad1ab7e65ed3e839a978c3 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e4.prj.md5
@@ -1 +1 @@
-6b4c5153631de0a6b3503ba5c9ce1fb6
+f459b7ab20bfde7c6d729f4b592e5d1b
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj.md5
index 80453b9f9bfcb869c631c07dd1fc9251b2cd5b7a..f53ad76c7f32134af85072f1d24f5fa257700c62 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_3e4.prj.md5
@@ -1 +1 @@
-86b28e7bf6cbb443570f9d2e70648e81
+7a5cfe043e7c3aa1b601c5fdd547f995
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj.md5
index 900de32bbe81e17d4f92d66ea5681120e3220933..58b81284152c0c302ff9b8e792aedc9f5e9712f7 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_4e4.prj.md5
@@ -1 +1 @@
-7e2305b9a9420374de4ec58f0a27fdba
+c9225b2854c30379ca10ae3bcfff0e4f
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj.md5 b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj.md5
index 92c5e377940845e2c8a861813bc44dd1b0ef49ee..92d4fd2b15b39a049a5845579fccabf681a1ad0e 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj.md5
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_5e4.prj.md5
@@ -1 +1 @@
-1ba68dcc9ecd09d29b102e832d4cd235
+443019341f5538e58cca8ffff332eb2d
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj.md5
index 0dcf080bd234ceb2a6a630e7f06ff41ad1b11ae6..90c42bf3e48f7a9896cb6177b9d12c6a51b42c5d 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e0.prj.md5
@@ -1 +1 @@
-1f15f2e0879e376ee458b1c3eb5afdae
+4f47a064c5055b6951cbb241da1fb84b
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj.md5
index 01b24ab238cb4b757f1edea97cd2f53a81eeee13..32df07d62cf944ac3142a0546c268a122adb4470 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e1.prj.md5
@@ -1 +1 @@
-a228f391739b1f037557704cbad9ffe0
+9ea5d0c4af05c7d86b49fc1a71bfc57f
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj.md5
index 6cc9d61e3078d108cfebe97283316e88f9a0c86e..f87f4bdfc474d10a81a110849992b64b0f770404 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e2.prj.md5
@@ -1 +1 @@
-da0e8c76af728116c9e083554301d1ed
+b02bde8526233ef4d512f4e5c72016f1
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj.md5
index 322c2ad5c055a9970eb447a12265e4850dac908e..5f475f4a1c0bcad2ff02423c192fdc4b96b977c9 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e3.prj.md5
@@ -1 +1 @@
-d287732907f4ace5c28346624c3aae42
+f27b48e76f5d886241fd3693ef07b788
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj.md5
index f77e6f02c467f73255c8ce5b2ca081498cae6287..452b7072462685a7519c96b6591b10999364ceca 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e5.prj.md5
@@ -1 +1 @@
-ae64e86493d470cefae9cb07f8307c9c
+14603d438dd1e16e7d76796d55a6510c
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj.md5
index c3512847569820cf7df80ce8731f9880ba2cbfa6..0d70a18a095c724194efce28224f802fe584d414 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj.md5
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6.prj.md5
@@ -1 +1 @@
-3030672c3dc760b8308558880fca4432
+fd2bed1a64211de85b4adc9373113b03
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1.gml.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1.gml.md5
new file mode 100644
index 0000000000000000000000000000000000000000..2045256586a6c295d907910aac46dc832ce7e1cd
--- /dev/null
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1.gml.md5
@@ -0,0 +1 @@
+d9a462f7e3957fc649a4e9e8830ebe15
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_left_right.gml.md5 b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_left_right.gml.md5
deleted file mode 100644
index 7961154b2dd9e1be4ab6eca1f1648cc5b5dec0ab..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_left_right.gml.md5
+++ /dev/null
@@ -1 +0,0 @@
-8befd8e7d1cec73fee7ef4b5a5732c66