135 files changed, 257 insertions, 132 deletions

diff --git a/tests/regression/dumptest/2d-3d-expected.txt b/tests/regression/dumptest/2d-3d-expected.csg
index 5789ed7..a2f6422 100644
--- a/tests/regression/dumptest/2d-3d-expected.txt
+++ b/tests/regression/dumptest/2d-3d-expected.csg
@@ -1,5 +1,6 @@
+group() {
 	cube(size = [1, 1, 1], center = false);
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		square(size = [1, 1], center = false);
 	}
-
+}
diff --git a/tests/regression/dumptest/allexpressions-expected.csg b/tests/regression/dumptest/allexpressions-expected.csg
new file mode 100644
index 0000000..6009957
--- /dev/null
+++ b/tests/regression/dumptest/allexpressions-expected.csg
@@ -0,0 +1,2 @@
+group() {
+}
diff --git a/tests/regression/dumptest/allexpressions-expected.txt b/tests/regression/dumptest/allexpressions-expected.txt
deleted file mode 100644
index 8b13789..0000000
--- a/tests/regression/dumptest/allexpressions-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regression/dumptest/allfunctions-expected.csg b/tests/regression/dumptest/allfunctions-expected.csg
new file mode 100644
index 0000000..6009957
--- /dev/null
+++ b/tests/regression/dumptest/allfunctions-expected.csg
@@ -0,0 +1,2 @@
+group() {
+}
diff --git a/tests/regression/dumptest/allfunctions-expected.txt b/tests/regression/dumptest/allfunctions-expected.txt
deleted file mode 100644
index 8b13789..0000000
--- a/tests/regression/dumptest/allfunctions-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regression/dumptest/allmodules-expected.txt b/tests/regression/dumptest/allmodules-expected.csg
index 74bf191..42bf4fa 100644
--- a/tests/regression/dumptest/allmodules-expected.txt
+++ b/tests/regression/dumptest/allmodules-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	minkowski(convexity = 0);
 	glide(path = undef, convexity = 0);
 	subdiv(level = 1, convexity = 0);
@@ -38,4 +39,4 @@
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
 	color([-1, -1, -1, 1]);
-
+}
diff --git a/tests/regression/dumptest/assign-expected.csg b/tests/regression/dumptest/assign-expected.csg
new file mode 100644
index 0000000..434cc8f
--- /dev/null
+++ b/tests/regression/dumptest/assign-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	group();
+}
diff --git a/tests/regression/dumptest/assign-expected.txt b/tests/regression/dumptest/assign-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/assign-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/dumptest/assign-tests-expected.txt b/tests/regression/dumptest/assign-tests-expected.csg
index f9db497..df147fe 100644
--- a/tests/regression/dumptest/assign-tests-expected.txt
+++ b/tests/regression/dumptest/assign-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			cube(size = [0, 0, 0], center = false);
@@ -48,4 +49,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/background-modifier-expected.txt b/tests/regression/dumptest/background-modifier-expected.csg
index 5861bef..4d6d019 100644
--- a/tests/regression/dumptest/background-modifier-expected.txt
+++ b/tests/regression/dumptest/background-modifier-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
@@ -17,4 +18,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/child-background-expected.txt b/tests/regression/dumptest/child-background-expected.csg
index c3e8288..fa0286c 100644
--- a/tests/regression/dumptest/child-background-expected.txt
+++ b/tests/regression/dumptest/child-background-expected.csg
@@ -1,7 +1,8 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		group() {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/child-child-test-expected.txt b/tests/regression/dumptest/child-child-test-expected.csg
index 13f098d..2480558 100644
--- a/tests/regression/dumptest/child-child-test-expected.txt
+++ b/tests/regression/dumptest/child-child-test-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 1], [0, 0, 0, 1]]) {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 5, r2 = 5, center = false);
@@ -56,4 +57,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/child-expected.csg b/tests/regression/dumptest/child-expected.csg
new file mode 100644
index 0000000..6009957
--- /dev/null
+++ b/tests/regression/dumptest/child-expected.csg
@@ -0,0 +1,2 @@
+group() {
+}
diff --git a/tests/regression/dumptest/child-expected.txt b/tests/regression/dumptest/child-expected.txt
deleted file mode 100644
index 8b13789..0000000
--- a/tests/regression/dumptest/child-expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/regression/dumptest/child-tests-expected.txt b/tests/regression/dumptest/child-tests-expected.csg
index e1a7557..62363ff 100644
--- a/tests/regression/dumptest/child-tests-expected.txt
+++ b/tests/regression/dumptest/child-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		group() {
 			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -49,4 +50,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/circle-expected.txt b/tests/regression/dumptest/circle-expected.csg
index 1e7bd9a..19c862b 100644
--- a/tests/regression/dumptest/circle-expected.txt
+++ b/tests/regression/dumptest/circle-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	circle($fn = 0, $fa = 12, $fs = 2, r = 1);
-
+}
diff --git a/tests/regression/dumptest/circle-tests-expected.txt b/tests/regression/dumptest/circle-tests-expected.csg
index 28359d8..b522850 100644
--- a/tests/regression/dumptest/circle-tests-expected.txt
+++ b/tests/regression/dumptest/circle-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	circle($fn = 0, $fa = 12, $fs = 2, r = 1);
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 3], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		circle($fn = 0, $fa = 12, $fs = 2, r = 1);
@@ -29,4 +30,4 @@
 	multmatrix([[1, 0, 0, 3], [0, 1, 0, -9], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		circle($fn = 0.1, $fa = 12, $fs = 2, r = 1);
 	}
-
+}
diff --git a/tests/regression/dumptest/color-expected.txt b/tests/regression/dumptest/color-expected.csg
index cead62d..ef862fc 100644
--- a/tests/regression/dumptest/color-expected.txt
+++ b/tests/regression/dumptest/color-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	color([-1, -1, -1, 1]);
-
+}
diff --git a/tests/regression/dumptest/color-tests-expected.txt b/tests/regression/dumptest/color-tests-expected.csg
index 95fe012..a65fdc6 100644
--- a/tests/regression/dumptest/color-tests-expected.txt
+++ b/tests/regression/dumptest/color-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	color([-1, -1, -1, 1]);
 	color([-1, -1, -1, 1]);
 	multmatrix([[1, 0, 0, 12], [0, 1, 0, 12], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -61,4 +62,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/control-hull-dimension-expected.txt b/tests/regression/dumptest/control-hull-dimension-expected.csg
index be2e4ee..720ebe7 100644
--- a/tests/regression/dumptest/control-hull-dimension-expected.txt
+++ b/tests/regression/dumptest/control-hull-dimension-expected.csg
@@ -1,5 +1,6 @@
+group() {
 	hull() {
 		circle($fn = 0, $fa = 12, $fs = 2, r = 1);
 		group();
 	}
-
+}
diff --git a/tests/regression/dumptest/cube-expected.txt b/tests/regression/dumptest/cube-expected.csg
index d1c5d32..91dc5fc 100644
--- a/tests/regression/dumptest/cube-expected.txt
+++ b/tests/regression/dumptest/cube-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	cube(size = [1, 1, 1], center = false);
-
+}
diff --git a/tests/regression/dumptest/cube-tests-expected.txt b/tests/regression/dumptest/cube-tests-expected.csg
index 697c433..848bd27 100644
--- a/tests/regression/dumptest/cube-tests-expected.txt
+++ b/tests/regression/dumptest/cube-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	cube(size = [1, 1, 1], center = false);
 	cube(size = [1, 1, 0], center = false);
 	cube(size = [1, 0, 1], center = false);
@@ -9,4 +10,4 @@
 	multmatrix([[1, 0, 0, 6], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		cube(size = [2, 4, 2], center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/cylinder-expected.txt b/tests/regression/dumptest/cylinder-expected.csg
index 73dcb7c..aa99b6c 100644
--- a/tests/regression/dumptest/cylinder-expected.txt
+++ b/tests/regression/dumptest/cylinder-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 1, r2 = 1, center = false);
-
+}
diff --git a/tests/regression/dumptest/cylinder-tests-expected.txt b/tests/regression/dumptest/cylinder-tests-expected.csg
index c47ffe1..5c57bca 100644
--- a/tests/regression/dumptest/cylinder-tests-expected.txt
+++ b/tests/regression/dumptest/cylinder-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 1, r2 = 1, center = false);
 	multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 0, r2 = 0, center = false);
