diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case1/geometry.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case1/geometry.xml
deleted file mode 100644
index e66b004c5..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case1/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case1/materials.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case1/materials.xml
deleted file mode 100644
index e3e2097cb..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case1/materials.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../../../macro_2g.h5
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case1/results_true.dat b/tests/regression_tests/mg_temperature/macro/interpolation/case1/results_true.dat
deleted file mode 100644
index 8cc89cfb0..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case1/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.422739E+00 1.661420E-03
-k-analytical:
-1.418514E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case1/settings.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case1/settings.xml
deleted file mode 100644
index 4a51e8e80..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case1/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- interpolation
-
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case2/geometry.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case2/geometry.xml
deleted file mode 100644
index 838fb9f68..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case2/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case2/materials.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case2/materials.xml
deleted file mode 100644
index e3e2097cb..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case2/materials.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../../../macro_2g.h5
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case2/results_true.dat b/tests/regression_tests/mg_temperature/macro/interpolation/case2/results_true.dat
deleted file mode 100644
index 965fe8002..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case2/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.410995E+00 2.169214E-03
-k-analytical:
-1.410164E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/macro/interpolation/case2/settings.xml b/tests/regression_tests/mg_temperature/macro/interpolation/case2/settings.xml
deleted file mode 100644
index 4a51e8e80..000000000
--- a/tests/regression_tests/mg_temperature/macro/interpolation/case2/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- interpolation
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case1/geometry.xml b/tests/regression_tests/mg_temperature/macro/nearest/case1/geometry.xml
deleted file mode 100644
index f64d31593..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case1/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case1/materials.xml b/tests/regression_tests/mg_temperature/macro/nearest/case1/materials.xml
deleted file mode 100644
index e3e2097cb..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case1/materials.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../../../macro_2g.h5
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case1/results_true.dat b/tests/regression_tests/mg_temperature/macro/nearest/case1/results_true.dat
deleted file mode 100644
index 5d7f81f28..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case1/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.443970E+00 3.267499E-03
-k-analytical:
-1.440410E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case1/settings.xml b/tests/regression_tests/mg_temperature/macro/nearest/case1/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case1/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case2/geometry.xml b/tests/regression_tests/mg_temperature/macro/nearest/case2/geometry.xml
deleted file mode 100644
index de5693110..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case2/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case2/materials.xml b/tests/regression_tests/mg_temperature/macro/nearest/case2/materials.xml
deleted file mode 100644
index e3e2097cb..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case2/materials.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../../../macro_2g.h5
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case2/results_true.dat b/tests/regression_tests/mg_temperature/macro/nearest/case2/results_true.dat
deleted file mode 100644
index 965fe8002..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case2/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.410995E+00 2.169214E-03
-k-analytical:
-1.410164E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case2/settings.xml b/tests/regression_tests/mg_temperature/macro/nearest/case2/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case2/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case3/geometry.xml b/tests/regression_tests/mg_temperature/macro/nearest/case3/geometry.xml
deleted file mode 100644
index a95b7b55a..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case3/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case3/materials.xml b/tests/regression_tests/mg_temperature/macro/nearest/case3/materials.xml
deleted file mode 100644
index e3e2097cb..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case3/materials.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- ../../../macro_2g.h5
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case3/results_true.dat b/tests/regression_tests/mg_temperature/macro/nearest/case3/results_true.dat
deleted file mode 100644
index 39d3eb5e3..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case3/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.411726E+00 2.151179E-03
-k-analytical:
-1.407830E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/macro/nearest/case3/settings.xml b/tests/regression_tests/mg_temperature/macro/nearest/case3/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/macro/nearest/case3/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case1/geometry.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case1/geometry.xml
deleted file mode 100644
index b54f27f41..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case1/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case1/materials.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case1/materials.xml
deleted file mode 100644
index 98f9236e6..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case1/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- ../../../micro_2g.h5
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case1/results_true.dat b/tests/regression_tests/mg_temperature/micro/interpolation/case1/results_true.dat
deleted file mode 100644
index 8cc89cfb0..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case1/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.422739E+00 1.661420E-03
-k-analytical:
-1.418514E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case1/settings.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case1/settings.xml
deleted file mode 100644
index 4a51e8e80..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case1/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- interpolation
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case2/geometry.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case2/geometry.xml
deleted file mode 100644
index 4eeb35ac8..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case2/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case2/materials.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case2/materials.xml
deleted file mode 100644
index 98f9236e6..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case2/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- ../../../micro_2g.h5
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case2/results_true.dat b/tests/regression_tests/mg_temperature/micro/interpolation/case2/results_true.dat
deleted file mode 100644
index 965fe8002..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case2/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.410995E+00 2.169214E-03
-k-analytical:
-1.410164E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/micro/interpolation/case2/settings.xml b/tests/regression_tests/mg_temperature/micro/interpolation/case2/settings.xml
deleted file mode 100644
index 4a51e8e80..000000000
--- a/tests/regression_tests/mg_temperature/micro/interpolation/case2/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- interpolation
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case1/geometry.xml b/tests/regression_tests/mg_temperature/micro/nearest/case1/geometry.xml
deleted file mode 100644
index e1da2fa5c..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case1/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case1/materials.xml b/tests/regression_tests/mg_temperature/micro/nearest/case1/materials.xml
deleted file mode 100644
index 98f9236e6..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case1/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- ../../../micro_2g.h5
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case1/results_true.dat b/tests/regression_tests/mg_temperature/micro/nearest/case1/results_true.dat
deleted file mode 100644
index 5d7f81f28..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case1/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.443970E+00 3.267499E-03
-k-analytical:
-1.440410E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case1/settings.xml b/tests/regression_tests/mg_temperature/micro/nearest/case1/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case1/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case2/geometry.xml b/tests/regression_tests/mg_temperature/micro/nearest/case2/geometry.xml
deleted file mode 100644
index 1ac560e8f..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case2/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case2/materials.xml b/tests/regression_tests/mg_temperature/micro/nearest/case2/materials.xml
deleted file mode 100644
index 98f9236e6..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case2/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- ../../../micro_2g.h5
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case2/results_true.dat b/tests/regression_tests/mg_temperature/micro/nearest/case2/results_true.dat
deleted file mode 100644
index 965fe8002..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case2/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.410995E+00 2.169214E-03
-k-analytical:
-1.410164E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case2/settings.xml b/tests/regression_tests/mg_temperature/micro/nearest/case2/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case2/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case3/geometry.xml b/tests/regression_tests/mg_temperature/micro/nearest/case3/geometry.xml
deleted file mode 100644
index c8d1164f1..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case3/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- |
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case3/materials.xml b/tests/regression_tests/mg_temperature/micro/nearest/case3/materials.xml
deleted file mode 100644
index 98f9236e6..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case3/materials.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- ../../../micro_2g.h5
-
-
-
-
-
-
-
-
-
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case3/results_true.dat b/tests/regression_tests/mg_temperature/micro/nearest/case3/results_true.dat
deleted file mode 100644
index 39d3eb5e3..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case3/results_true.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-k-combined:
-1.411726E+00 2.151179E-03
-k-analytical:
-1.407830E+00
\ No newline at end of file
diff --git a/tests/regression_tests/mg_temperature/micro/nearest/case3/settings.xml b/tests/regression_tests/mg_temperature/micro/nearest/case3/settings.xml
deleted file mode 100644
index b5ad0fec4..000000000
--- a/tests/regression_tests/mg_temperature/micro/nearest/case3/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- eigenvalue
- 5000
- 15
- 5
-
-
- -11.1 -11.1 -11.1 11.1 11.1 11.1
-
-
-
- multi-group
- nearest
-
diff --git a/tests/regression_tests/mg_temperature/results_true.dat b/tests/regression_tests/mg_temperature/results_true.dat
new file mode 100644
index 000000000..e37bc533a
--- /dev/null
+++ b/tests/regression_tests/mg_temperature/results_true.dat
@@ -0,0 +1,40 @@
+micro, method: nearest, t: 300.0, k-combined:
+1.439920E+00 4.801994E-04
+kanalyt
+1.440410E+00
+micro, method: nearest, t: 600.0, k-combined:
+1.410482E+00 4.811844E-04
+kanalyt
+1.410164E+00
+micro, method: nearest, t: 900.0, k-combined:
+1.408198E+00 4.885882E-04
+kanalyt
+1.407830E+00
+micro, method: interpolation, t: 520.0, k-combined:
+1.418780E+00 5.222658E-04
+kanalyt
+1.418514E+00
+micro, method: interpolation, t: 600.0, k-combined:
+1.410482E+00 4.811844E-04
+kanalyt
+1.410164E+00
+macro, method: nearest, t: 300.0, k-combined:
+1.439920E+00 4.801994E-04
+kanalyt
+1.440410E+00
+macro, method: nearest, t: 600.0, k-combined:
+1.410482E+00 4.811844E-04
+kanalyt
+1.410164E+00
+macro, method: nearest, t: 900.0, k-combined:
+1.408198E+00 4.885882E-04
+kanalyt
+1.407830E+00
+macro, method: interpolation, t: 520.0, k-combined:
+1.418780E+00 5.222658E-04
+kanalyt
+1.418514E+00
+macro, method: interpolation, t: 600, k-combined:
+1.410482E+00 4.811844E-04
+kanalyt
+1.410164E+00