diff --git a/tests/confinement/CMakeLists.txt b/tests/confinement/CMakeLists.txt
index a070d9a..f016bef 100644
--- a/tests/confinement/CMakeLists.txt
+++ b/tests/confinement/CMakeLists.txt
@@ -20,7 +20,8 @@ foreach(_mac ${_macros})
                                                test-out.root -- macros/${_mac})
   set_tests_properties(confinement-mt/${_mac} PROPERTIES LABELS mt)
 
-  add_test(NAME confinement-vis/${_mac} COMMAND remage-cli -g gdml/geometry.gdml -o test-out.root
-                                                -- macros/vis.mac macros/${_mac})
+  add_test(NAME confinement-vis/${_mac}
+           COMMAND remage-cli -g gdml/geometry.gdml -o test-out.root -- macros/_vis.mac
+                   macros/${_mac} macros/_vis-export.mac)
   set_tests_properties(confinement-vis/${_mac} PROPERTIES LABELS vis)
 endforeach()
diff --git a/tests/confinement/macros/init.mac b/tests/confinement/macros/_init.mac
similarity index 100%
rename from tests/confinement/macros/init.mac
rename to tests/confinement/macros/_init.mac
diff --git a/tests/confinement/macros/_vis-export.mac b/tests/confinement/macros/_vis-export.mac
new file mode 100644
index 0000000..7b58471
--- /dev/null
+++ b/tests/confinement/macros/_vis-export.mac
@@ -0,0 +1 @@
+/vis/ogl/export {export-fn}
diff --git a/tests/confinement/macros/vis.mac b/tests/confinement/macros/_vis.mac
similarity index 100%
rename from tests/confinement/macros/vis.mac
rename to tests/confinement/macros/_vis.mac
diff --git a/tests/confinement/macros/complex-volume.mac b/tests/confinement/macros/complex-volume.mac
index 13576b2..a0eca78 100644
--- a/tests/confinement/macros/complex-volume.mac
+++ b/tests/confinement/macros/complex-volume.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -15,4 +15,4 @@
 
 /run/beamOn 5000
 
-/vis/ogl/export complex-volume.pdf
+/control/alias export-fn complex-volume.pdf
diff --git a/tests/confinement/macros/geometrical-and-physical.mac b/tests/confinement/macros/geometrical-and-physical.mac
index 81d93b1..b98d554 100644
--- a/tests/confinement/macros/geometrical-and-physical.mac
+++ b/tests/confinement/macros/geometrical-and-physical.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -20,4 +20,4 @@
 
 /run/beamOn 2000
 
-/vis/ogl/export geometrical-and-physical.pdf
+/control/alias export-fn eometrical-and-physical.pdf
diff --git a/tests/confinement/macros/geometrical-or-physical.mac b/tests/confinement/macros/geometrical-or-physical.mac
index 66b4c08..6b6d247 100644
--- a/tests/confinement/macros/geometrical-or-physical.mac
+++ b/tests/confinement/macros/geometrical-or-physical.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -21,4 +21,4 @@
 
 /run/beamOn 2000
 
-/vis/ogl/export geometrical-or-physical.pdf
+/control/alias export-fn geometrical-or-physical.pdf
diff --git a/tests/confinement/macros/geometrical.mac b/tests/confinement/macros/geometrical.mac
index 291d3bc..1731e69 100644
--- a/tests/confinement/macros/geometrical.mac
+++ b/tests/confinement/macros/geometrical.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -36,4 +36,4 @@
 
 /run/beamOn 5000
 
-/vis/ogl/export geometrical.pdf
+/control/alias export-fn geometrical.pdf
diff --git a/tests/confinement/macros/native-surface.mac b/tests/confinement/macros/native-surface.mac
index 152a21b..e2475bf 100644
--- a/tests/confinement/macros/native-surface.mac
+++ b/tests/confinement/macros/native-surface.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -13,4 +13,4 @@
 
 /run/beamOn 2000
 
-/vis/ogl/export native-surface.pdf
+/control/alias export-fn native-surface.pdf
diff --git a/tests/confinement/macros/native-volume.mac b/tests/confinement/macros/native-volume.mac
index 0cce9b7..1653d04 100644
--- a/tests/confinement/macros/native-volume.mac
+++ b/tests/confinement/macros/native-volume.mac
@@ -1,4 +1,4 @@
-/control/execute macros/init.mac
+/control/execute macros/_init.mac
 
 /RMG/Generator/Confine Volume
 /RMG/Generator/Confinement/ForceContainmentCheck true
@@ -13,4 +13,4 @@
 
 /run/beamOn 2000
 
-/vis/ogl/export native-volume.pdf
+/control/alias export-fn native-volume.pdf