@@ -35,4 +36,4 @@
 	multmatrix([[1, 0, 0, -10], [0, 1, 0, -10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		cylinder($fn = 0.1, $fa = 12, $fs = 2, h = 7.0711, r1 = 3.5356, r2 = 3.5356, center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/difference-expected.txt b/tests/regression/dumptest/difference-expected.csg
index 84a3635..09b977f 100644
--- a/tests/regression/dumptest/difference-expected.txt
+++ b/tests/regression/dumptest/difference-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	difference();
-
+}
diff --git a/tests/regression/dumptest/difference-tests-expected.txt b/tests/regression/dumptest/difference-tests-expected.csg
index 30dd001..f2c1419 100644
--- a/tests/regression/dumptest/difference-tests-expected.txt
+++ b/tests/regression/dumptest/difference-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference();
 	difference();
 	difference() {
@@ -35,4 +36,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/disable-modifier-expected.txt b/tests/regression/dumptest/disable-modifier-expected.csg
index a237a48..652021e 100644
--- a/tests/regression/dumptest/disable-modifier-expected.txt
+++ b/tests/regression/dumptest/disable-modifier-expected.csg
@@ -1,4 +1,5 @@
+group() {
 	difference() {
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/dxf_linear_extrude-expected.txt b/tests/regression/dumptest/dxf_linear_extrude-expected.csg
index 9ad9e00..5404abf 100644
--- a/tests/regression/dumptest/dxf_linear_extrude-expected.txt
+++ b/tests/regression/dumptest/dxf_linear_extrude-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	linear_extrude(height = 100, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/dxf_rotate_extrude-expected.txt b/tests/regression/dumptest/dxf_rotate_extrude-expected.csg
index c212d76..54f06b3 100644
--- a/tests/regression/dumptest/dxf_rotate_extrude-expected.txt
+++ b/tests/regression/dumptest/dxf_rotate_extrude-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/echo-expected.csg b/tests/regression/dumptest/echo-expected.csg
new file mode 100644
index 0000000..434cc8f
--- /dev/null
+++ b/tests/regression/dumptest/echo-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	group();
+}
diff --git a/tests/regression/dumptest/echo-expected.txt b/tests/regression/dumptest/echo-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/echo-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/dumptest/escape-test-expected.txt b/tests/regression/dumptest/escape-test-expected.csg
index af7f3e7..7303df8 100644
--- a/tests/regression/dumptest/escape-test-expected.txt
+++ b/tests/regression/dumptest/escape-test-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	import(file = "B-\" C-\t D-\n E-'", layer = "A:\\ B:\" C:\t D:\n E:' F:\\\\", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/example001-expected.txt b/tests/regression/dumptest/example001-expected.csg
index 7d92377..ab7e4e9 100644
--- a/tests/regression/dumptest/example001-expected.txt
+++ b/tests/regression/dumptest/example001-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		difference() {
 			sphere($fn = 0, $fa = 12, $fs = 1, r = 25);
@@ -18,4 +19,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example002-expected.txt b/tests/regression/dumptest/example002-expected.csg
index b3a79ce..a34dd2a 100644
--- a/tests/regression/dumptest/example002-expected.txt
+++ b/tests/regression/dumptest/example002-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		intersection() {
 			difference() {
@@ -18,4 +19,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example003-expected.txt b/tests/regression/dumptest/example003-expected.csg
index 480b032..4afbc17 100644
--- a/tests/regression/dumptest/example003-expected.txt
+++ b/tests/regression/dumptest/example003-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		difference() {
 			union() {
@@ -13,4 +14,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example004-expected.txt b/tests/regression/dumptest/example004-expected.csg
index 9fda7fe..606d9a6 100644
--- a/tests/regression/dumptest/example004-expected.txt
+++ b/tests/regression/dumptest/example004-expected.csg
@@ -1,7 +1,8 @@
+group() {
 	group() {
 		difference() {
 			cube(size = [30, 30, 30], center = true);
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 20);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example005-expected.txt b/tests/regression/dumptest/example005-expected.csg
index e584aa7..99c017d 100644
--- a/tests/regression/dumptest/example005-expected.txt
+++ b/tests/regression/dumptest/example005-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -120], [0, 0, 0, 1]]) {
 			difference() {
@@ -40,4 +41,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example006-expected.txt b/tests/regression/dumptest/example006-expected.csg
index 467ccbc..72ac87b 100644
--- a/tests/regression/dumptest/example006-expected.txt
+++ b/tests/regression/dumptest/example006-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		difference() {
 			cube(size = [100, 100, 100], center = true);
@@ -370,4 +371,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example007-expected.txt b/tests/regression/dumptest/example007-expected.csg
index 4e130bd..cc4d4fa 100644
--- a/tests/regression/dumptest/example007-expected.txt
+++ b/tests/regression/dumptest/example007-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 		group() {
 			difference() {
@@ -43,4 +44,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example008-expected.txt b/tests/regression/dumptest/example008-expected.csg
index f6d4a4c..f9116e7 100644
--- a/tests/regression/dumptest/example008-expected.txt
+++ b/tests/regression/dumptest/example008-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		intersection() {
 			multmatrix([[1, 0, 0, -25], [0, 1, 0, -25], [0, 0, 1, -25], [0, 0, 0, 1]]) {
@@ -25,4 +26,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example009-expected.txt b/tests/regression/dumptest/example009-expected.csg
index b4c7bcf..5417d6b 100644
--- a/tests/regression/dumptest/example009-expected.txt
+++ b/tests/regression/dumptest/example009-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	%linear_extrude(height = 22, center = true, convexity = 10, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
 		import(file = "example009.dxf", layer = "body", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	}
@@ -19,4 +20,4 @@
 		}
 		rotate_extrude(file = "example009.dxf", layer = "fan_side", origin = [0, -40], scale = 1, convexity = 10, $fn = 0, $fa = 12, $fs = 2);
 	}
-
+}
diff --git a/tests/regression/dumptest/example010-expected.txt b/tests/regression/dumptest/example010-expected.csg
index d0039ef..7d9c107 100644
--- a/tests/regression/dumptest/example010-expected.txt
+++ b/tests/regression/dumptest/example010-expected.csg
@@ -1,7 +1,8 @@
+group() {
 	intersection() {
 		surface(file = "example010.dat", center = true);
 		multmatrix([[0.70710678118, -0.70710678118, 0, 0], [0.70710678118, 0.70710678118, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			surface(file = "example010.dat", center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example011-expected.txt b/tests/regression/dumptest/example011-expected.csg
index de56dde..653a6cf 100644
--- a/tests/regression/dumptest/example011-expected.txt
+++ b/tests/regression/dumptest/example011-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	polyhedron(points = [[10, 0, 0], [0, 10, 0], [-10, 0, 0], [0, -10, 0], [0, 0, 10]], triangles = [[0, 1, 2, 3], [4, 1, 0], [4, 2, 1], [4, 3, 2], [4, 0, 3]], convexity = 1);
-
+}
diff --git a/tests/regression/dumptest/example012-expected.txt b/tests/regression/dumptest/example012-expected.csg
index 808ed51..2f07112 100644
--- a/tests/regression/dumptest/example012-expected.txt
+++ b/tests/regression/dumptest/example012-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 1, r = 20);
 		multmatrix([[1, 0, 0, -2.92], [0, 1, 0, 0.5], [0, 0, 1, 20], [0, 0, 0, 1]]) {
@@ -6,4 +7,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example013-expected.txt b/tests/regression/dumptest/example013-expected.csg
index d3ddd17..af686e2 100644
--- a/tests/regression/dumptest/example013-expected.txt
+++ b/tests/regression/dumptest/example013-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	intersection() {
 		linear_extrude(height = 100, center = true, convexity = 3, $fn = 0, $fa = 12, $fs = 2) {
 			import(file = "example013.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
@@ -13,4 +14,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example014-expected.txt b/tests/regression/dumptest/example014-expected.csg
index 2b9e21e..ae43ad2 100644
--- a/tests/regression/dumptest/example014-expected.txt
+++ b/tests/regression/dumptest/example014-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	intersection() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			cube(size = [100, 20, 20], center = true);
@@ -12,4 +13,4 @@
 			cube(size = [100, 20, 20], center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example015-expected.txt b/tests/regression/dumptest/example015-expected.csg
index defedcd..4eec6a2 100644
--- a/tests/regression/dumptest/example015-expected.txt
+++ b/tests/regression/dumptest/example015-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		difference() {
 			multmatrix([[1, 0, 0, -35], [0, 1, 0, -35], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -26,4 +27,4 @@
 		}
 		import(file = "example009.dxf", layer = "body", origin = [0, 0], scale = 2, convexity = 6, $fn = 0, $fa = 12, $fs = 2);
 	}
-
+}
diff --git a/tests/regression/dumptest/example016-expected.txt b/tests/regression/dumptest/example016-expected.csg
index 401a9f9..a21c353 100644
--- a/tests/regression/dumptest/example016-expected.txt
+++ b/tests/regression/dumptest/example016-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		group() {
 			cube(size = [65, 28, 28], center = true);
@@ -81,4 +82,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example017-expected.txt b/tests/regression/dumptest/example017-expected.csg
index a27ed75..2603f40 100644
--- a/tests/regression/dumptest/example017-expected.txt
+++ b/tests/regression/dumptest/example017-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group();
 	group();
 	group() {
@@ -212,4 +213,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example018-expected.txt b/tests/regression/dumptest/example018-expected.csg
index 9e6ee4f..7f13f40 100644
--- a/tests/regression/dumptest/example018-expected.txt
+++ b/tests/regression/dumptest/example018-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, -150], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			group() {
@@ -116,4 +117,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example019-expected.txt b/tests/regression/dumptest/example019-expected.csg
index 47406e6..8e078ed 100644
--- a/tests/regression/dumptest/example019-expected.txt
+++ b/tests/regression/dumptest/example019-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, -100], [0, 1, 0, 0], [0, 0, 1, -30], [0, 0, 0, 1]]) {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 45, r1 = 6, r2 = 2, center = false);
@@ -123,4 +124,4 @@
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 55.2857, r1 = 6, r2 = 2, center = false);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example020-expected.txt b/tests/regression/dumptest/example020-expected.csg
index 733f1e1..07d4ff4 100644
--- a/tests/regression/dumptest/example020-expected.txt
+++ b/tests/regression/dumptest/example020-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -30], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			linear_extrude(height = 100, center = false, convexity = 8, twist = 411.429, slices = 34, $fn = 0, $fa = 12, $fs = 1) {
@@ -229,4 +230,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example021-expected.txt b/tests/regression/dumptest/example021-expected.csg
index 8122a9d..964621c 100644
--- a/tests/regression/dumptest/example021-expected.txt
+++ b/tests/regression/dumptest/example021-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -30], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			linear_extrude(height = 0.5, center = true, convexity = 1, $fn = 0, $fa = 12, $fs = 1) {
@@ -264,4 +265,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example022-expected.txt b/tests/regression/dumptest/example022-expected.csg
index bd200f8..9c9eaa2 100644
--- a/tests/regression/dumptest/example022-expected.txt
+++ b/tests/regression/dumptest/example022-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -15], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			group() {
@@ -123,4 +124,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/example024-expected.txt b/tests/regression/dumptest/example024-expected.csg
index e7d6e8b..8755567 100644
--- a/tests/regression/dumptest/example024-expected.txt
+++ b/tests/regression/dumptest/example024-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		multmatrix([[0.81649658092, 0.40824829046, 0.40824829046, 0], [0, 0.70710678118, -0.70710678118, 0], [-0.57735026919, 0.57735026919, 0.57735026919, 0], [0, 0, 0, 1]]) {
 			group() {
@@ -1866,4 +1867,4 @@
 			cube(size = [200, 200, 200], center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/for-expected.csg b/tests/regression/dumptest/for-expected.csg
new file mode 100644
index 0000000..434cc8f
--- /dev/null
+++ b/tests/regression/dumptest/for-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	group();
+}
diff --git a/tests/regression/dumptest/for-expected.txt b/tests/regression/dumptest/for-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/for-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/dumptest/for-nested-tests-expected.txt b/tests/regression/dumptest/for-nested-tests-expected.csg
index d1034b3..7ab595c 100644
--- a/tests/regression/dumptest/for-nested-tests-expected.txt
+++ b/tests/regression/dumptest/for-nested-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
@@ -108,4 +109,4 @@
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 3);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/for-tests-expected.txt b/tests/regression/dumptest/for-tests-expected.csg
index f9cf5e0..7aa29d7 100644
--- a/tests/regression/dumptest/for-tests-expected.txt
+++ b/tests/regression/dumptest/for-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group();
 	group();
 	multmatrix([[1, 0, 0, -10], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -111,4 +112,4 @@
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 5, r2 = 5, center = false);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/glide-expected.txt b/tests/regression/dumptest/glide-expected.csg
index 74fbc08..67e40b8 100644
--- a/tests/regression/dumptest/glide-expected.txt
+++ b/tests/regression/dumptest/glide-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	glide(path = undef, convexity = 0);
-
+}
diff --git a/tests/regression/dumptest/group-expected.csg b/tests/regression/dumptest/group-expected.csg
new file mode 100644
index 0000000..434cc8f
--- /dev/null
+++ b/tests/regression/dumptest/group-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	group();
+}
diff --git a/tests/regression/dumptest/group-expected.txt b/tests/regression/dumptest/group-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/group-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt b/tests/regression/dumptest/highlight-and-background-modifier-expected.csg
index eb8931c..8402355 100644
--- a/tests/regression/dumptest/highlight-and-background-modifier-expected.txt
+++ b/tests/regression/dumptest/highlight-and-background-modifier-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		%cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
@@ -59,4 +60,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/highlight-modifier-expected.txt b/tests/regression/dumptest/highlight-modifier-expected.csg
index c0a29ad..70f3d19 100644
--- a/tests/regression/dumptest/highlight-modifier-expected.txt
+++ b/tests/regression/dumptest/highlight-modifier-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
@@ -17,4 +18,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/hull-expected.csg b/tests/regression/dumptest/hull-expected.csg
new file mode 100644
index 0000000..6f777b0
--- /dev/null
+++ b/tests/regression/dumptest/hull-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	hull();
+}
diff --git a/tests/regression/dumptest/hull-expected.txt b/tests/regression/dumptest/hull-expected.txt
deleted file mode 100644
index 3f27d2f..0000000
--- a/tests/regression/dumptest/hull-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	hull();
-
diff --git a/tests/regression/dumptest/hull-tests-expected.txt b/tests/regression/dumptest/hull-tests-expected.csg
index fd204b6..22b860c 100644
--- a/tests/regression/dumptest/hull-tests-expected.txt
+++ b/tests/regression/dumptest/hull-tests-expected.csg
@@ -1,4 +1,5 @@
 group() {
+group() {
 	group() {
 		hull() {
 			multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -43,4 +44,4 @@ group() {
 			}
 		}
 	}
-}
+}}
diff --git a/tests/regression/dumptest/hull2-tests-expected.txt b/tests/regression/dumptest/hull2-tests-expected.csg
index c14282f..4d4f207 100644
--- a/tests/regression/dumptest/hull2-tests-expected.txt
+++ b/tests/regression/dumptest/hull2-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		hull() {
 			multmatrix([[1, 0, 0, 15], [0, 1, 0, 10], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -62,4 +63,4 @@
 			circle($fn = 0, $fa = 12, $fs = 2, r = 0);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/hull3-tests-expected.txt b/tests/regression/dumptest/hull3-tests-expected.csg
index f8def3b..a15f0ce 100644
--- a/tests/regression/dumptest/hull3-tests-expected.txt
+++ b/tests/regression/dumptest/hull3-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	hull();
 	hull();
 	hull() {
@@ -33,4 +34,4 @@
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 0);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/if-expected.csg b/tests/regression/dumptest/if-expected.csg
new file mode 100644
index 0000000..434cc8f
--- /dev/null
+++ b/tests/regression/dumptest/if-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	group();
+}
diff --git a/tests/regression/dumptest/if-expected.txt b/tests/regression/dumptest/if-expected.txt
deleted file mode 100644
index b2915cb..0000000
--- a/tests/regression/dumptest/if-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	group();
-
diff --git a/tests/regression/dumptest/ifelse-tests-expected.txt b/tests/regression/dumptest/ifelse-tests-expected.csg
index e2d3fce..e5b5c6a 100644
--- a/tests/regression/dumptest/ifelse-tests-expected.txt
+++ b/tests/regression/dumptest/ifelse-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		cube(size = [2, 2, 2], center = true);
 		multmatrix([[1, 0, 0, -3], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -58,4 +59,4 @@
 			cube(size = [2, 2, 2], center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/import-expected.txt b/tests/regression/dumptest/import-expected.csg
index b1d81de..3cafd32 100644
--- a/tests/regression/dumptest/import-expected.txt
+++ b/tests/regression/dumptest/import-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/import_dxf-expected.txt b/tests/regression/dumptest/import_dxf-expected.csg
index b1d81de..3cafd32 100644
--- a/tests/regression/dumptest/import_dxf-expected.txt
+++ b/tests/regression/dumptest/import_dxf-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/import_dxf-tests-expected.txt b/tests/regression/dumptest/import_dxf-tests-expected.csg
index d98b3e2..b6c6d0c 100644
--- a/tests/regression/dumptest/import_dxf-tests-expected.txt
+++ b/tests/regression/dumptest/import_dxf-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	multmatrix([[1, 0, 0, -210], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		import(file = "../../dxf/polygons.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
@@ -24,4 +25,4 @@
 	multmatrix([[1, 0, 0, 200], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		import(file = "../../dxf/polygons.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	}
-
+}
diff --git a/tests/regression/dumptest/import_off-expected.txt b/tests/regression/dumptest/import_off-expected.csg
index b1d81de..3cafd32 100644
--- a/tests/regression/dumptest/import_off-expected.txt
+++ b/tests/regression/dumptest/import_off-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/import_stl-expected.txt b/tests/regression/dumptest/import_stl-expected.csg
index b1d81de..3cafd32 100644
--- a/tests/regression/dumptest/import_stl-expected.txt
+++ b/tests/regression/dumptest/import_stl-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/import_stl-tests-expected.txt b/tests/regression/dumptest/import_stl-tests-expected.csg
index 0d46a6f..a7f460e 100644
--- a/tests/regression/dumptest/import_stl-tests-expected.txt
+++ b/tests/regression/dumptest/import_stl-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	import(file = "import.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		import(file = "import.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
@@ -11,4 +12,4 @@
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		import(file = "import.stl", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	}
-
+}
diff --git a/tests/regression/dumptest/include-tests-expected.txt b/tests/regression/dumptest/include-tests-expected.csg
index 3f3ecd9..37e3952 100644
--- a/tests/regression/dumptest/include-tests-expected.txt
+++ b/tests/regression/dumptest/include-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		group() {
 			cube(size = [1, 1, 1], center = true);
@@ -79,4 +80,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/intersection-expected.txt b/tests/regression/dumptest/intersection-expected.csg
index ed3847d..409e196 100644
--- a/tests/regression/dumptest/intersection-expected.txt
+++ b/tests/regression/dumptest/intersection-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	intersection();
-
+}
diff --git a/tests/regression/dumptest/intersection-tests-expected.txt b/tests/regression/dumptest/intersection-tests-expected.csg
index a9dba29..2b542ef 100644
--- a/tests/regression/dumptest/intersection-tests-expected.txt
+++ b/tests/regression/dumptest/intersection-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	intersection();
 	intersection();
 	intersection() {
@@ -53,4 +54,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/intersection_for-expected.txt b/tests/regression/dumptest/intersection_for-expected.csg
index ed3847d..409e196 100644
--- a/tests/regression/dumptest/intersection_for-expected.txt
+++ b/tests/regression/dumptest/intersection_for-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	intersection();
-
+}
diff --git a/tests/regression/dumptest/intersection_for-tests-expected.txt b/tests/regression/dumptest/intersection_for-tests-expected.csg
index 8f500c9..68e8321 100644
--- a/tests/regression/dumptest/intersection_for-tests-expected.txt
+++ b/tests/regression/dumptest/intersection_for-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	intersection();
 	intersection();
 	intersection() {
@@ -14,4 +15,4 @@
 			cube(size = [100, 20, 20], center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/linear_extrude-expected.txt b/tests/regression/dumptest/linear_extrude-expected.csg
index 9ad9e00..5404abf 100644
--- a/tests/regression/dumptest/linear_extrude-expected.txt
+++ b/tests/regression/dumptest/linear_extrude-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	linear_extrude(height = 100, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.txt b/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.csg
index 950c724..e4d2430 100644
--- a/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.txt
+++ b/tests/regression/dumptest/linear_extrude-scale-zero-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -250,4 +251,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/linear_extrude-tests-expected.txt b/tests/regression/dumptest/linear_extrude-tests-expected.csg
index face5e2..a0deb81 100644
--- a/tests/regression/dumptest/linear_extrude-tests-expected.txt
+++ b/tests/regression/dumptest/linear_extrude-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2) {
@@ -59,4 +60,4 @@
 			square(size = [10, 10], center = true);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/localfiles-compatibility-test-expected.txt b/tests/regression/dumptest/localfiles-compatibility-test-expected.csg
index 95ba49b..f6a574e 100644
--- a/tests/regression/dumptest/localfiles-compatibility-test-expected.txt
+++ b/tests/regression/dumptest/localfiles-compatibility-test-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		linear_extrude(height = 100, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
 			import(file = "localfile.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
@@ -17,4 +18,4 @@
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 100);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/localfiles-test-expected.txt b/tests/regression/dumptest/localfiles-test-expected.csg
index a7e81e5..5bb64f3 100644
--- a/tests/regression/dumptest/localfiles-test-expected.txt
+++ b/tests/regression/dumptest/localfiles-test-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		linear_extrude(height = 100, center = false, convexity = 1, scale = [1, 1], $fn = 0, $fa = 12, $fs = 2) {
 			import(file = "localfiles_dir/localfile.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
@@ -17,4 +18,4 @@
 			sphere($fn = 0, $fa = 12, $fs = 2, r = 100);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/minkowski-expected.txt b/tests/regression/dumptest/minkowski-expected.csg
index 799062f..ecab5f3 100644
--- a/tests/regression/dumptest/minkowski-expected.txt
+++ b/tests/regression/dumptest/minkowski-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	minkowski(convexity = 0);
-
+}
diff --git a/tests/regression/dumptest/minkowski-tests-expected.txt b/tests/regression/dumptest/minkowski-tests-expected.csg
index 7435769..1d132a9 100644
--- a/tests/regression/dumptest/minkowski-tests-expected.txt
+++ b/tests/regression/dumptest/minkowski-tests-expected.csg
@@ -1,4 +1,5 @@
 group() {
+group() {
 	multmatrix([[1, 0, 0, -25], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			minkowski(convexity = 0) {
@@ -63,4 +64,4 @@ group() {
 			}
 		}
 	}
-}
+}}
diff --git a/tests/regression/dumptest/minkowski2-tests-expected.txt b/tests/regression/dumptest/minkowski2-tests-expected.csg
index dc3ad86..ec67feb 100644
--- a/tests/regression/dumptest/minkowski2-tests-expected.txt
+++ b/tests/regression/dumptest/minkowski2-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -20], [0, 1, 0, 5], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			minkowski(convexity = 0) {
@@ -28,4 +29,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/minkowski3-tests-expected.txt b/tests/regression/dumptest/minkowski3-tests-expected.csg
index 5244014..7dc82e1 100644
--- a/tests/regression/dumptest/minkowski3-tests-expected.txt
+++ b/tests/regression/dumptest/minkowski3-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -20], [0, 1, 0, 30], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		group() {
 			minkowski(convexity = 0) {
@@ -30,4 +31,4 @@
 	}
 	minkowski(convexity = 0);
 	minkowski(convexity = 0);
-
+}
diff --git a/tests/regression/dumptest/mirror-expected.txt b/tests/regression/dumptest/mirror-expected.csg
index fdf0ee0..3ad73cb 100644
--- a/tests/regression/dumptest/mirror-expected.txt
+++ b/tests/regression/dumptest/mirror-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	multmatrix([[-1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
-
+}
diff --git a/tests/regression/dumptest/module-recursion-expected.txt b/tests/regression/dumptest/module-recursion-expected.csg
index 9ad8877..5117f53 100644
--- a/tests/regression/dumptest/module-recursion-expected.txt
+++ b/tests/regression/dumptest/module-recursion-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		group() {
 			cylinder($fn = 0, $fa = 12, $fs = 2, h = 1, r1 = 0.2, r2 = 0.2, center = false);
@@ -241,4 +242,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/modulevariables-expected.txt b/tests/regression/dumptest/modulevariables-expected.csg
index fed4bbc..36bc63b 100644
--- a/tests/regression/dumptest/modulevariables-expected.txt
+++ b/tests/regression/dumptest/modulevariables-expected.csg
@@ -1,4 +1,5 @@
+group() {
 	group() {
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 10, r1 = 23, r2 = 10, center = false);
 	}
-
+}
diff --git a/tests/regression/dumptest/multmatrix-expected.txt b/tests/regression/dumptest/multmatrix-expected.csg
index c3185a3..87e28e2 100644
--- a/tests/regression/dumptest/multmatrix-expected.txt
+++ b/tests/regression/dumptest/multmatrix-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
-
+}
diff --git a/tests/regression/dumptest/null-polygons-expected.txt b/tests/regression/dumptest/null-polygons-expected.csg
index d30c909..80125e2 100644
--- a/tests/regression/dumptest/null-polygons-expected.txt
+++ b/tests/regression/dumptest/null-polygons-expected.csg
@@ -1,5 +1,6 @@
+group() {
 	linear_extrude(height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1) {
 		import(file = "null-polygons.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
 	}
 	linear_extrude(file = "null-polygons.dxf", layer = "", origin = [0, 0], scale = 1, height = 100, center = false, convexity = 1, $fn = 0, $fa = 12, $fs = 1);
-
+}
diff --git a/tests/regression/dumptest/polygon-expected.txt b/tests/regression/dumptest/polygon-expected.csg
index a525d29..d04aec9 100644
--- a/tests/regression/dumptest/polygon-expected.txt
+++ b/tests/regression/dumptest/polygon-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	polygon(points = undef, paths = undef, convexity = 1);
-
+}
diff --git a/tests/regression/dumptest/polygon-illegal-winding-expected.txt b/tests/regression/dumptest/polygon-illegal-winding-expected.csg
index 3a4c32b..fa0f4ac 100644
--- a/tests/regression/dumptest/polygon-illegal-winding-expected.txt
+++ b/tests/regression/dumptest/polygon-illegal-winding-expected.csg
@@ -1,3 +1,4 @@
 group() {
+group() {
 	polyhedron(points = [[0, -10, 60], [0, 10, 60], [0, 10, 0], [0, -10, 0], [60, -10, 60], [60, 10, 60], [10, -10, 50], [10, 10, 50], [10, 10, 30], [10, -10, 30], [30, -10, 50], [30, 10, 50]], triangles = [[0, 2, 3], [0, 1, 2], [0, 4, 5], [0, 5, 1], [5, 4, 2], [2, 4, 3], [6, 8, 9], [6, 7, 8], [6, 10, 11], [6, 11, 7], [10, 8, 11], [10, 9, 8], [0, 3, 9], [9, 0, 6], [10, 6, 0], [0, 4, 10], [3, 9, 10], [3, 10, 4], [1, 7, 11], [1, 11, 5], [1, 7, 8], [1, 8, 2], [2, 8, 11], [2, 11, 5]], convexity = 1);
-}
+}}
diff --git a/tests/regression/dumptest/polygon-tests-expected.txt b/tests/regression/dumptest/polygon-tests-expected.csg
index be66d21..56995a5 100644
--- a/tests/regression/dumptest/polygon-tests-expected.txt
+++ b/tests/regression/dumptest/polygon-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	polygon(points = undef, paths = undef, convexity = 1);
 	polygon(points = [], paths = undef, convexity = 1);
 	polygon(points = [[], []], paths = undef, convexity = 1);
@@ -32,4 +33,4 @@
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, -4], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		polygon(points = [[0, 0], [1, 0], [1, 1], [0, 0]], paths = undef, convexity = 1);
 	}
-
+}
diff --git a/tests/regression/dumptest/polyhedron-expected.txt b/tests/regression/dumptest/polyhedron-expected.csg
index 806c952..c37a529 100644
--- a/tests/regression/dumptest/polyhedron-expected.txt
+++ b/tests/regression/dumptest/polyhedron-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	polyhedron(points = undef, triangles = undef, convexity = 1);
-
+}
diff --git a/tests/regression/dumptest/polyhedron-tests-expected.txt b/tests/regression/dumptest/polyhedron-tests-expected.csg
index 7de5236..f59baa2 100644
--- a/tests/regression/dumptest/polyhedron-tests-expected.txt
+++ b/tests/regression/dumptest/polyhedron-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		polyhedron(points = [[1, 0, 0], [-1, 0, 0], [0, 1, 0], [0, -1, 0], [0, 0, 1], [0, 0, -1]], triangles = [[0, 4, 2], [0, 2, 5], [0, 3, 4], [0, 5, 3], [1, 2, 4], [1, 5, 2], [1, 4, 3], [1, 3, 5]], convexity = 1);
 		multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -23,4 +24,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/polyset-reduce-crash-expected.txt b/tests/regression/dumptest/polyset-reduce-crash-expected.csg
index 50253ff..1e83cd2 100644
--- a/tests/regression/dumptest/polyset-reduce-crash-expected.txt
+++ b/tests/regression/dumptest/polyset-reduce-crash-expected.csg
@@ -1,4 +1,5 @@
 group() {
+group() {
 	multmatrix([[0.809017, -0.587785, 0, 0], [0.587785, 0.809017, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		union() {
 			multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -14,4 +15,4 @@ group() {
 			circle($fn = 0, $fa = 12, $fs = 1, r = 20);
 		}
 	}
-}
+}}
diff --git a/tests/regression/dumptest/projection-expected.txt b/tests/regression/dumptest/projection-expected.csg
index 85611b4..d776c2e 100644
--- a/tests/regression/dumptest/projection-expected.txt
+++ b/tests/regression/dumptest/projection-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	projection(cut = false, convexity = 0);
-
+}
diff --git a/tests/regression/dumptest/projection-tests-expected.txt b/tests/regression/dumptest/projection-tests-expected.csg
index 92e6870..86423a1 100644
--- a/tests/regression/dumptest/projection-tests-expected.txt
+++ b/tests/regression/dumptest/projection-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	projection(cut = false, convexity = 0);
 	projection(cut = false, convexity = 0);
 	projection(cut = true, convexity = 0) {
@@ -53,4 +54,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/render-2d-tests-expected.txt b/tests/regression/dumptest/render-2d-tests-expected.csg
index 26b916c..75739b3 100644
--- a/tests/regression/dumptest/render-2d-tests-expected.txt
+++ b/tests/regression/dumptest/render-2d-tests-expected.csg
@@ -1,7 +1,8 @@
+group() {
 	render(convexity = 1) {
 		difference() {
 			square(size = [100, 100], center = true);
 			circle($fn = 0, $fa = 12, $fs = 2, r = 30);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/render-expected.txt b/tests/regression/dumptest/render-expected.csg
index dcc005e..c599c6b 100644
--- a/tests/regression/dumptest/render-expected.txt
+++ b/tests/regression/dumptest/render-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	render(convexity = 1);
-
+}
diff --git a/tests/regression/dumptest/render-tests-expected.txt b/tests/regression/dumptest/render-tests-expected.csg
index 6914270..11aede0 100644
--- a/tests/regression/dumptest/render-tests-expected.txt
+++ b/tests/regression/dumptest/render-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	render(convexity = 1);
 	render(convexity = 1);
 	group() {
@@ -68,4 +69,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/resize-2d-tests-expected.txt b/tests/regression/dumptest/resize-2d-tests-expected.csg
index 0bbdd66..5f8d8b5 100644
--- a/tests/regression/dumptest/resize-2d-tests-expected.txt
+++ b/tests/regression/dumptest/resize-2d-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	color([1, 0, 0, 1]) {
 		multmatrix([[1, 0, 0, -16], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 			multmatrix([[3, 0, 0, 0], [0, 3, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -172,4 +173,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/resize-tests-expected.txt b/tests/regression/dumptest/resize-tests-expected.csg
index f31290c..1e7888a 100644
--- a/tests/regression/dumptest/resize-tests-expected.txt
+++ b/tests/regression/dumptest/resize-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	color([1, 0, 0, 1]) {
 		multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, -10], [0, 0, 0, 1]]) {
 			cube(size = [1, 1, 1], center = false);
@@ -267,4 +268,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/root-modifier-expected.txt b/tests/regression/dumptest/root-modifier-expected.csg
index c0f1da2..d7666d6 100644
--- a/tests/regression/dumptest/root-modifier-expected.txt
+++ b/tests/regression/dumptest/root-modifier-expected.csg
@@ -1,5 +1,6 @@
+group() {
 	difference() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 10);
 		cylinder($fn = 0, $fa = 12, $fs = 2, h = 30, r1 = 6, r2 = 6, center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/root-modifier-if-expected.txt b/tests/regression/dumptest/root-modifier-if-expected.csg
index dfcd15a..0cc2d3e 100644
--- a/tests/regression/dumptest/root-modifier-if-expected.txt
+++ b/tests/regression/dumptest/root-modifier-if-expected.csg
@@ -1,7 +1,8 @@
+group() {
 	group() {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 5);
 	}
 	group() {
 		cube(size = [5, 5, 5], center = false);
 	}
-
+}
diff --git a/tests/regression/dumptest/rotate-expected.txt b/tests/regression/dumptest/rotate-expected.csg
index c3185a3..87e28e2 100644
--- a/tests/regression/dumptest/rotate-expected.txt
+++ b/tests/regression/dumptest/rotate-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
-
+}
diff --git a/tests/regression/dumptest/rotate_extrude-expected.txt b/tests/regression/dumptest/rotate_extrude-expected.csg
index c212d76..54f06b3 100644
--- a/tests/regression/dumptest/rotate_extrude-expected.txt
+++ b/tests/regression/dumptest/rotate_extrude-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/rotate_extrude-tests-expected.txt b/tests/regression/dumptest/rotate_extrude-tests-expected.csg
index 023d78d..a86dd8f 100644
--- a/tests/regression/dumptest/rotate_extrude-tests-expected.txt
+++ b/tests/regression/dumptest/rotate_extrude-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2);
 	rotate_extrude(convexity = 1, $fn = 0, $fa = 12, $fs = 2) {
@@ -49,4 +50,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/rotate_extrude_dxf-tests-expected.txt b/tests/regression/dumptest/rotate_extrude_dxf-tests-expected.csg
index f79e0ce..8e9963c 100644
--- a/tests/regression/dumptest/rotate_extrude_dxf-tests-expected.txt
+++ b/tests/regression/dumptest/rotate_extrude_dxf-tests-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	rotate_extrude(file = "../../dxf/open-polyline.dxf", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2);
-
+}
diff --git a/tests/regression/dumptest/scale-expected.txt b/tests/regression/dumptest/scale-expected.csg
index c3185a3..87e28e2 100644
--- a/tests/regression/dumptest/scale-expected.txt
+++ b/tests/regression/dumptest/scale-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
-
+}
diff --git a/tests/regression/dumptest/scale2D-tests-expected.txt b/tests/regression/dumptest/scale2D-tests-expected.csg
index 9465b8c..b20a975 100644
--- a/tests/regression/dumptest/scale2D-tests-expected.txt
+++ b/tests/regression/dumptest/scale2D-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[2, 0, 0, 0], [0, 1.33333333333, 0, 0], [0, 0, 2, 0], [0, 0, 0, 1]]) {
 		group() {
 			square(size = [2, 3], center = true);
@@ -31,4 +32,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/scale3D-tests-expected.txt b/tests/regression/dumptest/scale3D-tests-expected.csg
index e802117..89bf1af 100644
--- a/tests/regression/dumptest/scale3D-tests-expected.txt
+++ b/tests/regression/dumptest/scale3D-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		multmatrix([[1, 0, 0, 0], [0, 2, 0, 0], [0, 0, 3, 0], [0, 0, 0, 1]]) {
 			group() {
@@ -40,4 +41,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/sphere-expected.txt b/tests/regression/dumptest/sphere-expected.csg
index 1b8369f..8c5b075 100644
--- a/tests/regression/dumptest/sphere-expected.txt
+++ b/tests/regression/dumptest/sphere-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	sphere($fn = 0, $fa = 12, $fs = 2, r = 1);
-
+}
diff --git a/tests/regression/dumptest/sphere-tests-expected.txt b/tests/regression/dumptest/sphere-tests-expected.csg
index 461e946..45c0858 100644
--- a/tests/regression/dumptest/sphere-tests-expected.txt
+++ b/tests/regression/dumptest/sphere-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	sphere($fn = 0, $fa = 12, $fs = 2, r = 1);
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		sphere($fn = 0, $fa = 12, $fs = 2, r = 0);
@@ -29,4 +30,4 @@
 	multmatrix([[1, 0, 0, 11], [0, 1, 0, 22], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		sphere($fn = 0.1, $fa = 12, $fs = 2, r = 5);
 	}
-
+}
diff --git a/tests/regression/dumptest/square-expected.txt b/tests/regression/dumptest/square-expected.csg
index 0f14657..a4a24d8 100644
--- a/tests/regression/dumptest/square-expected.txt
+++ b/tests/regression/dumptest/square-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	square(size = [1, 1], center = false);
-
+}
diff --git a/tests/regression/dumptest/square-tests-expected.txt b/tests/regression/dumptest/square-tests-expected.csg
index c23c83d..6569da4 100644
--- a/tests/regression/dumptest/square-tests-expected.txt
+++ b/tests/regression/dumptest/square-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	square(size = [1, 1], center = false);
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		square(size = [1, 1], center = true);
@@ -20,4 +21,4 @@
 	multmatrix([[1, 0, 0, 6], [0, 1, 0, 2], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		square(size = [2, 1], center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/subdiv-expected.txt b/tests/regression/dumptest/subdiv-expected.csg
index cd7d37e..bc40dc2 100644
--- a/tests/regression/dumptest/subdiv-expected.txt
+++ b/tests/regression/dumptest/subdiv-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	subdiv(level = 1, convexity = 0);
-
+}
diff --git a/tests/regression/dumptest/surface-expected.txt b/tests/regression/dumptest/surface-expected.csg
index 7ed73bd..4c9b5b8 100644
--- a/tests/regression/dumptest/surface-expected.txt
+++ b/tests/regression/dumptest/surface-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	surface(file = "", center = false);
-
+}
diff --git a/tests/regression/dumptest/surface-simple-expected.txt b/tests/regression/dumptest/surface-simple-expected.csg
index 48c918f..4def193 100644
--- a/tests/regression/dumptest/surface-simple-expected.txt
+++ b/tests/regression/dumptest/surface-simple-expected.csg
@@ -1,5 +1,6 @@
+group() {
 	surface(file = "surface-simple.dat", center = true);
 	multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		surface(file = "surface-simple2.dat", center = true);
 	}
-
+}
diff --git a/tests/regression/dumptest/surface-tests-expected.txt b/tests/regression/dumptest/surface-tests-expected.csg
index e3b59c5..18246f5 100644
--- a/tests/regression/dumptest/surface-tests-expected.txt
+++ b/tests/regression/dumptest/surface-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	surface(file = "", center = false);
 	surface(file = "surface.dat", center = true);
-
+}
diff --git a/tests/regression/dumptest/testcolornames-expected.txt b/tests/regression/dumptest/testcolornames-expected.csg
index 63b5e70..06cb365 100644
--- a/tests/regression/dumptest/testcolornames-expected.txt
+++ b/tests/regression/dumptest/testcolornames-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, 1], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		color([0.803922, 0.360784, 0.360784, 1]) {
 			sphere($fn = 5, $fa = 12, $fs = 2, r = 0.8);
@@ -703,4 +704,4 @@
 			sphere($fn = 5, $fa = 12, $fs = 2, r = 0.8);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/text-search-test-expected.txt b/tests/regression/dumptest/text-search-test-expected.csg
index f0c8aad..72e6572 100644
--- a/tests/regression/dumptest/text-search-test-expected.txt
+++ b/tests/regression/dumptest/text-search-test-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group();
 	group() {
 		multmatrix([[1, 0, 0, -60], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -845,4 +846,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/transform-tests-expected.txt b/tests/regression/dumptest/transform-tests-expected.csg
index 97657da..892af51 100644
--- a/tests/regression/dumptest/transform-tests-expected.txt
+++ b/tests/regression/dumptest/transform-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, 25], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		multmatrix([[1, 0, 0, 0], [0, 2, 0, 0], [0, 0, 0.5, 0], [0, 0, 0, 1]]) {
 			group() {
@@ -41,4 +42,4 @@
 			cylinder($fn = 0, $fa = 12, $fs = 1, h = 20, r1 = 10, r2 = 0, center = false);
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/translate-expected.txt b/tests/regression/dumptest/translate-expected.csg
index c3185a3..87e28e2 100644
--- a/tests/regression/dumptest/translate-expected.txt
+++ b/tests/regression/dumptest/translate-expected.csg
@@ -1,2 +1,3 @@
+group() {
 	multmatrix([[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]);
-
+}
diff --git a/tests/regression/dumptest/union-expected.csg b/tests/regression/dumptest/union-expected.csg
new file mode 100644
index 0000000..34f53c2
--- /dev/null
+++ b/tests/regression/dumptest/union-expected.csg
@@ -0,0 +1,3 @@
+group() {
+	union();
+}
diff --git a/tests/regression/dumptest/union-expected.txt b/tests/regression/dumptest/union-expected.txt
deleted file mode 100644
index 654849e..0000000
--- a/tests/regression/dumptest/union-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-	union();
-
diff --git a/tests/regression/dumptest/union-tests-expected.txt b/tests/regression/dumptest/union-tests-expected.csg
index b0a30f6..064fbe2 100644
--- a/tests/regression/dumptest/union-tests-expected.txt
+++ b/tests/regression/dumptest/union-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	multmatrix([[1, 0, 0, -12], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
 		union() {
 			cube(size = [10, 10, 10], center = false);
@@ -44,4 +45,4 @@
 			}
 		}
 	}
-
+}
diff --git a/tests/regression/dumptest/use-tests-expected.txt b/tests/regression/dumptest/use-tests-expected.csg
index 1095708..c47fa74 100644
--- a/tests/regression/dumptest/use-tests-expected.txt
+++ b/tests/regression/dumptest/use-tests-expected.csg
@@ -1,3 +1,4 @@
+group() {
 	group() {
 		group() {
 			multmatrix([[1, 0, 0, 2], [0, 1, 0, 0], [0, 0, 1, 0], [0, 0, 0, 1]]) {
@@ -98,4 +99,4 @@
 			}
 		}
 	}
-
+}