From 87f60eaf35551dfc9629d2d51d9720712de9c21b Mon Sep 17 00:00:00 2001
From: Liwei Ji <jiliwei.phys@gmail.com>
Date: Thu, 14 Nov 2024 19:45:24 -0500
Subject: [PATCH] Feature/subcycle dev (#1)

* CI: Update to AMReX 24.09

* Arith: Implement efficient SIMD trigonometic functions

* Arith: Correct SIMD tests

* Arith: Correct SIMD tests

* Arith: Remove `constexpr` that some compilers don't like

* Arith: Remove `constexpr` that some compilers don't like

* TestDerivs: Correct C++ calls to trigonometic functions

* CI: Disable SIMD the new way

* CI: Update Docker images

* CI: Correct Docker image names

* CarpetX: Update to nvtx3

* CI: Reduce optimization level for OneAPI

* CI: Switch to production images

* CarpetXRegrid: Move regrid_error to a new thorn.

* CI: Add CarpetXRegrid to thorn list

* CarpetX: Change the implementation to Driver

This involves adding a parameter "periodic" whose default value is "no."
It also involves modifying parameter files, file names, and source files
where the name "CarpetX" needs to be replaced by "Driver."

* Algo: remove parameter file and changing data from test output

* BenchX: sort thorns alphabetically

* BenchX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* BoxInBox: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* ErrorEstimator: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* FluxWaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* MovingBoxToy: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* PoissonX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* SiMDWaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* SpacetimeWaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* StaggeredWaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestArrayGroup: remove parameter file and changing data from test output

* TestBoundaries: adapt to moving regrid error into its own thorn

* TestBoxInBox: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestDerivs: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestInterpolate: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestLoopX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestNorms: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestODESolvers: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestODESolvers2: remove parameter file and changing data from test output

* TestOutput: adapt to moving regrid error into its own thorn

* TestProlongate: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* TestSymmetries: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* WaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"

* ODESolvers: Schedule `ODESolvers_PostStep` after recovering

* Loop: Update AMReX include files

* ADMBaseX: Clean up schedule

* HydroBaseX: Clean up schedule

* CarpetX: Correct ENO operators

* CarpetX: Correct ENO operators

* CarpetX: Correct poison check on HIP systems

* CarpetX: Implement `minmod` prolongation operator

* CarpetX: Support openPMD_api 0.16.0

* CarpetX: Use Blosc compression by default for openPMD output

* CarpetX: Reformat code

* CarpetX: ADIOS2: Avoid too much screen output

* CarpetX: ADIOS2: Use Blosc compression by default

* Arith: Clean up code

* BoxInBox: Don't allow zero radius

* Loop: Inline more aggressively

* MovingBoxToy: Code cleanup

* TestSymmetries: Beautify code

* Loop: New macro CCTK_KERNEL

* CI: Update Docker images

* FluxWaveToyX: Correct RHS handling after ODESolver update

* SIMDWaveToyX: Correct RHS handling after ODESolver update

* WaveToyX: Correct RHS handling after ODESolver update

* StaggeredWaveToyX: Correct RHS handling after ODESolver update

* CI: Update Docker images to AMReX 24.11

* FluxWaveToyX: Correct schedule and test output

* TestODESolvers: Correct schedule

* TestProlongate: Remove unsupporte 1st-order ENO operators

* CarpetX: only use BLOSC2 if compiled into ADIOS2 (#314)

* CarpetX: Reduce termination condition

Reduce the final termination condition, not just the run time. This guarantees that all processes will terminate at the same iteration.

* CarpetX: Correct error check in interpolator

* CarpetX: Simplify error output in interpolator

* CarpetX: Slight performance improvement in interpolator

* CarpetX: Improve safety/reduce warnings in interpolator

* TestInterpolate: Test cell-centred interpolation

* Loop: explicitly create function args to avoid compiler issue

* ODESolvers: rename CarpetX to Driver

* Subcycling: rename CarpetX to Driver

* TestDerivs: remove Arith:: for cos

* TestSubcyclingMC: rename CarpetX to Driver

* TestSubcyclingMC2: remove INHERITS: CarpetX

* TestDerivs: update derivs-8th-order.par

* TestSubcycling: change implementation to Driver

* TestSubcycling: change implementation to Driver

* TestSubcyclingMC2: change implementation to Driver

---------

Co-authored-by: Erik Schnetter <schnetter@gmail.com>
Co-authored-by: Steven R. Brandt <sbrandt@cct.lsu.edu>
Co-authored-by: Roland Haas <rhaas@illinois.edu>
---
 ADMBaseX/schedule.ccl                         |  44 +-
 Algo/test/test_roots.par                      |   6 +
 Arith/src/defs.hxx                            |  16 +-
 Arith/src/simd.cxx                            | 153 +++++-
 Arith/src/simd.hxx                            | 472 +++++++++++++-----
 BenchX/par/benchmark-carpet.par               |   2 +-
 BenchX/par/benchmark-carpetx.par              |   2 +-
 BenchX/par/benchmark-z4c+asterx.par           |   2 +-
 BenchX/par/benchmark-z4c+grhydrox.par         |   4 +-
 BenchX/par/benchmark-z4c.par                  |   4 +-
 BoxInBox/interface.ccl                        |   2 +-
 BoxInBox/param.ccl                            |  24 +-
 BoxInBox/schedule.ccl                         |   4 +-
 BoxInBox/test/levels1.par                     |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/levels2.par                     |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/levels20.par                    |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/levels3.par                     |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/regions2.par                    |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/regions3.par                    |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 BoxInBox/test/unigrid.par                     |   4 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000010.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 CarpetX/configuration.ccl                     |   2 +-
 CarpetX/doc/documentation.tex                 |   9 +-
 CarpetX/interface.ccl                         |  13 +-
 CarpetX/par/brill-lindquist-checkpoint.par    |   6 +-
 CarpetX/par/brill-lindquist-read.par          |   6 +-
 CarpetX/par/brill-lindquist-recover.par       |   6 +-
 CarpetX/par/brill-lindquist-write.par         |   6 +-
 CarpetX/param.ccl                             |  39 +-
 CarpetX/schedule.ccl                          |  10 -
 CarpetX/src/driver.cxx                        | 195 +++++++-
 CarpetX/src/interpolate.cxx                   |  39 +-
 CarpetX/src/io_adios2.cxx                     |  28 +-
 CarpetX/src/io_openpmd.cxx                    |  61 ++-
 CarpetX/src/make.code.defn                    |   3 +-
 CarpetX/src/prolongate_3d_rf2.cxx             |   2 +
 CarpetX/src/prolongate_3d_rf2.hxx             | 223 +++++++--
 CarpetX/src/prolongate_3d_rf2_impl.hxx        | 360 +++++++++----
 CarpetX/src/prolongate_3d_rf2_impl_eno.cxx    |  31 +-
 CarpetX/src/prolongate_3d_rf2_impl_minmod.cxx |  58 +++
 .../prolongate_3d_rf2_impl_poly_eno3lfb.cxx   | 130 +++++
 CarpetX/src/schedule.cxx                      |  60 +--
 CarpetX/src/timer.hxx                         |   2 +-
 CarpetX/src/valid.cxx                         |  99 ++--
 CarpetX/stencils/stencils.jl                  | 288 +++++++++++
 CarpetXRegrid/README                          |  11 +
 CarpetXRegrid/configuration.ccl               |   6 +
 CarpetXRegrid/doc/documentation.tex           | 210 ++++++++
 CarpetXRegrid/interface.ccl                   |   9 +
 CarpetXRegrid/param.ccl                       |   1 +
 CarpetXRegrid/schedule.ccl                    |   6 +
 CarpetXRegrid/src/make.code.defn              |   7 +
 .../src/regrid_error.cxx                      |  13 +-
 ErrorEstimator/interface.ccl                  |   2 +-
 ErrorEstimator/schedule.ccl                   |   4 +-
 FluxWaveToyX/interface.ccl                    |   6 +-
 FluxWaveToyX/par/standing.par                 |   7 +-
 FluxWaveToyX/schedule.ccl                     |  41 +-
 FluxWaveToyX/test/radiative.par               |   5 +
 .../fluxwavetoyx-flux_x.it000000.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.z.tsv        |  12 +
 .../fluxwavetoyx-flux_z.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.z.tsv        |  12 +
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 FluxWaveToyX/test/reflecting.par              |   5 +
 .../fluxwavetoyx-flux_x.it000000.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.z.tsv        |  12 +
 .../fluxwavetoyx-flux_z.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.z.tsv        |  12 +
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 FluxWaveToyX/test/standing.par                |  12 +-
 .../fluxwavetoyx-flux_x.it000000.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.x.tsv        |  12 +
 .../fluxwavetoyx-flux_x.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_x.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000000.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000000.z.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_y.it000010.y.tsv        |  12 +
 .../fluxwavetoyx-flux_y.it000010.z.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000000.z.tsv        |  12 +
 .../fluxwavetoyx-flux_z.it000010.x.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.y.tsv        |  11 +
 .../fluxwavetoyx-flux_z.it000010.z.tsv        |  12 +
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 HydroBaseX/schedule.ccl                       |  34 +-
 Loop/src/loop.hxx                             | 105 ++--
 Loop/src/loop_device.hxx                      |  44 +-
 MovingBoxToy/configuration.ccl                |   2 +-
 MovingBoxToy/interface.ccl                    |   2 +-
 MovingBoxToy/par/circle.par                   |   5 +-
 MovingBoxToy/param.ccl                        |   2 +-
 MovingBoxToy/schedule.ccl                     |   2 +-
 MovingBoxToy/src/movingboxtoy.cxx             |  19 +-
 MovingBoxToy/test/circle.par                  |   6 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.z.tsv} |   0
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 ODESolvers/param.ccl                          |   2 +-
 ODESolvers/schedule.ccl                       |  76 ++-
 PoissonX/par/poissonx-fd4.par                 |   6 +-
 PoissonX/par/poissonx-logo.par                |   6 +-
 PoissonX/par/poissonx-rl2.par                 |   8 +-
 PoissonX/par/poissonx-rl4.par                 |   8 +-
 PoissonX/par/poissonx.par                     |   6 +-
 SIMDWaveToyX/par/standing.par                 |   7 +-
 SIMDWaveToyX/schedule.ccl                     |  22 +-
 SIMDWaveToyX/test/standing.par                |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 SpacetimeWaveToyX/par/standing.par            |   7 +-
 SpacetimeWaveToyX/test/standing.par           |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 SpacetimeWaveToyX/test/standing/standing.par  |  49 --
 StaggeredWaveToyX/par/standing.par            |   7 +-
 StaggeredWaveToyX/schedule.ccl                |  41 +-
 StaggeredWaveToyX/test/standing.par           |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 StaggeredWaveToyX/test/standing/standing.par  |  53 --
 Subcycling/param.ccl                          |   2 +-
 TestArrayGroup/test/testarraygroup.par        |   3 +-
 TestBoundaries/par/test_boundaries.par        |   1 +
 TestBoxInBox/test/moving.par                  |   4 +-
 TestDerivs/interface.ccl                      |   2 +-
 TestDerivs/schedule.ccl                       |   2 +-
 TestDerivs/src/test.cxx                       |   2 +-
 TestDerivs/test/derivs-2nd-order.par          |   9 +-
 TestDerivs/test/derivs-4th-order.par          |   9 +-
 TestDerivs/test/derivs-6th-order.par          |  11 +-
 TestDerivs/test/derivs-8th-order.par          |   9 +-
 TestInterpolate/param.ccl                     |   8 +
 TestInterpolate/schedule.ccl                  |  26 +-
 TestInterpolate/src/make.code.defn            |   2 +-
 .../src/test_cell_interpolation.cxx           | 163 ++++++
 ...tion.cxx => test_vertex_interpolation.cxx} |   4 +-
 .../{interpolate.par => cell_interpolate.par} |   6 +-
 .../testinterpolate-reference.it000000.tsv    |   0
 ...te-results_driver_interpolate.it000000.tsv |   0
 ...terpolate-results_interpolate.it000000.tsv |   0
 TestInterpolate/test/vertex_interpolate.par   |  50 ++
 .../testinterpolate-reference.it000000.tsv    |   2 +
 ...te-results_driver_interpolate.it000000.tsv |   2 +
 ...terpolate-results_interpolate.it000000.tsv |   2 +
 TestLoopX/interface.ccl                       |   2 -
 .../test/testloopx_outermost_interior.par     |  14 +-
 TestNorms/interface.ccl                       |   2 +-
 TestNorms/schedule.ccl                        |   2 +-
 TestNorms/test/norms.par                      |   2 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/schedule.ccl                   |  17 +-
 TestODESolvers/test/test-constant.par         |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-dp87.par             |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-euler.par            |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk2.par              |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk3.par              |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rk4.par              |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-rkf78.par            |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers/test/test-ssprk3.par           |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 TestODESolvers2/test/test-constant.par        |   4 +-
 TestODESolvers2/test/test-dp87.par            |   4 +-
 TestODESolvers2/test/test-euler.par           |   4 +-
 TestODESolvers2/test/test-rk2.par             |   4 +-
 TestODESolvers2/test/test-rk3.par             |   4 +-
 TestODESolvers2/test/test-rk4.par             |   4 +-
 TestODESolvers2/test/test-rkf78.par           |   4 +-
 TestODESolvers2/test/test-ssprk3.par          |   4 +-
 TestOutput/test/checkpoint-openpmd.par        |   3 +-
 TestOutput/test/output-arrays.par             |   3 +-
 TestOutput/test/output-every0.par             |   3 +-
 TestOutput/test/output-every1.par             |   3 +-
 TestOutput/test/output-every3.par             |   3 +-
 TestOutput/test/output-openpmd.par            |   3 +-
 TestOutput/test/output-tsv-every0.par         |   3 +-
 TestOutput/test/output-tsv-every1.par         |   3 +-
 TestOutput/test/output-tsv-every3.par         |   3 +-
 TestOutput/test/recover-openpmd.par           |   3 +-
 TestProlongate/interface.ccl                  |   2 +-
 TestProlongate/schedule.ccl                   |   4 +-
 TestProlongate/test/test_cc_co_o1.par         |   3 +-
 TestProlongate/test/test_cc_nc_o1.par         |   3 +-
 TestProlongate/test/test_cc_nc_o3.par         |   3 +-
 TestProlongate/test/test_ddf_o1.par           |   3 +-
 TestProlongate/test/test_ddf_o3.par           |   3 +-
 TestProlongate/test/test_ddf_o5.par           |   3 +-
 TestProlongate/test/test_ddf_o7.par           |   3 +-
 TestProlongate/test/test_eno_o1.par           |  92 ----
 .../testprolongate-gf000_count.it000000.x.tsv |  34 --
 .../testprolongate-gf000_count.it000000.y.tsv |  34 --
 .../testprolongate-gf000_count.it000000.z.tsv |  34 --
 .../testprolongate-gf000_count.it000001.x.tsv |  34 --
 .../testprolongate-gf000_count.it000001.y.tsv |  34 --
 .../testprolongate-gf000_count.it000001.z.tsv |  34 --
 .../testprolongate-gf000_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf000_count.it000002.y.tsv |  55 --
 .../testprolongate-gf000_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf000_error.it000000.x.tsv |  34 --
 .../testprolongate-gf000_error.it000000.y.tsv |  34 --
 .../testprolongate-gf000_error.it000000.z.tsv |  34 --
 .../testprolongate-gf000_error.it000001.x.tsv |  34 --
 .../testprolongate-gf000_error.it000001.y.tsv |  34 --
 .../testprolongate-gf000_error.it000001.z.tsv |  34 --
 .../testprolongate-gf000_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf000_error.it000002.y.tsv |  55 --
 .../testprolongate-gf000_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf000_max_error.it000000.tsv |   2 -
 ...estprolongate-gf000_max_error.it000001.tsv |   2 -
 ...estprolongate-gf000_max_error.it000002.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf001_count.it000000.x.tsv |  34 --
 .../testprolongate-gf001_count.it000000.y.tsv |  34 --
 .../testprolongate-gf001_count.it000000.z.tsv |  33 --
 .../testprolongate-gf001_count.it000001.x.tsv |  34 --
 .../testprolongate-gf001_count.it000001.y.tsv |  34 --
 .../testprolongate-gf001_count.it000001.z.tsv |  33 --
 .../testprolongate-gf001_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf001_count.it000002.y.tsv |  55 --
 .../testprolongate-gf001_count.it000002.z.tsv |  55 --
 .../testprolongate-gf001_error.it000000.x.tsv |  34 --
 .../testprolongate-gf001_error.it000000.y.tsv |  34 --
 .../testprolongate-gf001_error.it000000.z.tsv |  33 --
 .../testprolongate-gf001_error.it000001.x.tsv |  34 --
 .../testprolongate-gf001_error.it000001.y.tsv |  34 --
 .../testprolongate-gf001_error.it000001.z.tsv |  33 --
 .../testprolongate-gf001_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf001_error.it000002.y.tsv |  55 --
 .../testprolongate-gf001_error.it000002.z.tsv |  55 --
 ...estprolongate-gf001_max_error.it000000.tsv |   2 -
 ...estprolongate-gf001_max_error.it000001.tsv |   2 -
 ...estprolongate-gf001_max_error.it000002.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf010_count.it000000.x.tsv |  34 --
 .../testprolongate-gf010_count.it000000.y.tsv |  33 --
 .../testprolongate-gf010_count.it000000.z.tsv |  34 --
 .../testprolongate-gf010_count.it000001.x.tsv |  34 --
 .../testprolongate-gf010_count.it000001.y.tsv |  33 --
 .../testprolongate-gf010_count.it000001.z.tsv |  34 --
 .../testprolongate-gf010_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf010_count.it000002.y.tsv |  53 --
 .../testprolongate-gf010_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf010_error.it000000.x.tsv |  34 --
 .../testprolongate-gf010_error.it000000.y.tsv |  33 --
 .../testprolongate-gf010_error.it000000.z.tsv |  34 --
 .../testprolongate-gf010_error.it000001.x.tsv |  34 --
 .../testprolongate-gf010_error.it000001.y.tsv |  33 --
 .../testprolongate-gf010_error.it000001.z.tsv |  34 --
 .../testprolongate-gf010_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf010_error.it000002.y.tsv |  53 --
 .../testprolongate-gf010_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf010_max_error.it000000.tsv |   2 -
 ...estprolongate-gf010_max_error.it000001.tsv |   2 -
 ...estprolongate-gf010_max_error.it000002.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf011_count.it000000.x.tsv |  34 --
 .../testprolongate-gf011_count.it000000.y.tsv |  33 --
 .../testprolongate-gf011_count.it000000.z.tsv |  33 --
 .../testprolongate-gf011_count.it000001.x.tsv |  34 --
 .../testprolongate-gf011_count.it000001.y.tsv |  33 --
 .../testprolongate-gf011_count.it000001.z.tsv |  33 --
 .../testprolongate-gf011_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf011_count.it000002.y.tsv |  53 --
 .../testprolongate-gf011_count.it000002.z.tsv |  55 --
 .../testprolongate-gf011_error.it000000.x.tsv |  34 --
 .../testprolongate-gf011_error.it000000.y.tsv |  33 --
 .../testprolongate-gf011_error.it000000.z.tsv |  33 --
 .../testprolongate-gf011_error.it000001.x.tsv |  34 --
 .../testprolongate-gf011_error.it000001.y.tsv |  33 --
 .../testprolongate-gf011_error.it000001.z.tsv |  33 --
 .../testprolongate-gf011_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf011_error.it000002.y.tsv |  53 --
 .../testprolongate-gf011_error.it000002.z.tsv |  55 --
 ...estprolongate-gf011_max_error.it000000.tsv |   2 -
 ...estprolongate-gf011_max_error.it000001.tsv |   2 -
 ...estprolongate-gf011_max_error.it000002.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf100_count.it000000.x.tsv |  33 --
 .../testprolongate-gf100_count.it000000.y.tsv |  34 --
 .../testprolongate-gf100_count.it000000.z.tsv |  34 --
 .../testprolongate-gf100_count.it000001.x.tsv |  33 --
 .../testprolongate-gf100_count.it000001.y.tsv |  34 --
 .../testprolongate-gf100_count.it000001.z.tsv |  34 --
 .../testprolongate-gf100_count.it000002.x.tsv |  55 --
 .../testprolongate-gf100_count.it000002.y.tsv |  55 --
 .../testprolongate-gf100_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf100_error.it000000.x.tsv |  33 --
 .../testprolongate-gf100_error.it000000.y.tsv |  34 --
 .../testprolongate-gf100_error.it000000.z.tsv |  34 --
 .../testprolongate-gf100_error.it000001.x.tsv |  33 --
 .../testprolongate-gf100_error.it000001.y.tsv |  34 --
 .../testprolongate-gf100_error.it000001.z.tsv |  34 --
 .../testprolongate-gf100_error.it000002.x.tsv |  55 --
 .../testprolongate-gf100_error.it000002.y.tsv |  55 --
 .../testprolongate-gf100_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf100_max_error.it000000.tsv |   2 -
 ...estprolongate-gf100_max_error.it000001.tsv |   2 -
 ...estprolongate-gf100_max_error.it000002.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf101_count.it000000.x.tsv |  33 --
 .../testprolongate-gf101_count.it000000.y.tsv |  34 --
 .../testprolongate-gf101_count.it000000.z.tsv |  33 --
 .../testprolongate-gf101_count.it000001.x.tsv |  33 --
 .../testprolongate-gf101_count.it000001.y.tsv |  34 --
 .../testprolongate-gf101_count.it000001.z.tsv |  33 --
 .../testprolongate-gf101_count.it000002.x.tsv |  55 --
 .../testprolongate-gf101_count.it000002.y.tsv |  55 --
 .../testprolongate-gf101_count.it000002.z.tsv |  55 --
 .../testprolongate-gf101_error.it000000.x.tsv |  33 --
 .../testprolongate-gf101_error.it000000.y.tsv |  34 --
 .../testprolongate-gf101_error.it000000.z.tsv |  33 --
 .../testprolongate-gf101_error.it000001.x.tsv |  33 --
 .../testprolongate-gf101_error.it000001.y.tsv |  34 --
 .../testprolongate-gf101_error.it000001.z.tsv |  33 --
 .../testprolongate-gf101_error.it000002.x.tsv |  55 --
 .../testprolongate-gf101_error.it000002.y.tsv |  55 --
 .../testprolongate-gf101_error.it000002.z.tsv |  55 --
 ...estprolongate-gf101_max_error.it000000.tsv |   2 -
 ...estprolongate-gf101_max_error.it000001.tsv |   2 -
 ...estprolongate-gf101_max_error.it000002.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf110_count.it000000.x.tsv |  33 --
 .../testprolongate-gf110_count.it000000.y.tsv |  33 --
 .../testprolongate-gf110_count.it000000.z.tsv |  34 --
 .../testprolongate-gf110_count.it000001.x.tsv |  33 --
 .../testprolongate-gf110_count.it000001.y.tsv |  33 --
 .../testprolongate-gf110_count.it000001.z.tsv |  34 --
 .../testprolongate-gf110_count.it000002.x.tsv |  55 --
 .../testprolongate-gf110_count.it000002.y.tsv |  53 --
 .../testprolongate-gf110_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf110_error.it000000.x.tsv |  33 --
 .../testprolongate-gf110_error.it000000.y.tsv |  33 --
 .../testprolongate-gf110_error.it000000.z.tsv |  34 --
 .../testprolongate-gf110_error.it000001.x.tsv |  33 --
 .../testprolongate-gf110_error.it000001.y.tsv |  33 --
 .../testprolongate-gf110_error.it000001.z.tsv |  34 --
 .../testprolongate-gf110_error.it000002.x.tsv |  55 --
 .../testprolongate-gf110_error.it000002.y.tsv |  53 --
 .../testprolongate-gf110_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf110_max_error.it000000.tsv |   2 -
 ...estprolongate-gf110_max_error.it000001.tsv |   2 -
 ...estprolongate-gf110_max_error.it000002.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf111_count.it000000.x.tsv |  33 --
 .../testprolongate-gf111_count.it000000.y.tsv |  33 --
 .../testprolongate-gf111_count.it000000.z.tsv |  33 --
 .../testprolongate-gf111_count.it000001.x.tsv |  33 --
 .../testprolongate-gf111_count.it000001.y.tsv |  33 --
 .../testprolongate-gf111_count.it000001.z.tsv |  33 --
 .../testprolongate-gf111_count.it000002.x.tsv |  55 --
 .../testprolongate-gf111_count.it000002.y.tsv |  53 --
 .../testprolongate-gf111_count.it000002.z.tsv |  55 --
 .../testprolongate-gf111_error.it000000.x.tsv |  33 --
 .../testprolongate-gf111_error.it000000.y.tsv |  33 --
 .../testprolongate-gf111_error.it000000.z.tsv |  33 --
 .../testprolongate-gf111_error.it000001.x.tsv |  33 --
 .../testprolongate-gf111_error.it000001.y.tsv |  33 --
 .../testprolongate-gf111_error.it000001.z.tsv |  33 --
 .../testprolongate-gf111_error.it000002.x.tsv |  55 --
 .../testprolongate-gf111_error.it000002.y.tsv |  53 --
 .../testprolongate-gf111_error.it000002.z.tsv |  55 --
 ...estprolongate-gf111_max_error.it000000.tsv |   2 -
 ...estprolongate-gf111_max_error.it000001.tsv |   2 -
 ...estprolongate-gf111_max_error.it000002.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000002.tsv |   2 -
 TestProlongate/test/test_eno_o3.par           |   3 +-
 TestProlongate/test/test_eno_per_group_o1.par |  93 ----
 .../testprolongate-gf000_count.it000000.x.tsv |  34 --
 .../testprolongate-gf000_count.it000000.y.tsv |  34 --
 .../testprolongate-gf000_count.it000000.z.tsv |  34 --
 .../testprolongate-gf000_count.it000001.x.tsv |  34 --
 .../testprolongate-gf000_count.it000001.y.tsv |  34 --
 .../testprolongate-gf000_count.it000001.z.tsv |  34 --
 .../testprolongate-gf000_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf000_count.it000002.y.tsv |  55 --
 .../testprolongate-gf000_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf000_error.it000000.x.tsv |  34 --
 .../testprolongate-gf000_error.it000000.y.tsv |  34 --
 .../testprolongate-gf000_error.it000000.z.tsv |  34 --
 .../testprolongate-gf000_error.it000001.x.tsv |  34 --
 .../testprolongate-gf000_error.it000001.y.tsv |  34 --
 .../testprolongate-gf000_error.it000001.z.tsv |  34 --
 .../testprolongate-gf000_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf000_error.it000002.y.tsv |  55 --
 .../testprolongate-gf000_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf000_max_error.it000000.tsv |   2 -
 ...estprolongate-gf000_max_error.it000001.tsv |   2 -
 ...estprolongate-gf000_max_error.it000002.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf000_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf001_count.it000000.x.tsv |  34 --
 .../testprolongate-gf001_count.it000000.y.tsv |  34 --
 .../testprolongate-gf001_count.it000000.z.tsv |  33 --
 .../testprolongate-gf001_count.it000001.x.tsv |  34 --
 .../testprolongate-gf001_count.it000001.y.tsv |  34 --
 .../testprolongate-gf001_count.it000001.z.tsv |  33 --
 .../testprolongate-gf001_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf001_count.it000002.y.tsv |  55 --
 .../testprolongate-gf001_count.it000002.z.tsv |  55 --
 .../testprolongate-gf001_error.it000000.x.tsv |  34 --
 .../testprolongate-gf001_error.it000000.y.tsv |  34 --
 .../testprolongate-gf001_error.it000000.z.tsv |  33 --
 .../testprolongate-gf001_error.it000001.x.tsv |  34 --
 .../testprolongate-gf001_error.it000001.y.tsv |  34 --
 .../testprolongate-gf001_error.it000001.z.tsv |  33 --
 .../testprolongate-gf001_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf001_error.it000002.y.tsv |  55 --
 .../testprolongate-gf001_error.it000002.z.tsv |  55 --
 ...estprolongate-gf001_max_error.it000000.tsv |   2 -
 ...estprolongate-gf001_max_error.it000001.tsv |   2 -
 ...estprolongate-gf001_max_error.it000002.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf001_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf010_count.it000000.x.tsv |  34 --
 .../testprolongate-gf010_count.it000000.y.tsv |  33 --
 .../testprolongate-gf010_count.it000000.z.tsv |  34 --
 .../testprolongate-gf010_count.it000001.x.tsv |  34 --
 .../testprolongate-gf010_count.it000001.y.tsv |  33 --
 .../testprolongate-gf010_count.it000001.z.tsv |  34 --
 .../testprolongate-gf010_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf010_count.it000002.y.tsv |  53 --
 .../testprolongate-gf010_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf010_error.it000000.x.tsv |  34 --
 .../testprolongate-gf010_error.it000000.y.tsv |  33 --
 .../testprolongate-gf010_error.it000000.z.tsv |  34 --
 .../testprolongate-gf010_error.it000001.x.tsv |  34 --
 .../testprolongate-gf010_error.it000001.y.tsv |  33 --
 .../testprolongate-gf010_error.it000001.z.tsv |  34 --
 .../testprolongate-gf010_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf010_error.it000002.y.tsv |  53 --
 .../testprolongate-gf010_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf010_max_error.it000000.tsv |   2 -
 ...estprolongate-gf010_max_error.it000001.tsv |   2 -
 ...estprolongate-gf010_max_error.it000002.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf010_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf011_count.it000000.x.tsv |  34 --
 .../testprolongate-gf011_count.it000000.y.tsv |  33 --
 .../testprolongate-gf011_count.it000000.z.tsv |  33 --
 .../testprolongate-gf011_count.it000001.x.tsv |  34 --
 .../testprolongate-gf011_count.it000001.y.tsv |  33 --
 .../testprolongate-gf011_count.it000001.z.tsv |  33 --
 .../testprolongate-gf011_count.it000002.x.tsv |  57 ---
 .../testprolongate-gf011_count.it000002.y.tsv |  53 --
 .../testprolongate-gf011_count.it000002.z.tsv |  55 --
 .../testprolongate-gf011_error.it000000.x.tsv |  34 --
 .../testprolongate-gf011_error.it000000.y.tsv |  33 --
 .../testprolongate-gf011_error.it000000.z.tsv |  33 --
 .../testprolongate-gf011_error.it000001.x.tsv |  34 --
 .../testprolongate-gf011_error.it000001.y.tsv |  33 --
 .../testprolongate-gf011_error.it000001.z.tsv |  33 --
 .../testprolongate-gf011_error.it000002.x.tsv |  57 ---
 .../testprolongate-gf011_error.it000002.y.tsv |  53 --
 .../testprolongate-gf011_error.it000002.z.tsv |  55 --
 ...estprolongate-gf011_max_error.it000000.tsv |   2 -
 ...estprolongate-gf011_max_error.it000001.tsv |   2 -
 ...estprolongate-gf011_max_error.it000002.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf011_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf100_count.it000000.x.tsv |  33 --
 .../testprolongate-gf100_count.it000000.y.tsv |  34 --
 .../testprolongate-gf100_count.it000000.z.tsv |  34 --
 .../testprolongate-gf100_count.it000001.x.tsv |  33 --
 .../testprolongate-gf100_count.it000001.y.tsv |  34 --
 .../testprolongate-gf100_count.it000001.z.tsv |  34 --
 .../testprolongate-gf100_count.it000002.x.tsv |  55 --
 .../testprolongate-gf100_count.it000002.y.tsv |  55 --
 .../testprolongate-gf100_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf100_error.it000000.x.tsv |  33 --
 .../testprolongate-gf100_error.it000000.y.tsv |  34 --
 .../testprolongate-gf100_error.it000000.z.tsv |  34 --
 .../testprolongate-gf100_error.it000001.x.tsv |  33 --
 .../testprolongate-gf100_error.it000001.y.tsv |  34 --
 .../testprolongate-gf100_error.it000001.z.tsv |  34 --
 .../testprolongate-gf100_error.it000002.x.tsv |  55 --
 .../testprolongate-gf100_error.it000002.y.tsv |  55 --
 .../testprolongate-gf100_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf100_max_error.it000000.tsv |   2 -
 ...estprolongate-gf100_max_error.it000001.tsv |   2 -
 ...estprolongate-gf100_max_error.it000002.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf100_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf101_count.it000000.x.tsv |  33 --
 .../testprolongate-gf101_count.it000000.y.tsv |  34 --
 .../testprolongate-gf101_count.it000000.z.tsv |  33 --
 .../testprolongate-gf101_count.it000001.x.tsv |  33 --
 .../testprolongate-gf101_count.it000001.y.tsv |  34 --
 .../testprolongate-gf101_count.it000001.z.tsv |  33 --
 .../testprolongate-gf101_count.it000002.x.tsv |  55 --
 .../testprolongate-gf101_count.it000002.y.tsv |  55 --
 .../testprolongate-gf101_count.it000002.z.tsv |  55 --
 .../testprolongate-gf101_error.it000000.x.tsv |  33 --
 .../testprolongate-gf101_error.it000000.y.tsv |  34 --
 .../testprolongate-gf101_error.it000000.z.tsv |  33 --
 .../testprolongate-gf101_error.it000001.x.tsv |  33 --
 .../testprolongate-gf101_error.it000001.y.tsv |  34 --
 .../testprolongate-gf101_error.it000001.z.tsv |  33 --
 .../testprolongate-gf101_error.it000002.x.tsv |  55 --
 .../testprolongate-gf101_error.it000002.y.tsv |  55 --
 .../testprolongate-gf101_error.it000002.z.tsv |  55 --
 ...estprolongate-gf101_max_error.it000000.tsv |   2 -
 ...estprolongate-gf101_max_error.it000001.tsv |   2 -
 ...estprolongate-gf101_max_error.it000002.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf101_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf110_count.it000000.x.tsv |  33 --
 .../testprolongate-gf110_count.it000000.y.tsv |  33 --
 .../testprolongate-gf110_count.it000000.z.tsv |  34 --
 .../testprolongate-gf110_count.it000001.x.tsv |  33 --
 .../testprolongate-gf110_count.it000001.y.tsv |  33 --
 .../testprolongate-gf110_count.it000001.z.tsv |  34 --
 .../testprolongate-gf110_count.it000002.x.tsv |  55 --
 .../testprolongate-gf110_count.it000002.y.tsv |  53 --
 .../testprolongate-gf110_count.it000002.z.tsv |  57 ---
 .../testprolongate-gf110_error.it000000.x.tsv |  33 --
 .../testprolongate-gf110_error.it000000.y.tsv |  33 --
 .../testprolongate-gf110_error.it000000.z.tsv |  34 --
 .../testprolongate-gf110_error.it000001.x.tsv |  33 --
 .../testprolongate-gf110_error.it000001.y.tsv |  33 --
 .../testprolongate-gf110_error.it000001.z.tsv |  34 --
 .../testprolongate-gf110_error.it000002.x.tsv |  55 --
 .../testprolongate-gf110_error.it000002.y.tsv |  53 --
 .../testprolongate-gf110_error.it000002.z.tsv |  57 ---
 ...estprolongate-gf110_max_error.it000000.tsv |   2 -
 ...estprolongate-gf110_max_error.it000001.tsv |   2 -
 ...estprolongate-gf110_max_error.it000002.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf110_sum_count.it000002.tsv |   2 -
 .../testprolongate-gf111_count.it000000.x.tsv |  33 --
 .../testprolongate-gf111_count.it000000.y.tsv |  33 --
 .../testprolongate-gf111_count.it000000.z.tsv |  33 --
 .../testprolongate-gf111_count.it000001.x.tsv |  33 --
 .../testprolongate-gf111_count.it000001.y.tsv |  33 --
 .../testprolongate-gf111_count.it000001.z.tsv |  33 --
 .../testprolongate-gf111_count.it000002.x.tsv |  55 --
 .../testprolongate-gf111_count.it000002.y.tsv |  53 --
 .../testprolongate-gf111_count.it000002.z.tsv |  55 --
 .../testprolongate-gf111_error.it000000.x.tsv |  33 --
 .../testprolongate-gf111_error.it000000.y.tsv |  33 --
 .../testprolongate-gf111_error.it000000.z.tsv |  33 --
 .../testprolongate-gf111_error.it000001.x.tsv |  33 --
 .../testprolongate-gf111_error.it000001.y.tsv |  33 --
 .../testprolongate-gf111_error.it000001.z.tsv |  33 --
 .../testprolongate-gf111_error.it000002.x.tsv |  55 --
 .../testprolongate-gf111_error.it000002.y.tsv |  53 --
 .../testprolongate-gf111_error.it000002.z.tsv |  55 --
 ...estprolongate-gf111_max_error.it000000.tsv |   2 -
 ...estprolongate-gf111_max_error.it000001.tsv |   2 -
 ...estprolongate-gf111_max_error.it000002.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000000.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000001.tsv |   2 -
 ...estprolongate-gf111_sum_count.it000002.tsv |   2 -
 TestProlongate/test/test_hermite_o1.par       |   2 +-
 TestProlongate/test/test_hermite_o3.par       |   2 +-
 TestProlongate/test/test_hermite_o5.par       |   2 +-
 TestProlongate/test/test_natural_o1.par       |   2 +-
 TestProlongate/test/test_natural_o3.par       |   2 +-
 TestProlongate/test/test_natural_o5.par       |   2 +-
 TestProlongate/test/test_natural_o7.par       |   2 +-
 TestProlongate/test/test_poly_cons3lfb_o1.par |   2 +-
 TestProlongate/test/test_poly_cons3lfb_o3.par |   2 +-
 TestProlongate/test/test_poly_cons3lfb_o5.par |   2 +-
 TestSubcycling/test/subcycle.par              |  11 +-
 ...carpetxregrid-regrid_error.it000000.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000000.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000001.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000002.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000003.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000004.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000005.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000006.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000006.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000006.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000007.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000007.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000007.z.tsv} |   0
 ...carpetxregrid-regrid_error.it000008.x.tsv} |   0
 ...carpetxregrid-regrid_error.it000008.y.tsv} |   0
 ...carpetxregrid-regrid_error.it000008.z.tsv} |   0
 TestSubcyclingMC/interface.ccl                |   2 -
 TestSubcyclingMC/param.ccl                    |   2 +-
 TestSubcyclingMC/test/gaussian.par            |  11 +-
 TestSubcyclingMC/test/gaussian_noSC.par       |  11 +-
 TestSubcyclingMC2/interface.ccl               |   2 -
 TestSubcyclingMC2/test/gaussian.par           |  11 +-
 TestSubcyclingMC2/test/gaussian_noSC.par      |  11 +-
 TestSymmetries/configuration.ccl              |   2 +
 TestSymmetries/interface.ccl                  |   1 +
 .../par/test_symmetry_xnone_ynone_znone.par   |   6 +-
 ...symmetry_xperiodic_yperiodic_zperiodic.par |   7 +-
 ...st_symmetry_xreflohi_yreflohi_zreflohi.par |   6 +-
 TestSymmetries/src/init.cxx                   |  35 +-
 WaveToyX/interface.ccl                        |   2 -
 WaveToyX/par/standing.par                     |   7 +-
 WaveToyX/schedule.ccl                         |  27 +-
 WaveToyX/test/presync.par                     |  10 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 .../test/presync/wavetoyx-rhs.it000000.x.tsv  |  12 +
 .../test/presync/wavetoyx-rhs.it000000.y.tsv  |  12 +
 .../test/presync/wavetoyx-rhs.it000000.z.tsv  |  12 +
 .../test/presync/wavetoyx-rhs.it000010.x.tsv  |  12 +
 .../test/presync/wavetoyx-rhs.it000010.y.tsv  |  12 +
 .../test/presync/wavetoyx-rhs.it000010.z.tsv  |  12 +
 WaveToyX/test/radiative.par                   |   2 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 WaveToyX/test/reflecting.par                  |   2 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 WaveToyX/test/standing.par                    |   9 +-
 ...ror.tsv => carpetxregrid-regrid_error.tsv} |   0
 docker/carpetx-arm64v8-cpu.dockerfile         | 132 +++--
 docker/carpetx-cpu.dockerfile                 |  68 ++-
 docker/carpetx-cuda.dockerfile                |  63 ++-
 docker/carpetx-oneapi.dockerfile              |  63 ++-
 docker/carpetx-rocm.dockerfile                |  60 ++-
 scripts/actions-cuda-real32.cfg               |   2 +-
 scripts/actions-cuda-real64.cfg               |   2 +-
 scripts/actions-oneapi-real64.cfg             |   5 +-
 scripts/actions-rocm-real64.cfg               |   2 +-
 scripts/carpetx.th                            |   1 +
 754 files changed, 3963 insertions(+), 13289 deletions(-)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels1/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels1/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels2/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels2/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels20/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels20/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/levels3/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/levels3/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions2/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions2/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/regions3/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/regions3/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.x.tsv => carpetxregrid-regrid_error.it000010.x.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.y.tsv => carpetxregrid-regrid_error.it000010.y.tsv} (100%)
 rename BoxInBox/test/unigrid/{carpetx-regrid_error.it000010.z.tsv => carpetxregrid-regrid_error.it000010.z.tsv} (100%)
 rename BoxInBox/test/unigrid/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 create mode 100644 CarpetX/src/prolongate_3d_rf2_impl_minmod.cxx
 create mode 100644 CarpetX/src/prolongate_3d_rf2_impl_poly_eno3lfb.cxx
 create mode 100644 CarpetX/stencils/stencils.jl
 create mode 100644 CarpetXRegrid/README
 create mode 100644 CarpetXRegrid/configuration.ccl
 create mode 100644 CarpetXRegrid/doc/documentation.tex
 create mode 100644 CarpetXRegrid/interface.ccl
 create mode 100644 CarpetXRegrid/param.ccl
 create mode 100644 CarpetXRegrid/schedule.ccl
 create mode 100644 CarpetXRegrid/src/make.code.defn
 rename {CarpetX => CarpetXRegrid}/src/regrid_error.cxx (55%)
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.z.tsv
 rename FluxWaveToyX/test/radiative/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.z.tsv
 rename FluxWaveToyX/test/reflecting/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.z.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.z.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.x.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.y.tsv
 create mode 100644 FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.z.tsv
 rename FluxWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.x.tsv => carpetxregrid-regrid_error.it000001.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.y.tsv => carpetxregrid-regrid_error.it000001.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000001.z.tsv => carpetxregrid-regrid_error.it000001.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.x.tsv => carpetxregrid-regrid_error.it000002.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.y.tsv => carpetxregrid-regrid_error.it000002.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000002.z.tsv => carpetxregrid-regrid_error.it000002.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.x.tsv => carpetxregrid-regrid_error.it000003.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.y.tsv => carpetxregrid-regrid_error.it000003.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000003.z.tsv => carpetxregrid-regrid_error.it000003.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.x.tsv => carpetxregrid-regrid_error.it000004.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.y.tsv => carpetxregrid-regrid_error.it000004.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000004.z.tsv => carpetxregrid-regrid_error.it000004.z.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.x.tsv => carpetxregrid-regrid_error.it000005.x.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.y.tsv => carpetxregrid-regrid_error.it000005.y.tsv} (100%)
 rename MovingBoxToy/test/circle/{carpetx-regrid_error.it000005.z.tsv => carpetxregrid-regrid_error.it000005.z.tsv} (100%)
 rename MovingBoxToy/test/circle/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename SIMDWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename SpacetimeWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 delete mode 100644 SpacetimeWaveToyX/test/standing/standing.par
 rename StaggeredWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 delete mode 100644 StaggeredWaveToyX/test/standing/standing.par
 create mode 100644 TestInterpolate/src/test_cell_interpolation.cxx
 rename TestInterpolate/src/{test_interpolation.cxx => test_vertex_interpolation.cxx} (97%)
 rename TestInterpolate/test/{interpolate.par => cell_interpolate.par} (87%)
 rename TestInterpolate/test/{interpolate => cell_interpolate}/testinterpolate-reference.it000000.tsv (100%)
 rename TestInterpolate/test/{interpolate => cell_interpolate}/testinterpolate-results_driver_interpolate.it000000.tsv (100%)
 rename TestInterpolate/test/{interpolate => cell_interpolate}/testinterpolate-results_interpolate.it000000.tsv (100%)
 create mode 100644 TestInterpolate/test/vertex_interpolate.par
 create mode 100644 TestInterpolate/test/vertex_interpolate/testinterpolate-reference.it000000.tsv
 create mode 100644 TestInterpolate/test/vertex_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
 create mode 100644 TestInterpolate/test/vertex_interpolate/testinterpolate-results_interpolate.it000000.tsv
 rename TestNorms/test/norms/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-constant/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-dp87/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-euler/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk2/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk3/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rk4/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-rkf78/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename TestODESolvers/test/test-ssprk3/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 delete mode 100644 TestProlongate/test/test_eno_o1.par
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1.par
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.x.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.y.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.z.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000002.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000000.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000001.tsv
 delete mode 100644 TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000002.tsv
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000000.x.tsv => carpetxregrid-regrid_error.it000000.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000000.y.tsv => carpetxregrid-regrid_error.it000000.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000000.z.tsv => carpetxregrid-regrid_error.it000000.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000001.x.tsv => carpetxregrid-regrid_error.it000001.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000001.y.tsv => carpetxregrid-regrid_error.it000001.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000001.z.tsv => carpetxregrid-regrid_error.it000001.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000002.x.tsv => carpetxregrid-regrid_error.it000002.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000002.y.tsv => carpetxregrid-regrid_error.it000002.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000002.z.tsv => carpetxregrid-regrid_error.it000002.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000003.x.tsv => carpetxregrid-regrid_error.it000003.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000003.y.tsv => carpetxregrid-regrid_error.it000003.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000003.z.tsv => carpetxregrid-regrid_error.it000003.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000004.x.tsv => carpetxregrid-regrid_error.it000004.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000004.y.tsv => carpetxregrid-regrid_error.it000004.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000004.z.tsv => carpetxregrid-regrid_error.it000004.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000005.x.tsv => carpetxregrid-regrid_error.it000005.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000005.y.tsv => carpetxregrid-regrid_error.it000005.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000005.z.tsv => carpetxregrid-regrid_error.it000005.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000006.x.tsv => carpetxregrid-regrid_error.it000006.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000006.y.tsv => carpetxregrid-regrid_error.it000006.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000006.z.tsv => carpetxregrid-regrid_error.it000006.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000007.x.tsv => carpetxregrid-regrid_error.it000007.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000007.y.tsv => carpetxregrid-regrid_error.it000007.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000007.z.tsv => carpetxregrid-regrid_error.it000007.z.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000008.x.tsv => carpetxregrid-regrid_error.it000008.x.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000008.y.tsv => carpetxregrid-regrid_error.it000008.y.tsv} (100%)
 rename TestSubcycling/test/subcycle/{carpetx-regrid_error.it000008.z.tsv => carpetxregrid-regrid_error.it000008.z.tsv} (100%)
 rename WaveToyX/test/presync/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000000.x.tsv
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000000.y.tsv
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000000.z.tsv
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000010.x.tsv
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000010.y.tsv
 create mode 100644 WaveToyX/test/presync/wavetoyx-rhs.it000010.z.tsv
 rename WaveToyX/test/radiative/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/reflecting/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)
 rename WaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%)

diff --git a/ADMBaseX/schedule.ccl b/ADMBaseX/schedule.ccl
index 729789834..9d0db9191 100644
--- a/ADMBaseX/schedule.ccl
+++ b/ADMBaseX/schedule.ccl
@@ -1,18 +1,19 @@
 # Schedule definitions for thorn ADMBaseX
 
-SCHEDULE GROUP ADMBaseX_InitialData AT initial
-{
-} "Schedule group for calculating ADM initial data"
+if (CCTK_IsThornActive("ODESolvers")) {
+
+  SCHEDULE GROUP ADMBaseX_InitialData IN ODESolvers_Initial
+  {
+  } "Schedule group for calculating ADM initial data"
 
-SCHEDULE GROUP ADMBaseX_InitialGauge AT initial AFTER ADMBaseX_InitialData
-{
-} "Schedule group for the ADM initial gauge condition"
+  SCHEDULE GROUP ADMBaseX_InitialGauge IN ODESolvers_Initial AFTER ADMBaseX_InitialData
+  {
+  } "Schedule group for the ADM initial gauge condition"
 
-SCHEDULE GROUP ADMBaseX_PostInitial AT initial AFTER (ADMBaseX_InitialData ADMBaseX_InitialGauge)
-{
-} "Schedule group for modifying the ADM initial data, such as e.g. adding noise"
+  SCHEDULE GROUP ADMBaseX_PostInitial IN ODESolvers_Initial AFTER (ADMBaseX_InitialData ADMBaseX_InitialGauge)
+  {
+  } "Schedule group for modifying the ADM initial data, such as e.g. adding noise"
 
-if (CCTK_IsThornActive("ODESolvers")) {
   SCHEDULE GROUP ADMBaseX_SetADMVars IN ODESolvers_PostStep
   {
   } "Set ADM variables in this group"
@@ -20,22 +21,41 @@ if (CCTK_IsThornActive("ODESolvers")) {
   SCHEDULE GROUP ADMBaseX_SetADMRHS IN ODESolvers_PostStep
   {
   } "Set ADM RHS variables in this group"  
+
 } else {
+
+  SCHEDULE GROUP ADMBaseX_SetADMVars AT post_recover_variables
+  {
+  } "Set ADM variables in this group"
+
+  SCHEDULE GROUP ADMBaseX_SetADMRHS AT post_recover_variables
+  {
+  } "Set ADM RHS variables in this group"
+
   SCHEDULE GROUP ADMBaseX_SetADMVars AT postregrid
   {
   } "Set ADM variables in this group"
 
-  SCHEDULE GROUP ADMBaseX_SetADMVars AT poststep
+  SCHEDULE GROUP ADMBaseX_SetADMRHS AT postregrid
+  {
+  } "Set ADM RHS variables in this group"
+
+  SCHEDULE GROUP ADMBaseX_SetADMVars AT postrestrict
   {
   } "Set ADM variables in this group"
   
-  SCHEDULE GROUP ADMBaseX_SetADMRHS AT postregrid
+  SCHEDULE GROUP ADMBaseX_SetADMRHS AT postrestrict
   {
   } "Set ADM RHS variables in this group"  
+
+  SCHEDULE GROUP ADMBaseX_SetADMVars AT poststep
+  {
+  } "Set ADM variables in this group"
   
   SCHEDULE GROUP ADMBaseX_SetADMRHS AT poststep
   {
   } "Set ADM RHS variables in this group"  
+
 }
 
 if (CCTK_EQUALS(initial_data, "Cartesian Minkowski")) {
diff --git a/Algo/test/test_roots.par b/Algo/test/test_roots.par
index 70b269910..1b3258143 100644
--- a/Algo/test/test_roots.par
+++ b/Algo/test/test_roots.par
@@ -6,3 +6,9 @@ ActiveThorns = "
 
 Cactus::presync_mode = "mixed-error"
 Cactus::cctk_itlast = 0
+
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
+
+CarpetX::out_metadata = no
+
diff --git a/Arith/src/defs.hxx b/Arith/src/defs.hxx
index cdecb4aaa..7101afa3e 100644
--- a/Arith/src/defs.hxx
+++ b/Arith/src/defs.hxx
@@ -138,14 +138,16 @@ template <> struct nan<double> {
 
 // An explicitly unrolled for loop
 
-template <int imin, int imax, int istep = 1, typename F,
-          enable_if_t<(istep > 0 ? imin >= imax : imin <= imax)> * = nullptr>
+template <
+    int imin, int imax, int istep = 1, typename F,
+    std::enable_if_t<(istep > 0 ? imin >= imax : imin <= imax)> * = nullptr>
 constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST void unroll_for(const F &f) {
   // done: do nothing
 }
 
-template <int imin, int imax, int istep = 1, typename F,
-          enable_if_t<!(istep > 0 ? imin >= imax : imin <= imax)> * = nullptr>
+template <
+    int imin, int imax, int istep = 1, typename F,
+    std::enable_if_t<!(istep > 0 ? imin >= imax : imin <= imax)> * = nullptr>
 constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST void unroll_for(const F &f) {
   f(imin);
   unroll_for<imin + istep, imax, istep>(f);
@@ -206,6 +208,12 @@ constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST T flipsign(const T &x,
   return copysign(T(1), y) * x;
 }
 
+// Return 1/x
+template <typename T>
+constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST T inv(const T &x) {
+  return T(1) / x;
+}
+
 // A max function that returns nan when any argument is nan
 template <typename T>
 constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST T max1(const T &x, const T &y) {
diff --git a/Arith/src/simd.cxx b/Arith/src/simd.cxx
index 17dd8e09d..26b1c5448 100644
--- a/Arith/src/simd.cxx
+++ b/Arith/src/simd.cxx
@@ -3,6 +3,7 @@
 #include <cctk.h>
 
 #include <cassert>
+#include <cmath>
 
 namespace Arith {
 
@@ -25,17 +26,34 @@ std::size_t get_memop_count() {
   return count;
 }
 
+template <typename T> constexpr bool isequal(const simd<T> x, const T a) {
+  return all(x == a);
+}
+template <typename T> constexpr bool isequal(const simdl<T> x, const bool a) {
+  return all(x == a);
+}
+template <typename T> constexpr bool isapprox(const simd<T> x, const T a) {
+  return all(fabs(x - a) < 1.0e-14);
+}
+
+void check(const bool isgood) {
+  if (isgood)
+    return;
+  CCTK_ERROR("Test failure");
+}
+
 void TestSIMD() {
   // nvcc V11.1.74 doesn't accept this as "constexpr" values
 #ifndef __CUDACC__
-  typedef simd<CCTK_REAL> realv;
+  using real = CCTK_REAL;
+  using realv = simd<real>;
 
   realv x;
   realv y = 0;
   realv z = zero<realv>();
 
-  assert(all(y == 0));
-  assert(all(y == z));
+  check(all(y == 0));
+  check(all(y == z));
 
   realv a = 2;
   realv b = 3;
@@ -45,10 +63,131 @@ void TestSIMD() {
   realv r1 = mulsub(a, b, c);
   realv r2 = negmuladd(a, b, c);
   realv r3 = negmulsub(a, b, c);
-  assert(all(r0 == muladd(2, 3, 4)));
-  assert(all(r1 == mulsub(2, 3, 4)));
-  assert(all(r2 == negmuladd(2, 3, 4)));
-  assert(all(r3 == negmulsub(2, 3, 4)));
+  check(all(r0 == muladd(2, 3, 4)));
+  check(all(r1 == mulsub(2, 3, 4)));
+  check(all(r2 == negmuladd(2, 3, 4)));
+  check(all(r3 == negmulsub(2, 3, 4)));
+
+  real s = 2;
+  real t = 2;
+  real u = 4;
+
+  check(isequal(+a, +s));
+  check(isequal(-a, -s));
+
+  check(isequal(a + b, s + t));
+  check(isequal(a - b, s - t));
+  check(isequal(a * b, s * t));
+  check(isequal(a / b, s / t));
+  check(isequal(s + b, s + t));
+  check(isequal(s - b, s - t));
+  check(isequal(s * b, s * t));
+  check(isequal(s / b, s / t));
+  check(isequal(a + t, s + t));
+  check(isequal(a - t, s - t));
+  check(isequal(a * t, s * t));
+  check(isequal(a / t, s / t));
+
+  check(isequal(a == b, s == t));
+  check(isequal(a != b, s != t));
+  check(isequal(a < b, s < t));
+  check(isequal(a > b, s > t));
+  check(isequal(a <= b, s <= t));
+  check(isequal(a >= b, s >= t));
+  check(isequal(s == b, s == t));
+  check(isequal(s != b, s != t));
+  check(isequal(s < b, s < t));
+  check(isequal(s > b, s > t));
+  check(isequal(s <= b, s <= t));
+  check(isequal(s >= b, s >= t));
+  check(isequal(a == t, s == t));
+  check(isequal(a != t, s != t));
+  check(isequal(a < t, s < t));
+  check(isequal(a > t, s > t));
+  check(isequal(a <= t, s <= t));
+  check(isequal(a >= t, s >= t));
+
+  check(isapprox(abs(a), abs(s)));
+  check(isapprox(acos(a), acos(s)));
+  check(isapprox(acosh(a), acosh(s)));
+  check(allisfinite(a) == allisfinite(s));
+  check(anyisnan(a) == anyisnan(s));
+  check(isapprox(asin(a), asin(s)));
+  check(isapprox(asinh(a), asinh(s)));
+  check(isapprox(atan(a), atan(s)));
+  check(isapprox(atanh(a), atanh(s)));
+  check(isapprox(cbrt(a), cbrt(s)));
+  // check(isapprox(cis(a), cis(s)));
+  // check(isapprox(cispi(a), cispi(s)));
+  check(isapprox(copysign(a, b), copysign(s, t)));
+  check(isapprox(cos(a), cos(s)));
+  check(isapprox(cosh(a), cosh(s)));
+  check(isapprox(cospi(a), cos(CCTK_REAL(M_PI) * s)));
+  check(isapprox(exp(a), exp(s)));
+  check(isapprox(exp10(a), pow(CCTK_REAL(10), s)));
+  check(isapprox(exp2(a), exp2(s)));
+  check(isapprox(fabs(a), fabs(s)));
+  check(isapprox(flipsign(a, b), flipsign(s, t)));
+  check(isapprox(fmax(a, b), fmax(s, t)));
+  check(isapprox(fmax(a, t), fmax(s, t)));
+  check(isapprox(fmax(s, b), fmax(s, t)));
+  check(isapprox(fmin(a, b), fmin(s, t)));
+  check(isapprox(fmin(a, t), fmin(s, t)));
+  check(isapprox(fmin(s, b), fmin(s, t)));
+  check(isapprox(hypot(a, b), hypot(s, t)));
+  check(isapprox(inv(a), inv(s)));
+  check(isequal(isfinite(a), isfinite(s)));
+  check(isequal(isinf(a), isinf(s)));
+  check(isequal(isnan(a), isnan(s)));
+  check(isapprox(log(a), log(s)));
+  check(isapprox(log10(a), log10(s)));
+  check(isapprox(log2(a), log2(s)));
+  check(isapprox(max(a, b), max(s, t)));
+  check(isapprox(max(a, t), max(s, t)));
+  check(isapprox(max(s, b), max(s, t)));
+  check(isapprox(min(a, b), min(s, t)));
+  check(isapprox(min(a, t), min(s, t)));
+  check(isapprox(min(s, b), min(s, t)));
+  check(isapprox(muladd(a, b, c), muladd(s, t, u)));
+  check(isapprox(muladd(a, b, u), muladd(s, t, u)));
+  check(isapprox(muladd(a, t, c), muladd(s, t, u)));
+  check(isapprox(muladd(a, t, u), muladd(s, t, u)));
+  check(isapprox(muladd(s, b, c), muladd(s, t, u)));
+  check(isapprox(muladd(s, b, u), muladd(s, t, u)));
+  check(isapprox(muladd(s, t, c), muladd(s, t, u)));
+  check(isapprox(mulsub(a, b, c), mulsub(s, t, u)));
+  check(isapprox(mulsub(a, b, u), mulsub(s, t, u)));
+  check(isapprox(mulsub(a, t, c), mulsub(s, t, u)));
+  check(isapprox(mulsub(a, t, u), mulsub(s, t, u)));
+  check(isapprox(mulsub(s, b, c), mulsub(s, t, u)));
+  check(isapprox(mulsub(s, b, u), mulsub(s, t, u)));
+  check(isapprox(mulsub(s, t, c), mulsub(s, t, u)));
+  check(isapprox(negmuladd(a, b, c), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(a, b, u), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(a, t, c), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(a, t, u), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(s, b, c), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(s, b, u), negmuladd(s, t, u)));
+  check(isapprox(negmuladd(s, t, c), negmuladd(s, t, u)));
+  check(isapprox(negmulsub(a, b, c), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(a, b, u), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(a, t, c), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(a, t, u), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(s, b, c), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(s, b, u), negmulsub(s, t, u)));
+  check(isapprox(negmulsub(s, t, c), negmulsub(s, t, u)));
+  check(isapprox(pow(a, b), pow(s, t)));
+  check(isapprox(pow(a, t), pow(s, t)));
+  check(isapprox(pow(s, b), pow(s, t)));
+  check(isequal(signbit(a), signbit(s)));
+  check(isapprox(sin(a), sin(s)));
+  check(isapprox(sinh(a), sinh(s)));
+  check(isapprox(sinpi(a), sin(CCTK_REAL(M_PI) * s)));
+  check(isapprox(sqrt(a), sqrt(s)));
+  check(isapprox(tan(a), tan(s)));
+  check(isapprox(tanh(a), tanh(s)));
+  // check(isapprox(tanpi(a), tanpi(s)));
+
 #endif
 }
 
diff --git a/Arith/src/simd.hxx b/Arith/src/simd.hxx
index 366060dfc..9f946b61e 100644
--- a/Arith/src/simd.hxx
+++ b/Arith/src/simd.hxx
@@ -7,14 +7,19 @@
 
 // // Disable SIMD when the `NSIMD` library is not available
 // #ifndef HAVE_CAPABILITY_NSIMD
-// #ifndef SIMD_CPU
-// #define SIMD_CPU
+// #ifndef SIMD_DISABLE
+// #define SIMD_DISABLE
 // #endif
 // #endif
 
+// Accept `SIMD_CPU` as well for backward compatibility
+#ifdef SIMD_CPU
+#define SIMD_DISABLE
+#endif
+
 #include "defs.hxx"
 
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
 #include <nsimd/nsimd-all.hpp>
 #undef vec // This should arguably not be defined in C++
 #else
@@ -36,7 +41,7 @@ using namespace std;
 template <typename T> struct simd;
 template <typename T> struct simdl;
 
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
 namespace detail {
 struct reinterpret32 {
   typedef i32 int_type;
@@ -86,7 +91,7 @@ std::size_t get_memop_count();
 
 template <typename T> struct simd {
   using value_type = T;
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   using storage_type = nsimd::pack<T>;
 #else
   using storage_type = T;
@@ -101,7 +106,7 @@ template <typename T> struct simd {
 
   constexpr ARITH_DEVICE ARITH_HOST simd() {}
   constexpr ARITH_DEVICE ARITH_HOST simd(const T &a) : elts(a) {}
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   template <typename U = T,
             enable_if_t<!is_same_v<nsimd::pack<T>, T> > * = nullptr>
   constexpr ARITH_DEVICE ARITH_HOST simd(const nsimd::pack<T> &elts)
@@ -122,7 +127,7 @@ template <typename T> struct simd {
   }
 
   constexpr ARITH_DEVICE ARITH_HOST std::size_t size() const {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return sizeof(nsimd::pack<T>) / sizeof(T);
 #else
     return 1;
@@ -133,7 +138,7 @@ template <typename T> struct simd {
 #ifdef CCTK_DEBUG
     assert(n >= 0 && n < int(storage_size));
 #endif
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     T xarr[storage_size];
     storeu(xarr, *this);
     return xarr[n];
@@ -160,7 +165,7 @@ template <typename T> struct simd {
 
   friend constexpr ARITH_DEVICE ARITH_HOST simd operator+(const simd &x) {
     count_flop();
-    return +x.elts;
+    return x.elts;
   }
   friend constexpr ARITH_DEVICE ARITH_HOST simd operator-(const simd &x) {
     count_flop();
@@ -439,13 +444,23 @@ template <typename T> struct simd {
     return abs(x.elts);
   }
 
-  friend constexpr ARITH_DEVICE ARITH_HOST simd andnot(const simd &x,
-                                                       const simd &y) {
-#ifndef SIMD_CPU
-    count_flop();
-    return andnotb(x.elts, y.elts);
+  friend constexpr ARITH_DEVICE ARITH_HOST simd acos(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return acos_u10(x.elts);
 #else
-    return x & ~y;
+    using std::acos;
+    return acos(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd acosh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return acosh_u10(x.elts);
+#else
+    using std::acosh;
+    return acosh(x.elts);
 #endif
   }
 
@@ -454,14 +469,74 @@ template <typename T> struct simd {
     return all(isfinite(x));
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd andnot(const simd &x,
+                                                       const simd &y) {
+#ifndef SIMD_DISABLE
+    count_flop();
+    return andnotb(x.elts, y.elts);
+#else
+    return x & ~y;
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST bool anyisnan(const simd &x) {
     using std::isnan;
     return any(isnan(x));
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd asin(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return asin_u10(x.elts);
+#else
+    using std::asin;
+    return asin(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd asinh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return asinh_u10(x.elts);
+#else
+    using std::asinh;
+    return asinh(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd atan(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return atan_u10(x.elts);
+#else
+    using std::atan;
+    return atan(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd atanh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return atanh_u10(x.elts);
+#else
+    using std::atanh;
+    return atanh(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd cbrt(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return cbrt_u10(x.elts);
+#else
+    using std::cbrt;
+    return cbrt(x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simd copysign(const simd &x,
                                                          const simd &y) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     typedef detail::unsigned_type<T> U;
     const T signmask =
         nsimd::scalar_reinterpret(T{}, U(1) << (8 * sizeof(U) - 1));
@@ -473,6 +548,68 @@ template <typename T> struct simd {
 #endif
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd cos(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return cos_u10(x.elts);
+#else
+    using std::cos;
+    return cos(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd cosh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return cosh_u10(x.elts);
+#else
+    using std::cosh;
+    return cosh(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd cospi(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return cospi_u05(x.elts);
+#else
+    using std::acos, std::cos;
+    const T pi = acos(T(-1));
+    return cos(pi * x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd exp(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return exp_u10(x.elts);
+#else
+    using std::exp;
+    return exp(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd exp10(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return exp10_u10(x.elts);
+#else
+    using std::exp2;
+    const T log2_10 = log2(T(10));
+    return exp2(log2_10 * x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd exp2(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return exp2_u10(x.elts);
+#else
+    using std::exp2;
+    return exp2(x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simd fabs(const simd &x) {
     count_flop();
     using std::abs;
@@ -481,7 +618,7 @@ template <typename T> struct simd {
 
   friend constexpr ARITH_DEVICE ARITH_HOST simd flipsign(const simd &x,
                                                          const simd &y) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     typedef detail::unsigned_type<T> U;
     const T signmask =
         nsimd::scalar_reinterpret(T{}, U(1) << (8 * sizeof(U) - 1));
@@ -531,6 +668,26 @@ template <typename T> struct simd {
     return min(x, simd(b));
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd hypot(const simd &x,
+                                                      const simd &y) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return hypot_u05(x.elts, y.elts);
+#else
+    using std::hypot;
+    return hypot(x.elts, y.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd inv(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return rec(x.elts);
+#else
+    return inv(x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simdl<T> isfinite(const simd &x) {
     // using std::isfinite;
     // return isfinite(x.elts);
@@ -549,6 +706,36 @@ template <typename T> struct simd {
     return x != x;
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd log(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return log_u10(x.elts);
+#else
+    using std::log;
+    return log(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd log10(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return log10_u10(x.elts);
+#else
+    using std::log10;
+    return log10(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd log2(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return log2_u10(x.elts);
+#else
+    using std::log2;
+    return log2(x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simd max(const simd &x,
                                                     const simd &y) {
     count_flop();
@@ -603,7 +790,7 @@ template <typename T> struct simd {
                                                        const simd &y,
                                                        const simd &z) {
     count_flop(2);
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return nsimd::fma(x.elts, y.elts, z.elts);
 #else
     return muladd(x.elts, y.elts, z.elts);
@@ -642,7 +829,7 @@ template <typename T> struct simd {
                                                        const simd &y,
                                                        const simd &z) {
     count_flop(2);
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return nsimd::fms(x.elts, y.elts, z.elts);
 #else
     return mulsub(x.elts, y.elts, z.elts);
@@ -681,7 +868,7 @@ template <typename T> struct simd {
                                                           const simd &y,
                                                           const simd &z) {
     count_flop(2);
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return nsimd::fnma(x.elts, y.elts, z.elts);
 #else
     return negmuladd(x.elts, y.elts, z.elts);
@@ -722,7 +909,7 @@ template <typename T> struct simd {
                                                           const simd &y,
                                                           const simd &z) {
     count_flop(2);
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return nsimd::fnms(x.elts, y.elts, z.elts);
 #else
     return negmulsub(x.elts, y.elts, z.elts);
@@ -759,8 +946,25 @@ template <typename T> struct simd {
     return negmulsub(x, simd(b), simd(c));
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd pow(const simd &x,
+                                                    const simd &y) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return pow_u10(x.elts, y.elts);
+#else
+    using std::pow;
+    return pow(x.elts, y.elts);
+#endif
+  }
+  friend constexpr ARITH_DEVICE ARITH_HOST simd pow(const simd &x, const T &b) {
+    return pow(x, simd(b));
+  }
+  friend constexpr ARITH_DEVICE ARITH_HOST simd pow(const T &a, const simd &y) {
+    return pow(simd(a), y);
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simdl<T> signbit(const simd &x) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     typedef detail::unsigned_type<T> U;
     const T signmask =
         nsimd::scalar_reinterpret(T{}, U(1) << (8 * sizeof(U) - 1));
@@ -771,19 +975,70 @@ template <typename T> struct simd {
 #endif
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd sin(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return sin_u10(x.elts);
+#else
+    using std::sin;
+    return sin(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd sinh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return sinh_u10(x.elts);
+#else
+    using std::sinh;
+    return sinh(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd sinpi(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return sinpi_u05(x.elts);
+#else
+    using std::acos, std::sin;
+    const T pi = acos(T(-1));
+    return sin(pi * x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simd sqrt(const simd &x) {
     count_flop(10);
     using std::sqrt;
     return sqrt(x.elts);
   }
 
+  friend constexpr ARITH_DEVICE ARITH_HOST simd tan(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return tan_u10(x.elts);
+#else
+    using std::tan;
+    return tan(x.elts);
+#endif
+  }
+
+  friend constexpr ARITH_DEVICE ARITH_HOST simd tanh(const simd &x) {
+    count_flop(10);
+#ifndef SIMD_DISABLE
+    return tanh_u10(x.elts);
+#else
+    using std::tanh;
+    return tanh(x.elts);
+#endif
+  }
+
   friend constexpr ARITH_DEVICE ARITH_HOST simdl<T> to_logical(const simd &x) {
     return to_logical(x.elts);
   }
 
   friend ARITH_DEVICE ARITH_HOST void storea(T *ptr, const simd &x) {
     count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     storea(ptr, x.elts);
 #else
     *ptr = x.elts;
@@ -791,7 +1046,7 @@ template <typename T> struct simd {
   }
   friend ARITH_DEVICE ARITH_HOST void storeu(T *ptr, const simd &x) {
     count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     storeu(ptr, x.elts);
 #else
     *ptr = x.elts;
@@ -800,7 +1055,7 @@ template <typename T> struct simd {
   friend ARITH_DEVICE ARITH_HOST void mask_storea(const simdl<T> &mask, T *ptr,
                                                   const simd &x) {
     count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     mask_storea(mask.elts, ptr, x.elts);
 #else
     if (mask.elts)
@@ -810,11 +1065,27 @@ template <typename T> struct simd {
   friend ARITH_DEVICE ARITH_HOST void mask_storeu(const simdl<T> &mask, T *ptr,
                                                   const simd &x) {
     count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     mask_storeu(mask.elts, ptr, x.elts);
 #else
-    if (mask.elts)
+    if (mask.elts) {
+#if 0 && defined __CUDACC__
+      // __stwb: Cache write-back all coherent levels
+      // __stcg: Cache at global level (cache in L2 and below, not L1)
+      // __stcs: Cache streaming, likely to be accessed once
+      // __stwt: Cache write-through (to system memory)
+      __stwt(ptr, x.elts);
+#elif 0 && defined __HIPCC__
+      __builtin_nontemporal_store(x.elts, ptr);
+#else
+      // CPU
+#if 0 && defined __llvm__
+      __builtin_nontemporal_store(x.elts, ptr);
+#else
       *ptr = x.elts;
+#endif
+#endif
+    }
 #endif
   }
 
@@ -873,7 +1144,7 @@ template <typename T> struct nan<simd<T> > {
 
 template <typename VT, typename T = typename VT::value_type>
 ARITH_DEVICE ARITH_HOST inline simd<T> iota() {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::iota<nsimd::pack<T> >();
 #else
   return 0;
@@ -884,7 +1155,7 @@ template <typename VT, typename T = typename VT::value_type>
 ARITH_DEVICE ARITH_HOST inline simdl<T> mask_for_loop_tail(const int i,
                                                            const int n) {
   simd<T>::count_flop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::mask_for_loop_tail<nsimd::packl<T> >(i, n);
 #else
   return i < n;
@@ -894,7 +1165,7 @@ ARITH_DEVICE ARITH_HOST inline simdl<T> mask_for_loop_tail(const int i,
 template <typename VT, typename T = typename VT::value_type>
 ARITH_DEVICE ARITH_HOST inline simd<T> loada(const T *ptr) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::loada<nsimd::pack<T> >(ptr);
 #else
   return *ptr;
@@ -904,7 +1175,7 @@ ARITH_DEVICE ARITH_HOST inline simd<T> loada(const T *ptr) {
 template <typename VT, typename T = typename VT::value_type>
 ARITH_DEVICE ARITH_HOST inline simd<T> loadu(const T *ptr) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::loadu<nsimd::pack<T> >(ptr);
 #else
   return *ptr;
@@ -915,7 +1186,7 @@ template <typename T>
 ARITH_DEVICE ARITH_HOST inline simd<T> maskz_loada(const simdl<T> &mask,
                                                    const T *ptr) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::maskz_loada(mask.elts, ptr);
 #else
   return mask.elts ? *ptr : 0;
@@ -926,7 +1197,7 @@ template <typename T>
 ARITH_DEVICE ARITH_HOST inline simd<T> maskz_loadu(const simdl<T> &mask,
                                                    const T *ptr) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return nsimd::maskz_loadu(mask.elts, ptr);
 #else
   return mask.elts ? *ptr : 0;
@@ -937,7 +1208,7 @@ template <typename T>
 ARITH_DEVICE ARITH_HOST inline simd<T>
 masko_loada(const simdl<T> &mask, const T *ptr, const simd<T> &other) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return masko_loada(mask.elts, ptr, other.elts);
 #else
   return mask.elts ? *ptr : other.elts;
@@ -948,7 +1219,7 @@ template <typename T>
 ARITH_DEVICE ARITH_HOST inline simd<T>
 masko_loadu(const simdl<T> &mask, const T *ptr, const simd<T> &other) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return masko_loadu(mask.elts, ptr, other.elts);
 #else
   return mask.elts ? *ptr : other.elts;
@@ -960,7 +1231,7 @@ template <typename T, typename U,
 ARITH_DEVICE ARITH_HOST inline simd<T>
 masko_loada(const simdl<T> &mask, const T *ptr, const U &other) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return masko_loada(mask, ptr, simd<T>(other));
 #else
   return mask.elts ? *ptr : other;
@@ -972,78 +1243,13 @@ template <typename T, typename U,
 ARITH_DEVICE ARITH_HOST inline simd<T>
 masko_loadu(const simdl<T> &mask, const T *ptr, const U &other) {
   simd<T>::count_memop();
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   return masko_loadu(mask, ptr, simd<T>(other));
 #else
   return mask.elts ? *ptr : other;
 #endif
 }
 
-template <typename T>
-ARITH_DEVICE ARITH_HOST inline simd<T> acos(const simd<T> &x) {
-  simd<T>::count_memop(10);
-  alignas(simd<T>) T xarr[simd<T>::storage_size];
-  storea(xarr, x);
-  alignas(simd<T>) T yarr[simd<T>::storage_size];
-  using std::acos;
-  for (std::size_t n = 0; n < x.size(); ++n)
-    yarr[n] = acos(xarr[n]);
-  const simd<T> y = loada<simd<T> >(yarr);
-  return y;
-}
-
-template <typename T>
-ARITH_DEVICE ARITH_HOST inline simd<T> cbrt(const simd<T> &x) {
-  simd<T>::count_memop(10);
-  alignas(simd<T>) T xarr[simd<T>::storage_size];
-  storea(xarr, x);
-  alignas(simd<T>) T yarr[simd<T>::storage_size];
-  using std::cbrt;
-  for (std::size_t n = 0; n < x.size(); ++n)
-    yarr[n] = cbrt(xarr[n]);
-  const simd<T> y = loada<simd<T> >(yarr);
-  return y;
-}
-
-template <typename T>
-ARITH_DEVICE ARITH_HOST inline simd<T> cos(const simd<T> &x) {
-  simd<T>::count_memop(10);
-  alignas(simd<T>) T xarr[simd<T>::storage_size];
-  storea(xarr, x);
-  alignas(simd<T>) T yarr[simd<T>::storage_size];
-  using std::cos;
-  for (std::size_t n = 0; n < x.size(); ++n)
-    yarr[n] = cos(xarr[n]);
-  const simd<T> y = loada<simd<T> >(yarr);
-  return y;
-}
-
-template <typename T>
-ARITH_DEVICE ARITH_HOST inline simd<T> exp(const simd<T> &x) {
-  simd<T>::count_memop(10);
-  alignas(simd<T>) T xarr[simd<T>::storage_size];
-  storea(xarr, x);
-  alignas(simd<T>) T yarr[simd<T>::storage_size];
-  using std::exp;
-  for (std::size_t n = 0; n < x.size(); ++n)
-    yarr[n] = exp(xarr[n]);
-  const simd<T> y = loada<simd<T> >(yarr);
-  return y;
-}
-
-template <typename T>
-ARITH_DEVICE ARITH_HOST inline simd<T> sin(const simd<T> &x) {
-  simd<T>::count_memop(10);
-  alignas(simd<T>) T xarr[simd<T>::storage_size];
-  storea(xarr, x);
-  alignas(simd<T>) T yarr[simd<T>::storage_size];
-  using std::sin;
-  for (std::size_t n = 0; n < x.size(); ++n)
-    yarr[n] = sin(xarr[n]);
-  const simd<T> y = loada<simd<T> >(yarr);
-  return y;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 // A SIMD vector of booleans, usable with `simd<T>`.
@@ -1059,7 +1265,7 @@ ARITH_DEVICE ARITH_HOST inline simd<T> sin(const simd<T> &x) {
 
 template <typename T> struct simdl {
   typedef T value_type;
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   using storage_type = nsimd::packl<T>;
 #else
   using storage_type = bool;
@@ -1074,13 +1280,13 @@ template <typename T> struct simdl {
 
   constexpr ARITH_DEVICE ARITH_HOST simdl() {}
   constexpr ARITH_DEVICE ARITH_HOST simdl(bool a) : elts(a) {}
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
   constexpr ARITH_DEVICE ARITH_HOST simdl(const nsimd::packl<T> &elts)
       : elts(elts) {}
 #endif
 
   constexpr ARITH_DEVICE ARITH_HOST std::size_t size() const {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return sizeof(nsimd::packl<T>) / sizeof(T);
 #else
     return 1;
@@ -1089,7 +1295,7 @@ template <typename T> struct simdl {
 
   constexpr ARITH_DEVICE ARITH_HOST bool
   operator[](const std::ptrdiff_t n) const {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     // TOOD: Introduce `to_mask` for simd/simdl
     return simd<T>(nsimd::to_mask(elts))[n];
 #else
@@ -1127,7 +1333,11 @@ template <typename T> struct simdl {
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator^(const simdl &x,
                                                  const simdl &y) {
+#ifndef SIMD_DISABLE
+    return xorl(x.elts, y.elts);
+#else
     return x.elts ^ y.elts;
+#endif
   }
 
   friend ARITH_DEVICE ARITH_HOST simdl operator&(const bool a, const simdl &y) {
@@ -1172,77 +1382,77 @@ template <typename T> struct simdl {
 
   friend ARITH_DEVICE ARITH_HOST simdl operator==(const simdl &x,
                                                   const simdl &y) {
-    return x.elts == y.elts;
+    return !(x != y);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator!=(const simdl &x,
                                                   const simdl &y) {
-    return x.elts != y.elts;
+    return x ^ y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<(const simdl &x,
                                                  const simdl &y) {
-    return x.elts < y.elts;
+    return !x & y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>(const simdl &x,
                                                  const simdl &y) {
-    return x.elts > y.elts;
+    return y < x;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<=(const simdl &x,
                                                   const simdl &y) {
-    return x.elts <= y.elts;
+    return !(x > y);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>=(const simdl &x,
                                                   const simdl &y) {
-    return x.elts >= y.elts;
+    return !(x < y);
   }
 
   friend ARITH_DEVICE ARITH_HOST simdl operator==(const bool a,
                                                   const simdl &y) {
-    return a == y.elts;
+    return simdl(a) == y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator!=(const bool a,
                                                   const simdl &y) {
-    return a != y.elts;
+    return simdl(a) != y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<(const bool a, const simdl &y) {
-    return a < y.elts;
+    return simdl(a) < y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>(const bool a, const simdl &y) {
-    return a > y.elts;
+    return simdl(a) > y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<=(const bool a,
                                                   const simdl &y) {
-    return a <= y.elts;
+    return simdl(a) <= y;
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>=(const bool a,
                                                   const simdl &y) {
-    return a >= y.elts;
+    return simdl(a) >= y;
   }
 
   friend ARITH_DEVICE ARITH_HOST simdl operator==(const simdl &x,
                                                   const bool b) {
-    return x.elts == b;
+    return x == simdl(b);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator!=(const simdl &x,
                                                   const bool b) {
-    return x.elts != b;
+    return x != simdl(b);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<(const simdl &x, const bool b) {
-    return x.elts < b;
+    return x < simdl(b);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>(const simdl &x, const bool b) {
-    return x.elts > b;
+    return x > simdl(b);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator<=(const simdl &x,
                                                   const bool b) {
-    return x.elts <= b;
+    return x <= simdl(b);
   }
   friend ARITH_DEVICE ARITH_HOST simdl operator>=(const simdl &x,
                                                   const bool b) {
-    return x.elts >= b;
+    return x >= simdl(b);
   }
 
   friend ARITH_DEVICE ARITH_HOST bool all(const simdl &x) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return all(x.elts);
 #else
     return x.elts;
@@ -1250,7 +1460,7 @@ template <typename T> struct simdl {
   }
 
   friend ARITH_DEVICE ARITH_HOST simdl andnot(const simdl &x, const simdl &y) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return andnotl(x.elts, y.elts);
 #else
     return x && !y;
@@ -1258,7 +1468,7 @@ template <typename T> struct simdl {
   }
 
   friend ARITH_DEVICE ARITH_HOST bool any(const simdl &x) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return any(x.elts);
 #else
     return x.elts;
@@ -1267,7 +1477,7 @@ template <typename T> struct simdl {
 
   friend ARITH_DEVICE ARITH_HOST simd<T>
   if_else(const simdl &cond, const simd<T> &x, const simd<T> &y) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return if_else1(cond.elts, x.elts, y.elts);
 #else
     return cond.elts ? x.elts : y.elts;
@@ -1288,7 +1498,7 @@ template <typename T> struct simdl {
 
   friend ARITH_DEVICE ARITH_HOST simdl<T>
   if_else(const simdl &cond, const simdl<T> &x, const simdl<T> &y) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     return if_else1(cond.elts, x.elts, y.elts);
 #else
     return cond.elts ? x.elts : y.elts;
@@ -1308,14 +1518,14 @@ template <typename T> struct simdl {
   }
 
   friend ARITH_DEVICE ARITH_HOST void storela(T *ptr, const simdl &x) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     storela(ptr, x.elts);
 #else
     *ptr = x.elts;
 #endif
   }
   friend ARITH_DEVICE ARITH_HOST void storelu(T *ptr, const simdl &x) {
-#ifndef SIMD_CPU
+#ifndef SIMD_DISABLE
     storelu(ptr, x.elts);
 #else
     *ptr = x.elts;
diff --git a/BenchX/par/benchmark-carpet.par b/BenchX/par/benchmark-carpet.par
index 431f8c410..72c80e4ba 100644
--- a/BenchX/par/benchmark-carpet.par
+++ b/BenchX/par/benchmark-carpet.par
@@ -6,8 +6,8 @@ ActiveThorns = "
     CartGrid3D
     CoordBase
     Formaline
-    InitBase
     IOUtil
+    InitBase
     ML_WaveToy
     MoL
     ReflectionSymmetry
diff --git a/BenchX/par/benchmark-carpetx.par b/BenchX/par/benchmark-carpetx.par
index c2830dde7..6ed9b3270 100644
--- a/BenchX/par/benchmark-carpetx.par
+++ b/BenchX/par/benchmark-carpetx.par
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BenchX/par/benchmark-z4c+asterx.par b/BenchX/par/benchmark-z4c+asterx.par
index 8cca2261b..0bc057226 100644
--- a/BenchX/par/benchmark-z4c+asterx.par
+++ b/BenchX/par/benchmark-z4c+asterx.par
@@ -1,4 +1,5 @@
 ActiveThorns = "
+    # SystemTopology
     ADMBase
     AsterSeeds
     AsterX
@@ -7,7 +8,6 @@ ActiveThorns = "
     HydroBase
     IOUtil
     ODESolvers
-    # SystemTopology
     TOVSolver
     TimerReport
     TmunuBase
diff --git a/BenchX/par/benchmark-z4c+grhydrox.par b/BenchX/par/benchmark-z4c+grhydrox.par
index fde794a85..128117593 100644
--- a/BenchX/par/benchmark-z4c+grhydrox.par
+++ b/BenchX/par/benchmark-z4c+grhydrox.par
@@ -1,4 +1,5 @@
 ActiveThorns = "
+    # SystemTopology
     ADMBase
     CarpetX
     ErrorEstimator
@@ -8,7 +9,6 @@ ActiveThorns = "
     HydroBase
     IOUtil
     ODESolvers
-    # SystemTopology
     TimerReport
     TmunuBase
     Z4c
@@ -66,7 +66,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BenchX/par/benchmark-z4c.par b/BenchX/par/benchmark-z4c.par
index 39ef13978..c04aba696 100644
--- a/BenchX/par/benchmark-z4c.par
+++ b/BenchX/par/benchmark-z4c.par
@@ -1,11 +1,11 @@
 ActiveThorns = "
+    # SystemTopology
     ADMBaseX
     CarpetX
     ErrorEstimator
     Formaline
     IOUtil
     ODESolvers
-    # SystemTopology
     TimerReport
     TmunuBaseX
     Z4c
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes
diff --git a/BoxInBox/interface.ccl b/BoxInBox/interface.ccl
index 2839d7a4b..f481fa949 100644
--- a/BoxInBox/interface.ccl
+++ b/BoxInBox/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: BoxInBox
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/BoxInBox/param.ccl b/BoxInBox/param.ccl
index 1af69ce3e..c9f1e22a5 100644
--- a/BoxInBox/param.ccl
+++ b/BoxInBox/param.ccl
@@ -52,25 +52,25 @@ CCTK_REAL position_z_1 "Position of this region"
 CCTK_REAL radius_1[30] "Radius of refined region for this level"
 {
   -1 :: "illegal"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_x_1[30] "x-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_y_1[30] "y-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_z_1[30] "z-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 
@@ -120,25 +120,25 @@ CCTK_REAL position_z_2 "Position of this region"
 CCTK_REAL radius_2[30] "Radius of refined region for this level"
 {
   -1 :: "illegal"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_x_2[30] "x-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_y_2[30] "y-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_z_2[30] "z-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 
@@ -188,23 +188,23 @@ CCTK_REAL position_z_3 "Position of this region"
 CCTK_REAL radius_3[30] "Radius of refined region for this level"
 {
   -1 :: "illegal"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_x_3[30] "x-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_y_3[30] "y-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
 
 CCTK_REAL radius_z_3[30] "z-radius of refined region for this level"
 {
   -1 :: "ignore this radius"
-  0:* :: ""
+  (0:* :: ""
 } -1.0
diff --git a/BoxInBox/schedule.ccl b/BoxInBox/schedule.ccl
index ee59596ca..d13f4f5b3 100644
--- a/BoxInBox/schedule.ccl
+++ b/BoxInBox/schedule.ccl
@@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
@@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
diff --git a/BoxInBox/test/levels1.par b/BoxInBox/test/levels1.par
index e9623d50d..9695869b8 100644
--- a/BoxInBox/test/levels1.par
+++ b/BoxInBox/test/levels1.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -31,6 +32,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -39,7 +41,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels1/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels1/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels1/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels1/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels1/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels1/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels1/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels2.par b/BoxInBox/test/levels2.par
index 493e1beb5..fe499253d 100644
--- a/BoxInBox/test/levels2.par
+++ b/BoxInBox/test/levels2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -32,6 +33,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -40,7 +42,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels2/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels2/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels2/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels2/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels2/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels20.par b/BoxInBox/test/levels20.par
index b36677bd0..20cf0d446 100644
--- a/BoxInBox/test/levels20.par
+++ b/BoxInBox/test/levels20.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -50,6 +51,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -58,7 +60,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels20/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels20/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels20/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels20/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels20/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels20/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels20/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels3.par b/BoxInBox/test/levels3.par
index baf2c20f9..1e837d91d 100644
--- a/BoxInBox/test/levels3.par
+++ b/BoxInBox/test/levels3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -33,6 +34,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -41,7 +43,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/levels3/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/levels3/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/levels3/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/levels3/norms/carpetx-regrid_error.tsv b/BoxInBox/test/levels3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/levels3/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/levels3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions2.par b/BoxInBox/test/regions2.par
index 5418a4c4f..e6c9b48ad 100644
--- a/BoxInBox/test/regions2.par
+++ b/BoxInBox/test/regions2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -42,6 +43,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -50,7 +52,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions2/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions2/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions2/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions2/norms/carpetx-regrid_error.tsv b/BoxInBox/test/regions2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions2/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/regions2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions3.par b/BoxInBox/test/regions3.par
index 321d60eb8..bcf53e814 100644
--- a/BoxInBox/test/regions3.par
+++ b/BoxInBox/test/regions3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -53,6 +54,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -61,7 +63,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/regions3/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/regions3/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/regions3/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/regions3/norms/carpetx-regrid_error.tsv b/BoxInBox/test/regions3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/regions3/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/regions3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/unigrid.par b/BoxInBox/test/unigrid.par
index 1030b889b..45463bab7 100644
--- a/BoxInBox/test/unigrid.par
+++ b/BoxInBox/test/unigrid.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
 "
@@ -30,6 +31,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -38,7 +40,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.x.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.x.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.y.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.y.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000000.z.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000000.z.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.x.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.x.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.x.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.y.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.y.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.y.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/BoxInBox/test/unigrid/carpetx-regrid_error.it000010.z.tsv b/BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.z.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/carpetx-regrid_error.it000010.z.tsv
rename to BoxInBox/test/unigrid/carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/BoxInBox/test/unigrid/norms/carpetx-regrid_error.tsv b/BoxInBox/test/unigrid/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from BoxInBox/test/unigrid/norms/carpetx-regrid_error.tsv
rename to BoxInBox/test/unigrid/norms/carpetxregrid-regrid_error.tsv
diff --git a/CarpetX/configuration.ccl b/CarpetX/configuration.ccl
index 5db400799..41757ba75 100644
--- a/CarpetX/configuration.ccl
+++ b/CarpetX/configuration.ccl
@@ -2,7 +2,7 @@
 
 REQUIRES AMReX IOUtil MPI yaml_cpp zlib
 
-REQUIRES Arith Loop
+REQUIRES Arith CarpetXRegrid Loop
 
 OPTIONAL ADIOS2
 {
diff --git a/CarpetX/doc/documentation.tex b/CarpetX/doc/documentation.tex
index 28a5b3f54..6e2d52266 100644
--- a/CarpetX/doc/documentation.tex
+++ b/CarpetX/doc/documentation.tex
@@ -126,6 +126,7 @@
 
 % Add all definitions used in this documentation here
 \newcommand{\CarpetX}{\texttt{CarpetX}}
+\newcommand{\CarpetXRegridError}{\texttt{CarpetXRegridError}}
 \newcommand{\Cactus}{\texttt{Cactus}}
 \newcommand{\AMReX}{\texttt{AMReX}}
 \newcommand{\ETK}{\texttt{Einstein Toolkit}}
@@ -449,7 +450,7 @@ \section{Loops over grid elements}
 to the thorn's \texttt{configuration.ccl} file and
 %
 \begin{lstlisting}[language=Bash]
-    INHERITS: CarpetX   
+    INHERITS: CarpetXRegrid
     USES INCLUDE HEADER: loop_device.hxx
 \end{lstlisting}
 %
@@ -972,7 +973,7 @@ \subsection{Box-in-box AMR}
 \subsection{Advanced AMR}
 \label{sec:advanced_amr}
 
-\CarpetX\space supports non-fixed (adaptive) mesh refinement. For cell level control of AMR, \CarpetX\space provides user with a cell centered and non-checkpointed grid function called \texttt{regrid\_error}. Users are responsible for filling this grid function with real value however they see fit. Once it is filled, the configuration parameter \texttt{CarpetX::regrid\_error\_threshold} controls regridding: If the values stored in \texttt{regrid\_error} are larger than what is set in \texttt{regrid\_error\_threshold}, the region gets refined. Additionally, the configuration parameter \texttt{CarpetX::regrid\_every} controls how many iterations should pass before checking if the error threshold has been exceeded. The parameter \texttt{CarpetX::max\_num\_levels} controls the maximum number of allowed refinement levels.
+\CarpetX\space supports non-fixed (adaptive) mesh refinement. For cell level control of AMR, \CarpetXRegridError\space provides users with a cell centered and non-checkpointed grid function called \texttt{regrid\_error}. Users are responsible for filling this grid function with real value however they see fit. Once it is filled, the configuration parameter \texttt{CarpetX::regrid\_error\_threshold} controls regridding: If the values stored in \texttt{regrid\_error} are larger than what is set in \texttt{regrid\_error\_threshold}, the region gets refined. Additionally, the configuration parameter \texttt{CarpetX::regrid\_every} controls how many iterations should pass before checking if the error threshold has been exceeded. The parameter \texttt{CarpetX::max\_num\_levels} controls the maximum number of allowed refinement levels.
 
 Note that \CarpetX\space \textbf{does not} provide a ``standardized'' regrid error routine. This is because refinement criteria are highly specific to the problem being solved via AMR, and thus there is no one size fits all error criteria. This might seem inconvenient, but ultimately it allows for users to have higher degrees of customization in their AMR codes. For demonstration purposes, we shall now provide a routine that estimates the regrinding error as \todo{what? Provide a good starter example}. This implementation could be used as a starting point for codes that wish to use different error criteria in their AMR grids.
 
@@ -999,14 +1000,14 @@ \subsection{Advanced AMR}
   {
     LANG: C
     READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
+    WRITES: CarpetXRegrid::regrid_error(interior)
   } "Estimate error for regridding"
   
   SCHEDULE EstimateError AT poststep
   {
     LANG: C
     READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
+    WRITES: CarpetXRegrid::regrid_error(interior)
   } "Estimate error for regridding"
 \end{lstlisting}
 
diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
index e4c4ea1a3..a1433268f 100644
--- a/CarpetX/interface.ccl
+++ b/CarpetX/interface.ccl
@@ -1,8 +1,6 @@
 # Interface definition for thorn CarpetX
 
-IMPLEMENTS: CarpetX
-
-INHERITS: IO
+IMPLEMENTS: Driver
 
 USES INCLUDE HEADER: silo.hxx
 
@@ -168,12 +166,3 @@ CCTK_INT FUNCTION DriverInterpolate(
   CCTK_INT ARRAY IN output_array_types,
   CCTK_POINTER ARRAY IN output_arrays)
 PROVIDES FUNCTION DriverInterpolate WITH CarpetX_DriverInterpolate LANGUAGE C
-
-
-
-PUBLIC:
-
-CCTK_REAL regrid_error TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
-{
-  regrid_error
-} "Regridding condition"
diff --git a/CarpetX/par/brill-lindquist-checkpoint.par b/CarpetX/par/brill-lindquist-checkpoint.par
index 7ae5391d1..b002f086b 100644
--- a/CarpetX/par/brill-lindquist-checkpoint.par
+++ b/CarpetX/par/brill-lindquist-checkpoint.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-read.par b/CarpetX/par/brill-lindquist-read.par
index 3e31d7b07..faa20da2b 100644
--- a/CarpetX/par/brill-lindquist-read.par
+++ b/CarpetX/par/brill-lindquist-read.par
@@ -28,9 +28,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-recover.par b/CarpetX/par/brill-lindquist-recover.par
index 725ff0b8f..e7990183a 100644
--- a/CarpetX/par/brill-lindquist-recover.par
+++ b/CarpetX/par/brill-lindquist-recover.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/par/brill-lindquist-write.par b/CarpetX/par/brill-lindquist-write.par
index a587c0fc0..72426410b 100644
--- a/CarpetX/par/brill-lindquist-write.par
+++ b/CarpetX/par/brill-lindquist-write.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes
diff --git a/CarpetX/param.ccl b/CarpetX/param.ccl
index 37dfc9d0b..41d28a186 100644
--- a/CarpetX/param.ccl
+++ b/CarpetX/param.ccl
@@ -69,18 +69,31 @@ CCTK_INT ncells_z "Number of grid cells"
 
 
 
-BOOLEAN periodic_x "Periodic"
+RESTRICTED:
+
+BOOLEAN periodic "Periodic boundary conditions"
 {
-} no
+  "yes" :: "must be set for any periodic_x,y,z to be effective"
+  "no"  :: "no periodicity"
+} "no"
 
-BOOLEAN periodic_y "Periodic"
+BOOLEAN periodic_x "Periodic boundary conditions in x-direction"
 {
-} no
+  "yes" :: "periodic in x direction, requires periodic=yes as well"
+  "no"  :: "not periodic in x direction"
+} "yes"
 
-BOOLEAN periodic_z "Periodic"
+BOOLEAN periodic_y "Periodic boundary conditions in y-direction"
 {
-} no
+  "yes" :: "periodic in y direction, requires periodic=yes as well"
+  "no"  :: "not periodic in y direction"
+} "yes"
 
+BOOLEAN periodic_z "Periodic boundary conditions in z-direction"
+{
+  "yes" :: "periodic in z direction, requires periodic=yes as well"
+  "no"  :: "not periodic in z direction"
+} "yes"
 
 RESTRICTED:
 
@@ -383,17 +396,15 @@ CCTK_INT max_num_levels "Maximum number of refinement levels"
   1:* :: ""
 } 1
 
-RESTRICTED:
 
+#TODO: move to CarpetRegridX
 CCTK_INT regrid_every "Regridding interval" STEERABLE=always
 {
   0 :: "never"
   1:* :: "every that many iterations"
 } 0
 
-
-PRIVATE:
-
+#TODO: eliminate in favor of regrid_error being a true/false field
 CCTK_REAL regrid_error_threshold "Regridding error threshold" STEERABLE=always
 {
   0.0:* :: ""
@@ -429,10 +440,12 @@ KEYWORD prolongation_type "Prolongation type"
   "interpolate" :: "interpolate between data points"
   "conservative" :: "interpolate cell averages, ensuring conservation"
   "ddf" :: "interpolate in vertex centred and conserve (with one order lower) in cell centred directions"
-  "eno" :: "interpolate in vertex centred and ENO-conserve in cell centred directions"
+  "eno" :: "interpolate in vertex centred and minmod-conserve in cell centred directions"
+  "minmod" :: "interpolate in vertex centred and ENO-conserve in cell centred directions"
   "hermite" :: "Hermite-interpolate in vertex centred and conserve in cell centred directions"
   "natural" :: "interpolate in vertex centred and conserve in cell centred directions, using the same order"
   "poly-cons3lfb" :: "interpolate polynomially in vertex centred directions and conserve with 3rd order accuracy and a linear fallback in cell centred directions"
+  "poly-eno3lfb" :: "interpolate polynomially in vertex centred directions and use ENO stencils with 3rd order accuracy and a linear fallback in cell centred directions"
 } "natural"
 
 CCTK_INT prolongation_order "Prolongation order"
@@ -578,7 +591,7 @@ BOOLEAN out_norm_omit_sumloc_for_backward_compatibility "Omit sumloc norms" STEE
 KEYWORD openpmd_format "openPMD file format" STEERABLE=always
 {
   "HDF5" :: ""
-  "ADIOS1" :: ""
+  "ADIOS1" :: "requires openPMD_api <0.16"
   "ADIOS2_auto" :: "Choose ADIOS2 format automatically (either ADIOS2_BP5 or ADIOS2_BP4)"
   "ADIOS2" :: "requires openPMD_api <0.15"
   "ADIOS2_BP" :: "requires openPMD_api >=0.15"
@@ -587,6 +600,8 @@ KEYWORD openpmd_format "openPMD file format" STEERABLE=always
   "ADIOS2_SST" :: ""
   "ADIOS2_SSC" :: ""
   "JSON" :: ""
+  "TOML" :: "requires openPMD_api >=0.16"
+  "GENERIC" :: "requires openPMD_api >=0.16"
 } "ADIOS2_auto"
 
 STRING out_openpmd_vars "Variables to output in openPMD format" STEERABLE=always
diff --git a/CarpetX/schedule.ccl b/CarpetX/schedule.ccl
index ef1e29a6d..7724baa8d 100644
--- a/CarpetX/schedule.ccl
+++ b/CarpetX/schedule.ccl
@@ -20,16 +20,6 @@ if (!CCTK_Equals(recover, "no") && *recover_file)
 
 
 
-# Error estimation
-
-SCHEDULE CarpetX_InitError AT basegrid
-{
-  LANG: C
-  WRITES: regrid_error(everywhere)
-} "Initialize regridding error to zero"
-
-
-
 # I/O
 
 SCHEDULE CarpetX_CheckpointInitial AT cpinitial
diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
index c81570857..ed88dbd49 100644
--- a/CarpetX/src/driver.cxx
+++ b/CarpetX/src/driver.cxx
@@ -133,8 +133,10 @@ std::array<std::array<symmetry_t, dim>, 2> get_symmetries(const int patch) {
         is_interpatch[f][d] = is_interpatch_boundary[2 * d + f];
   }
   const std::array<std::array<bool, 3>, 2> is_periodic{{
-      {{bool(periodic_x), bool(periodic_y), bool(periodic_z)}},
-      {{bool(periodic_x), bool(periodic_y), bool(periodic_z)}},
+      {{bool(periodic && periodic_x), bool(periodic && periodic_y),
+        bool(periodic && periodic_z)}},
+      {{bool(periodic && periodic_x), bool(periodic && periodic_y),
+        bool(periodic && periodic_z)}},
   }};
   const array<array<bool, 3>, 2> is_reflection{{
       {{bool(reflection_x), bool(reflection_y), bool(reflection_z)}},
@@ -539,6 +541,7 @@ amrex::Interpolater *get_interpolator(const std::array<int, dim> indextype) {
     conservative,
     ddf,
     eno,
+    minmod,
     hermite,
     natural,
     poly_cons3lfb,
@@ -553,12 +556,16 @@ amrex::Interpolater *get_interpolator(const std::array<int, dim> indextype) {
       return interp_t::ddf;
     else if (CCTK_EQUALS(prolongation_type, "eno"))
       return interp_t::eno;
+    else if (CCTK_EQUALS(prolongation_type, "minmod"))
+      return interp_t::minmod;
     else if (CCTK_EQUALS(prolongation_type, "hermite"))
       return interp_t::hermite;
     else if (CCTK_EQUALS(prolongation_type, "natural"))
       return interp_t::natural;
     else if (CCTK_EQUALS(prolongation_type, "poly-cons3lfb"))
       return interp_t::poly_cons3lfb;
+    else if (CCTK_EQUALS(prolongation_type, "poly-eno3lfb"))
+      return interp_t::poly_eno3lfb;
     else
       assert(0);
   }();
@@ -846,27 +853,6 @@ amrex::Interpolater *get_interpolator(const std::array<int, dim> indextype) {
 
     switch (prolongation_order) {
 
-    case 1:
-      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
-      case 0b000:
-        return &prolongate_eno_3d_rf2_c000_o1;
-      case 0b001:
-        return &prolongate_eno_3d_rf2_c001_o1;
-      case 0b010:
-        return &prolongate_eno_3d_rf2_c010_o1;
-      case 0b011:
-        return &prolongate_eno_3d_rf2_c011_o1;
-      case 0b100:
-        return &prolongate_eno_3d_rf2_c100_o1;
-      case 0b101:
-        return &prolongate_eno_3d_rf2_c101_o1;
-      case 0b110:
-        return &prolongate_eno_3d_rf2_c110_o1;
-      case 0b111:
-        return &prolongate_eno_3d_rf2_c111_o1;
-      }
-      break;
-
     case 3:
       switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
       case 0b000:
@@ -911,6 +897,75 @@ amrex::Interpolater *get_interpolator(const std::array<int, dim> indextype) {
     }
     break;
 
+  case interp_t::minmod:
+
+    switch (prolongation_order) {
+
+    case 1:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_minmod_3d_rf2_c000_o1;
+      case 0b001:
+        return &prolongate_minmod_3d_rf2_c001_o1;
+      case 0b010:
+        return &prolongate_minmod_3d_rf2_c010_o1;
+      case 0b011:
+        return &prolongate_minmod_3d_rf2_c011_o1;
+      case 0b100:
+        return &prolongate_minmod_3d_rf2_c100_o1;
+      case 0b101:
+        return &prolongate_minmod_3d_rf2_c101_o1;
+      case 0b110:
+        return &prolongate_minmod_3d_rf2_c110_o1;
+      case 0b111:
+        return &prolongate_minmod_3d_rf2_c111_o1;
+      }
+      break;
+
+    case 3:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_minmod_3d_rf2_c000_o3;
+      case 0b001:
+        return &prolongate_minmod_3d_rf2_c001_o3;
+      case 0b010:
+        return &prolongate_minmod_3d_rf2_c010_o3;
+      case 0b011:
+        return &prolongate_minmod_3d_rf2_c011_o3;
+      case 0b100:
+        return &prolongate_minmod_3d_rf2_c100_o3;
+      case 0b101:
+        return &prolongate_minmod_3d_rf2_c101_o3;
+      case 0b110:
+        return &prolongate_minmod_3d_rf2_c110_o3;
+      case 0b111:
+        return &prolongate_minmod_3d_rf2_c111_o3;
+      }
+      break;
+
+    case 5:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_minmod_3d_rf2_c000_o5;
+      case 0b001:
+        return &prolongate_minmod_3d_rf2_c001_o5;
+      case 0b010:
+        return &prolongate_minmod_3d_rf2_c010_o5;
+      case 0b011:
+        return &prolongate_minmod_3d_rf2_c011_o5;
+      case 0b100:
+        return &prolongate_minmod_3d_rf2_c100_o5;
+      case 0b101:
+        return &prolongate_minmod_3d_rf2_c101_o5;
+      case 0b110:
+        return &prolongate_minmod_3d_rf2_c110_o5;
+      case 0b111:
+        return &prolongate_minmod_3d_rf2_c111_o5;
+      }
+      break;
+    }
+    break;
+
   case interp_t::hermite:
 
     switch (prolongation_order) {
@@ -1162,6 +1217,98 @@ amrex::Interpolater *get_interpolator(const std::array<int, dim> indextype) {
     }
     break;
 
+  case interp_t::poly_eno3lfb:
+
+    switch (prolongation_order) {
+
+    case 1:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_poly_eno3lfb_3d_rf2_c000_o1;
+      case 0b001:
+        return &prolongate_poly_eno3lfb_3d_rf2_c001_o1;
+      case 0b010:
+        return &prolongate_poly_eno3lfb_3d_rf2_c010_o1;
+      case 0b011:
+        return &prolongate_poly_eno3lfb_3d_rf2_c011_o1;
+      case 0b100:
+        return &prolongate_poly_eno3lfb_3d_rf2_c100_o1;
+      case 0b101:
+        return &prolongate_poly_eno3lfb_3d_rf2_c101_o1;
+      case 0b110:
+        return &prolongate_poly_eno3lfb_3d_rf2_c110_o1;
+      case 0b111:
+        return &prolongate_poly_eno3lfb_3d_rf2_c111_o1;
+      }
+      break;
+
+    case 3:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_poly_eno3lfb_3d_rf2_c000_o3;
+      case 0b001:
+        return &prolongate_poly_eno3lfb_3d_rf2_c001_o3;
+      case 0b010:
+        return &prolongate_poly_eno3lfb_3d_rf2_c010_o3;
+      case 0b011:
+        return &prolongate_poly_eno3lfb_3d_rf2_c011_o3;
+      case 0b100:
+        return &prolongate_poly_eno3lfb_3d_rf2_c100_o3;
+      case 0b101:
+        return &prolongate_poly_eno3lfb_3d_rf2_c101_o3;
+      case 0b110:
+        return &prolongate_poly_eno3lfb_3d_rf2_c110_o3;
+      case 0b111:
+        return &prolongate_poly_eno3lfb_3d_rf2_c111_o3;
+      }
+      break;
+
+    case 5:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_poly_eno3lfb_3d_rf2_c000_o5;
+      case 0b001:
+        return &prolongate_poly_eno3lfb_3d_rf2_c001_o5;
+      case 0b010:
+        return &prolongate_poly_eno3lfb_3d_rf2_c010_o5;
+      case 0b011:
+        return &prolongate_poly_eno3lfb_3d_rf2_c011_o5;
+      case 0b100:
+        return &prolongate_poly_eno3lfb_3d_rf2_c100_o5;
+      case 0b101:
+        return &prolongate_poly_eno3lfb_3d_rf2_c101_o5;
+      case 0b110:
+        return &prolongate_poly_eno3lfb_3d_rf2_c110_o5;
+      case 0b111:
+        return &prolongate_poly_eno3lfb_3d_rf2_c111_o5;
+      }
+      break;
+
+#if 0
+    case 7:
+      switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
+      case 0b000:
+        return &prolongate_poly_eno3lfb_3d_rf2_c000_o7;
+      case 0b001:
+        return &prolongate_poly_eno3lfb_3d_rf2_c001_o7;
+      case 0b010:
+        return &prolongate_poly_eno3lfb_3d_rf2_c010_o7;
+      case 0b011:
+        return &prolongate_poly_eno3lfb_3d_rf2_c011_o7;
+      case 0b100:
+        return &prolongate_poly_eno3lfb_3d_rf2_c100_o7;
+      case 0b101:
+        return &prolongate_poly_eno3lfb_3d_rf2_c101_o7;
+      case 0b110:
+        return &prolongate_poly_eno3lfb_3d_rf2_c110_o7;
+      case 0b111:
+        return &prolongate_poly_eno3lfb_3d_rf2_c111_o7;
+      }
+      break;
+#endif
+    }
+    break;
+
   case interp_t::unset:
     // do nothing; errors are handled below
     break;
@@ -1562,7 +1709,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
 #pragma omp critical
     CCTK_VINFO("ErrorEst patch %d level %d", patch, level);
 
-  const int gi = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi >= 0);
   const int vi = 0;
   const int tl = 0;
diff --git a/CarpetX/src/interpolate.cxx b/CarpetX/src/interpolate.cxx
index df9ef5cd6..de484f68d 100644
--- a/CarpetX/src/interpolate.cxx
+++ b/CarpetX/src/interpolate.cxx
@@ -20,6 +20,7 @@
 #include <array>
 #include <cassert>
 #include <cmath>
+#include <iostream>
 #include <limits>
 #include <map>
 #include <set>
@@ -33,9 +34,6 @@ namespace {
 
 // Interpolate a grid function at one point, dimensionally recursive
 template <typename T, int order, int centering> struct interpolator {
-  // TODO: `centering` is not used; remove it
-  // TODO: remove `dx` in favour of `x1`?
-
   static constexpr vect<bool, dim> indextype{(centering & 0b100) != 0,
                                              (centering & 0b010) != 0,
                                              (centering & 0b001) != 0};
@@ -73,12 +71,9 @@ template <typename T, int order, int centering> struct interpolator {
         for (int b = -1; b <= +1; ++b)
           for (int a = -1; a <= +1; ++a)
             if (vars.contains(j[0] + a, j[1] + b, j[2] + c))
-              // std::cerr << "  val[" << a << "," << b << "," << c
-              //           << "]=" << vars(j[0] + a, j[1] + b, j[2] + c, vi) <<
-              //           "\n";
-              std::fprintf(stderr, "val[%d,%d,%d]=%.17g\n", j[0] + a, j[1] + b,
-                           j[2] + c,
-                           double(vars(j[0] + a, j[1] + b, j[2] + c, vi)));
+              std::cerr << "  val[" << a << "," << b << "," << c
+                        << "]=" << vars(j[0] + a, j[1] + b, j[2] + c, vi)
+                        << "\n";
     }
     assert(isfinite(val));
 #endif
@@ -229,9 +224,9 @@ template <typename T, int order, int centering> struct interpolator {
     // const auto x1 = x0 + (grid.lsh - 1 - indextype) * grid.dx;
     const auto dx = grid.dx;
 
-    assert(vars.end.x - vars.begin.x == grid.lsh[0]);
-    assert(vars.end.y - vars.begin.y == grid.lsh[1]);
-    assert(vars.end.z - vars.begin.z == grid.lsh[2]);
+    assert(vars.end.x - vars.begin.x == grid.lsh[0] - indextype[0]);
+    assert(vars.end.y - vars.begin.y == grid.lsh[1] - indextype[1]);
+    assert(vars.end.z - vars.begin.z == grid.lsh[2] - indextype[2]);
 
     // We assume that the input is synchronized, i.e. that all ghost
     // zones are valid, but all outer boundaries are invalid.
@@ -445,13 +440,14 @@ extern "C" void CarpetX_Interpolate(const CCTK_POINTER_TO_CONST cctkGH_,
                               patches.data(), localsx.data(), localsy.data(),
                               localsz.data());
   } else {
-    // TODO: Don't copy
-    for (int n = 0; n < npoints; ++n) {
-      patches[n] = 0;
-      localsx[n] = globalsx[n];
-      localsy[n] = globalsy[n];
-      localsz[n] = globalsz[n];
-    }
+    for (int n = 0; n < npoints; ++n)
+      patches.at(n) = 0;
+    for (int n = 0; n < npoints; ++n)
+      localsx.at(n) = globalsx[n];
+    for (int n = 0; n < npoints; ++n)
+      localsy.at(n) = globalsy[n];
+    for (int n = 0; n < npoints; ++n)
+      localsz.at(n) = globalsz[n];
   }
 
   // Apply symmetries to coordinates
@@ -485,7 +481,7 @@ extern "C" void CarpetX_Interpolate(const CCTK_POINTER_TO_CONST cctkGH_,
   std::vector<CCTK_REAL> posy(npoints);
   std::vector<CCTK_REAL> posz(npoints);
   for (int n = 0; n < npoints; ++n) {
-    const int patch = patches[n];
+    const int patch = patches.at(n);
     const amrex::Geometry &geom = ghext->patchdata.at(patch).amrcore->Geom(0);
     const CCTK_REAL *restrict const xmin = geom.ProbLo();
     const CCTK_REAL *restrict const xmax = geom.ProbHi();
@@ -535,8 +531,9 @@ extern "C" void CarpetX_Interpolate(const CCTK_POINTER_TO_CONST cctkGH_,
 
   // Send particles to interpolation points
   for (auto &container : containers) {
-    const int patch = int(&container - containers.data());
 #ifdef CCTK_DEBUG
+    const int patch = int(&container - containers.data());
+
     std::size_t old_nparticles = 0;
     std::set<int> oldids;
     {
diff --git a/CarpetX/src/io_adios2.cxx b/CarpetX/src/io_adios2.cxx
index 89b181040..a0defc667 100644
--- a/CarpetX/src/io_adios2.cxx
+++ b/CarpetX/src/io_adios2.cxx
@@ -198,12 +198,12 @@ void carpetx_adios2_t::OutputADIOS2(const cGH *const cctkGH,
   static Timer timer("OutputADIOS2");
   Interval interval(timer);
 
-  if (io_verbose)
-    CCTK_VINFO("OutputADIOS2...");
-
   if (std::count(output_group.begin(), output_group.end(), true) == 0)
     return;
 
+  if (io_verbose)
+    CCTK_VINFO("OutputADIOS2...");
+
   try {
 
     // const MPI_Comm mpi_comm = MPI_COMM_WORLD;
@@ -252,6 +252,18 @@ void carpetx_adios2_t::OutputADIOS2(const cGH *const cctkGH,
       // io.SetEngine("BP5");
       engine = io.Open(filename, adios2::Mode::Write);
 
+#ifdef ADIOS2_HAVE_BLOSC2
+      const adios2::Operator compressor =
+          adios.DefineOperator("Blosc2Compressor", adios2::ops::LosslessBlosc);
+      // Use a high compression rate and a byteshuffle filter
+      const adios2::Params compressor_options{
+          {adios2::ops::blosc::key::clevel,
+           adios2::ops::blosc::value::clevel_9},
+          {adios2::ops::blosc::key::doshuffle,
+           adios2::ops::blosc::value::doshuffle_shuffle},
+      };
+#endif
+
       if (io_verbose)
         CCTK_VINFO("  Defining variables...");
 
@@ -300,8 +312,12 @@ void carpetx_adios2_t::OutputADIOS2(const cGH *const cctkGH,
                     if (io_verbose)
                       CCTK_VINFO("      Defining variable %s...",
                                  varname.c_str());
-                    // const adios2::Variable<CCTK_REAL> var =
-                    io.DefineVariable<CCTK_REAL>(varname, {}, {}, {1, 1, 1});
+                    adios2::Variable<CCTK_REAL> var =
+                        io.DefineVariable<CCTK_REAL>(varname, {}, {},
+                                                     {1, 1, 1});
+#ifdef ADIOS2_HAVE_BLOSC2
+                    var.AddOperation(compressor, compressor_options);
+#endif
                   } // for local_component
 
                 } else { // if combine_components
@@ -321,7 +337,7 @@ void carpetx_adios2_t::OutputADIOS2(const cGH *const cctkGH,
           } // for gi
 
         } // for leveldata
-      }   // for patchdata
+      } // for patchdata
 
     } // if !adios2_state
 
diff --git a/CarpetX/src/io_openpmd.cxx b/CarpetX/src/io_openpmd.cxx
index 33ae9d5e5..acdbf9f7f 100644
--- a/CarpetX/src/io_openpmd.cxx
+++ b/CarpetX/src/io_openpmd.cxx
@@ -65,8 +65,11 @@ openPMD::Format get_format() {
   DECLARE_CCTK_PARAMETERS;
   if (CCTK_EQUALS(openpmd_format, "HDF5"))
     return openPMD::Format::HDF5;
+#if OPENPMDAPI_VERSION_GE(0, 16, 0)
+#else
   if (CCTK_EQUALS(openpmd_format, "ADIOS1"))
     return openPMD::Format::ADIOS1;
+#endif
   if (CCTK_EQUALS(openpmd_format, "ADIOS2_auto"))
 #if OPENPMDAPI_VERSION_GE(0, 15, 0)
     return openPMD::Format::ADIOS2_BP5;
@@ -90,6 +93,14 @@ openPMD::Format get_format() {
     return openPMD::Format::ADIOS2_SSC;
   if (CCTK_EQUALS(openpmd_format, "JSON"))
     return openPMD::Format::JSON;
+#if OPENPMDAPI_VERSION_GE(0, 16, 0)
+  if (CCTK_EQUALS(openpmd_format, "TOML"))
+    return openPMD::Format::TOML;
+#endif
+#if OPENPMDAPI_VERSION_GE(0, 16, 0)
+  if (CCTK_EQUALS(openpmd_format, "GENERIC"))
+    return openPMD::Format::GENERIC;
+#endif
   CCTK_VERROR("The openPMD format \"%s\" is not supported in version %d.%d.%d "
               "of the openPMD_api library",
               openpmd_format, OPENPMDAPI_VERSION_MAJOR,
@@ -104,27 +115,24 @@ openPMD::Format get_format() {
 constexpr openPMD::IterationEncoding iterationEncoding =
     openPMD::IterationEncoding::fileBased;
 
-//  constexpr const char options[]
-// const std::string options = "{"
-//                             "  \"adios2\": {"
-//                             "    \"engine\": {"
-//                             "      \"type\": \"BP4\","
-//                             "      \"parameters\": {"
-//                             "        \"BufferGrowthFactor\": \"2.0\""
-//                             "      }"
-//                             "    },"
-//                             "    \"dataset\": {"
-//                             "      \"operators\": {"
-//                             "        \"type\": \"blosc\","
-//                             "        \"parameters\": {"
-//                             "          \"clevel\": \"9\","
-//                             "          \"doshuffle\": \"BLOSC_BITSHUFFLE\""
-//                             "        }"
-//                             "      }"
-//                             "    }"
-//                             "  }"
-//                             "}";
-const std::string options = "{}";
+// TODO: Set number of threads?
+const std::string options = R"EOS(
+  {
+    "adios2": {
+      "dataset": {
+        "operators": [
+          {
+            "type": "blosc",
+            "parameters": {
+              "clevel": "9",
+              "doshuffle": "BLOSC_SHUFFLE"
+            }
+          }
+        ]
+      }
+    }
+  }
+)EOS";
 
 constexpr bool input_ghosts = false;
 constexpr bool output_ghosts = false;
@@ -598,7 +606,6 @@ void carpetx_openpmd_t::InputOpenPMDGridStructure(cGH *cctkGH,
   auto &patchdata = ghext->patchdata.at(patch);
   patchdata.amrcore->SetFinestLevel(nlevels - 1);
 
-  // Read FabArrayBase (component positions and shapes)
   for (int level = 0; level < nlevels; ++level) {
     const std::vector<std::int64_t> chunk_infos =
         read_iter->getAttribute("chunkInfo" + level_suffixes.at(level))
@@ -763,7 +770,7 @@ void carpetx_openpmd_t::InputOpenPMD(const cGH *const cctkGH,
         }
 
       } // for record_component
-    }   // for mesh
+    } // for mesh
   }
 
   // First read grid functions in a loop over patches and levels
@@ -1009,7 +1016,7 @@ void carpetx_openpmd_t::InputOpenPMD(const cGH *const cctkGH,
               }
 
             } // for vi
-          }   // for local_component
+          } // for local_component
 
           // Mark read variables as valid
           for (int vi = 0; vi < numvars; ++vi)
@@ -1021,7 +1028,7 @@ void carpetx_openpmd_t::InputOpenPMD(const cGH *const cctkGH,
       } // for gi
 
     } // for leveldata
-  }   // for patchdata
+  } // for patchdata
 
   // Next read grid scalars and grid arrays
 
@@ -1619,12 +1626,12 @@ void carpetx_openpmd_t::OutputOpenPMD(const cGH *const cctkGH,
                                                     count);
               }
             } // for vi
-          }   // for local_component
+          } // for local_component
         }
       } // for gi
 
     } // for leveldata
-  }   // for patchdata
+  } // for patchdata
 
   // Next write grid scalars and grid arrays
 
diff --git a/CarpetX/src/make.code.defn b/CarpetX/src/make.code.defn
index 03d90e5af..f5e43189c 100644
--- a/CarpetX/src/make.code.defn
+++ b/CarpetX/src/make.code.defn
@@ -47,11 +47,12 @@ SRCS =							\
 	prolongate_3d_rf2_impl_ddf.cxx			\
 	prolongate_3d_rf2_impl_eno.cxx			\
 	prolongate_3d_rf2_impl_hermite.cxx		\
+	prolongate_3d_rf2_impl_minmod.cxx		\
 	prolongate_3d_rf2_impl_natural.cxx		\
 	prolongate_3d_rf2_impl_poly.cxx			\
 	prolongate_3d_rf2_impl_poly_cons3lfb.cxx	\
+	prolongate_3d_rf2_impl_poly_eno3lfb.cxx		\
 	reduction.cxx					\
-	regrid_error.cxx				\
 	schedule.cxx					\
 	task_manager.cxx				\
 	timer.cxx					\
diff --git a/CarpetX/src/prolongate_3d_rf2.cxx b/CarpetX/src/prolongate_3d_rf2.cxx
index 68cd24b83..543cae67a 100644
--- a/CarpetX/src/prolongate_3d_rf2.cxx
+++ b/CarpetX/src/prolongate_3d_rf2.cxx
@@ -25,6 +25,8 @@ std::ostream &operator<<(std::ostream &os, const interpolation_t intp) {
     return os << "cons";
   case interpolation_t::eno:
     return os << "eno";
+  case interpolation_t::minmod:
+    return os << "minmod";
   }
   assert(false);
 }
diff --git a/CarpetX/src/prolongate_3d_rf2.hxx b/CarpetX/src/prolongate_3d_rf2.hxx
index c612b268f..0eae1da04 100644
--- a/CarpetX/src/prolongate_3d_rf2.hxx
+++ b/CarpetX/src/prolongate_3d_rf2.hxx
@@ -15,12 +15,13 @@ std::ostream &operator<<(std::ostream &os, centering_t cent);
 constexpr auto VC = centering_t::vertex;
 constexpr auto CC = centering_t::cell;
 
-enum class interpolation_t { poly, hermite, cons, eno };
+enum class interpolation_t { poly, hermite, cons, eno, minmod };
 std::ostream &operator<<(std::ostream &os, interpolation_t cent);
 constexpr auto POLY = interpolation_t::poly;
 constexpr auto HERMITE = interpolation_t::hermite;
 constexpr auto CONS = interpolation_t::cons;
 constexpr auto ENO = interpolation_t::eno;
+constexpr auto MINMOD = interpolation_t::minmod;
 
 enum class fallback_t { none, linear };
 std::ostream &operator<<(std::ostream &os, fallback_t fb);
@@ -39,17 +40,22 @@ class prolongate_3d_rf2 final : public amrex::Interpolater {
 
   // Conservative must be one of the possible choices
   static_assert(INTPI == POLY || INTPI == HERMITE || INTPI == CONS ||
-                INTPI == ENO);
+                INTPI == ENO || INTPI == MINMOD);
   static_assert(INTPJ == POLY || INTPJ == HERMITE || INTPJ == CONS ||
-                INTPJ == ENO);
+                INTPJ == ENO || INTPJ == MINMOD);
   static_assert(INTPK == POLY || INTPK == HERMITE || INTPK == CONS ||
-                INTPK == ENO);
+                INTPK == ENO || INTPK == MINMOD);
 
   // Order must be nonnegative
   static_assert(ORDERI >= 0);
   static_assert(ORDERJ >= 0);
   static_assert(ORDERK >= 0);
 
+  // Minmod is always linear
+  static_assert(INTPI == MINMOD ? ORDERI == 1 : true);
+  static_assert(INTPJ == MINMOD ? ORDERJ == 1 : true);
+  static_assert(INTPK == MINMOD ? ORDERK == 1 : true);
+
   // Fallback must be one of the possible choices
   static_assert(FB == FB_NONE || FB == FB_LINEAR);
 
@@ -367,23 +373,6 @@ extern prolongate_3d_rf2<CC, CC, CC, CONS, CONS, CONS, 7, 7, 7, FB_NONE>
 
 // ENO (tensor product) interpolation
 
-extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c000_o1;
-extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 1, 1, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c001_o1;
-extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 1, 0, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c010_o1;
-extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 1, 0, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c011_o1;
-extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 0, 1, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c100_o1;
-extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 0, 1, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c101_o1;
-extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 0, 0, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c110_o1;
-extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 0, 0, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c111_o1;
-
 extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_NONE>
     prolongate_eno_3d_rf2_c000_o3;
 extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 2, FB_NONE>
@@ -403,21 +392,74 @@ extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_NONE>
 
 extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_NONE>
     prolongate_eno_3d_rf2_c000_o5;
-extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 4, FB_NONE>
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 2, FB_NONE>
     prolongate_eno_3d_rf2_c001_o5;
-extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 4, 5, FB_NONE>
+extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 2, 5, FB_NONE>
     prolongate_eno_3d_rf2_c010_o5;
-extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 4, 4, FB_NONE>
+extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 2, 2, FB_NONE>
     prolongate_eno_3d_rf2_c011_o5;
-extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 4, 5, 5, FB_NONE>
+extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 5, 5, FB_NONE>
     prolongate_eno_3d_rf2_c100_o5;
-extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 4, 5, 4, FB_NONE>
+extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 5, 2, FB_NONE>
     prolongate_eno_3d_rf2_c101_o5;
-extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 4, 4, 5, FB_NONE>
+extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 5, FB_NONE>
     prolongate_eno_3d_rf2_c110_o5;
-extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 4, 4, 4, FB_NONE>
+extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_NONE>
     prolongate_eno_3d_rf2_c111_o5;
 
+// Minmod (tensor product) interpolation
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o1;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o1;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o1;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o1;
+extern prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o1;
+extern prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o1;
+extern prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o1;
+extern prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o1;
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o3;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 3, 3, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o3;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 3, 1, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o3;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 3, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o3;
+extern prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 3, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o3;
+extern prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 3, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o3;
+extern prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o3;
+extern prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o3;
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o5;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 5, 5, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o5;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 5, 1, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o5;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 5, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o5;
+extern prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 5, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o5;
+extern prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 5, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o5;
+extern prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o5;
+extern prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o5;
+
 // Hermite interpolation
 
 extern prolongate_3d_rf2<VC, VC, VC, HERMITE, HERMITE, HERMITE, 1, 1, 1,
@@ -548,6 +590,131 @@ extern prolongate_3d_rf2<CC, CC, CC, CONS, CONS, CONS, 3, 3, 3, FB_LINEAR>
     prolongate_poly_cons3lfb_3d_rf2_c111_o7;
 #endif
 
+// Interpolate polynomially in vertex centred directions and use ENO
+// interpolation with 3rd order accuracy and a linear fallback in cell
+// centred directions
+
+// extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o1;
+// extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o1;
+// extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o1;
+// extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o1;
+// extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o1;
+// extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o1;
+// extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o1;
+// extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o1;
+//
+// extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o3;
+// extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o3;
+// extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o3;
+// extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o3;
+// extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o3;
+// extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o3;
+// extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o3;
+// extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o3;
+//
+// extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o5;
+// extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o5;
+// extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 3, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o5;
+// extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o5;
+// extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 5, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o5;
+// extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 5, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o5;
+// extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o5;
+// extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o5;
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o1;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, CONS, 1, 1, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o1;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, CONS, POLY, 1, 0, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o1;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, CONS, CONS, 1, 0, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o1;
+extern prolongate_3d_rf2<CC, VC, VC, CONS, POLY, POLY, 0, 1, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o1;
+extern prolongate_3d_rf2<CC, VC, CC, CONS, POLY, CONS, 0, 1, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o1;
+extern prolongate_3d_rf2<CC, CC, VC, CONS, CONS, POLY, 0, 0, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o1;
+extern prolongate_3d_rf2<CC, CC, CC, CONS, CONS, CONS, 0, 0, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o1;
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o3;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o3;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 3, 2, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o3;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 3, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o3;
+extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o3;
+extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 3, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o3;
+extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o3;
+extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o3;
+
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o5;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o5;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 2, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o5;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o5;
+extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 5, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o5;
+extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 5, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o5;
+extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o5;
+extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o5;
+
+#if 0
+extern prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 7, 7, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o7;
+extern prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 7, 7, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o7;
+extern prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 7, 3, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o7;
+extern prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 7, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o7;
+extern prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 7, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o7;
+extern prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 7, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o7;
+extern prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o7;
+extern prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+    prolongate_poly_enoy3lfb_3d_rf2_c111_o7;
+#endif
+
 } // namespace CarpetX
 
 #endif // #ifndef CARPETX_CARPETX_PROLONGATE_3D_RF2_HXX
diff --git a/CarpetX/src/prolongate_3d_rf2_impl.hxx b/CarpetX/src/prolongate_3d_rf2_impl.hxx
index 2edd4fd2c..4ffa1633d 100644
--- a/CarpetX/src/prolongate_3d_rf2_impl.hxx
+++ b/CarpetX/src/prolongate_3d_rf2_impl.hxx
@@ -82,6 +82,21 @@ template <typename T> struct coeffs1d<VC, POLY, /*order*/ 7, T> {
       +1225 / T(2048), -245 / T(2048), +49 / T(2048),  -5 / T(2048),
   };
 };
+template <typename T> struct coeffs1d<VC, POLY, /*order*/ 9, T> {
+  static constexpr std::array<T, 10> coeffs = {
+      35 / T(65536),    -405 / T(65536),  567 / T(16384),   -2205 / T(16384),
+      19845 / T(32768), 19845 / T(32768), -2205 / T(16384), 567 / T(16384),
+      -405 / T(65536),  35 / T(65536),
+  };
+};
+template <typename T> struct coeffs1d<VC, POLY, /*order*/ 11, T> {
+  static constexpr std::array<T, 12> coeffs = {
+      -63 / T(524288),    847 / T(524288),    -5445 / T(524288),
+      22869 / T(524288),  -38115 / T(262144), 160083 / T(262144),
+      160083 / T(262144), -38115 / T(262144), 22869 / T(524288),
+      -5445 / T(524288),  847 / T(524288),    -63 / T(524288),
+  };
+};
 
 template <typename T> struct coeffs1d<CC, POLY, /*order*/ 0, T> {
   static constexpr std::array<T, 1> coeffs = {
@@ -133,6 +148,42 @@ template <typename T> struct coeffs1d<CC, POLY, /*order*/ 7, T> {
       +5005 / T(262144),  -495 / T(262144),
   };
 };
+template <typename T> struct coeffs1d<CC, POLY, /*order*/ 8, T> {
+  static constexpr std::array<T, 9> coeffs = {
+      6435 / T(8388608),    -8151 / T(1048576),   77805 / T(2097152),
+      -122265 / T(1048576), 1426425 / T(4194304), 855855 / T(1048576),
+      -171171 / T(2097152), 13585 / T(1048576),   -9405 / T(8388608),
+  };
+};
+template <typename T> struct coeffs1d<CC, POLY, /*order*/ 9, T> {
+  static constexpr std::array<T, 10> coeffs = {
+      12155 / T(33554432),  -138567 / T(33554432), 188955 / T(8388608),
+      -692835 / T(8388608), 4849845 / T(16777216), 14549535 / T(16777216),
+      -969969 / T(8388608), 230945 / T(8388608),   -159885 / T(33554432),
+      13585 / T(33554432),
+  };
+};
+template <typename T> struct coeffs1d<CC, POLY, /*order*/ 10, T> {
+  static constexpr std::array<T, 11> coeffs = {
+      -46189 / T(268435456),    279565 / T(134217728),
+      -3187041 / T(268435456),  1448655 / T(33554432),
+      -15935205 / T(134217728), 22309287 / T(67108864),
+      111546435 / T(134217728), -3187041 / T(33554432),
+      5311735 / T(268435456),   -408595 / T(134217728),
+      62491 / T(268435456),
+  };
+};
+template <typename T> struct coeffs1d<CC, POLY, /*order*/ 11, T> {
+  static constexpr std::array<T, 12> coeffs = {
+      -88179 / T(1073741824),   1174173 / T(1073741824),
+      -7436429 / T(1073741824), 30421755 / T(1073741824),
+      -47805615 / T(536870912), 156165009 / T(536870912),
+      468495027 / T(536870912), -66927861 / T(536870912),
+      37182145 / T(1073741824), -8580495 / T(1073741824),
+      1312311 / T(1073741824),  -96577 / T(1073741824),
+
+  };
+};
 
 // Hermite interpolation (with matched first derivatives)
 
@@ -182,28 +233,6 @@ template <typename T> struct coeffs1d<VC, CONS, /*order*/ 1, T> {
       +1 / T(2),
   };
 };
-// template <typename T> struct coeffs1d<VC, CONS, /*order*/ 2, T> {
-//   static constexpr std::array<T, 3> coeffs0 = {
-//       -1 / T(32),
-//       +17 / T(16),
-//       -1 / T(32),
-//   };
-//   static constexpr std::array<T, 3> coeffs1 = {
-//       +13 / T(16),
-//       -5 / T(32),
-//       +11 / T(32),
-//   };
-// };
-// template <typename T> struct coeffs1d<VC, CONS, /*order*/ 4, T> {
-//   static constexpr std::array<T, 5> coeffs0 = {
-//       +7 / T(2048), -23 / T(512), +1109 / T(1024), -23 / T(512), +7 /
-//       T(2048),
-//   };
-//   static constexpr std::array<T, 5> coeffs1 = {
-//       +63 / T(2048), -103 / T(512), +781 / T(1024),
-//       +233 / T(512), -97 / T(2048),
-//   };
-// };
 
 template <typename T> struct coeffs1d<CC, CONS, /*order*/ 0, T> {
   static constexpr std::array<T, 1> coeffs = {
@@ -261,10 +290,32 @@ template <typename T> struct coeffs1d<CC, CONS, /*order*/ 8, T> {
       +949 / T(16384),  -185 / T(16384), +35 / T(32768),
   };
 };
+template <typename T> struct coeffs1d<CC, CONS, /*order*/ 9, T> {
+  static constexpr std::array<T, 10> coeffs = {
+      +63 / T(131072),   -707 / T(131072),  +937 / T(32768),  -3221 / T(32768),
+      +17813 / T(65536), +61567 / T(65536), -5599 / T(32768), +1331 / T(32768),
+      -913 / T(131072),  +77 / T(131072),
+  };
+};
+template <typename T> struct coeffs1d<CC, CONS, /*order*/ 10, T> {
+  static constexpr std::array<T, 11> coeffs = {
+      +63 / T(262144),    -49 / T(16384), +4661 / T(262144),  -569 / T(8192),
+      +29011 / T(131072), +1 / T(1),      -29011 / T(131072), +569 / T(8192),
+      -4661 / T(262144),  +49 / T(16384), -63 / T(262144),
+  };
+};
+template <typename T> struct coeffs1d<CC, CONS, /*order*/ 11, T> {
+  static constexpr std::array<T, 12> coeffs = {
+      +231 / T(2097152),    +3045 / T(2097152),   -18977 / T(2097152),
+      +75403 / T(2097152),  -110947 / T(1048576), +285449 / T(1048576),
+      +995215 / T(1048576), -193973 / T(1048576), +107549 / T(2097152),
+      -24583 / T(2097152),  +3731 / T(2097152),   -273 / T(2097152),
+  };
+};
 
 template <typename T> struct coeffs1d<CC, ENO, /*order*/ 0, T> {
   static constexpr std::array<std::array<T, 1>, 1> coeffs = {{
-      // centred
+      // stencil range [0, 0]
       {
           +1 / T(1),
       },
@@ -272,19 +323,19 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 0, T> {
 };
 template <typename T> struct coeffs1d<CC, ENO, /*order*/ 2, T> {
   static constexpr std::array<std::array<T, 3>, 3> coeffs = {{
-      // left
+      // stencil range [-2, 0]
       {
           -1 / T(8),
           +1 / T(2),
           +5 / T(8),
       },
-      // centred
+      // stencil range [-1, +1]
       {
           +1 / T(8),
           +1 / T(1),
           -1 / T(8),
       },
-      // right
+      // stencil range [0, +2]
       {
           +11 / T(8),
           -1 / T(2),
@@ -294,7 +345,6 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 2, T> {
 };
 template <typename T> struct coeffs1d<CC, ENO, /*order*/ 4, T> {
   static constexpr std::array<std::array<T, 5>, 5> coeffs = {{
-      // left 2 cells
       {
           -7 / T(128),
           +19 / T(64),
@@ -302,7 +352,6 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 4, T> {
           +61 / T(64),
           +63 / T(128),
       },
-      // left 1 cell
       {
           +3 / T(128),
           -9 / T(64),
@@ -310,7 +359,6 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 4, T> {
           +49 / T(64),
           -7 / T(128),
       },
-      // centred
       {
           -3 / T(128),
           +11 / T(64),
@@ -318,7 +366,6 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 4, T> {
           -11 / T(64),
           +3 / T(128),
       },
-      // right 1 cell
       {
           +7 / T(128),
           +79 / T(64),
@@ -326,7 +373,6 @@ template <typename T> struct coeffs1d<CC, ENO, /*order*/ 4, T> {
           +9 / T(64),
           -3 / T(128),
       },
-      // right 2 cells
       {
           +193 / T(128),
           -61 / T(64),
@@ -570,10 +616,10 @@ template <int ORDER> struct interp1d<VC, CONS, ORDER> {
       constexpr int i0 = (ORDER + 1) / 2 - 1;
       constexpr std::array<T, (ORDER + 1) / 2 * 2> cs =
           coeffs1d<VC, CONS, ORDER, T>::coeffs1;
-      // The ROCM 6.2 compiler can't handle `cs[i]`, so we avoid it via pointers:
-      // for (int i = 0; i < (ORDER + 1) / 2 * 2; ++i)
+      // The ROCM 6.2 compiler can't handle `cs[i]`, so we avoid it via
+      // pointers: for (int i = 0; i < (ORDER + 1) / 2 * 2; ++i)
       //   y += cs[i] * crse(i - i0);
-      const T* restrict const csptr = cs.data();
+      const T *restrict const csptr = cs.data();
       for (int i = 0; i < (ORDER + 1) / 2 * 2; ++i)
         y += csptr[i] * crse(i - i0);
     }
@@ -700,8 +746,8 @@ struct undivided_difference_1d {
 };
 
 template <int ORDER> struct undivided_difference_1d<CC, ENO, ORDER> {
+  static_assert(ORDER > 0);
   static_assert(ORDER % 2 == 0);
-  // The stencil size is ORDER / 2, and the stencil shift can be ORDER / 2
   // static constexpr int required_ghosts = ORDER;
   template <typename F, typename T = std::invoke_result_t<F, int> >
   CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
@@ -710,29 +756,14 @@ template <int ORDER> struct undivided_difference_1d<CC, ENO, ORDER> {
     constexpr std::array<int, N> ws = undivided_difference_weights<N>::weights;
     constexpr std::ptrdiff_t i0 = ORDER / 2;
 
-    T dd;
-    if constexpr (ORDER % 2 == 0) {
-      // Make use of symmetry in coefficients
-      dd = ws[ORDER / 2] * crse(0);
-      for (int i = 0; i < ORDER / 2; ++i) {
-        const int i1 = ORDER - i;
-#ifdef CCTK_DEBUG
-        assert(ws[i1] == ws[i]);
-#endif
-        dd += ws[i] * (crse(i - i0) + crse(i1 - i0));
-      }
-    } else {
-      // Make use of antisymmetry in coefficients
-      // TODO: implement this
-      assert(false);
-      dd = 0;
-      for (int i = 0; i < ORDER / 2; ++i) {
-        const int i1 = ORDER - i;
+    // Make use of symmetry in coefficients
+    T dd = ws[ORDER / 2] * crse(0);
+    for (int i = 0; i < ORDER / 2; ++i) {
+      const int i1 = ORDER - i;
 #ifdef CCTK_DEBUG
-        assert(ws[i1] == -ws[i]);
+      assert(ws[i1] == ws[i]);
 #endif
-        dd += ws[i] * (crse(i - i0) - crse(i1 - i0));
-      }
+      dd += ws[i] * (crse(i - i0) + crse(i1 - i0));
     }
     return dd;
   }
@@ -741,35 +772,52 @@ template <int ORDER> struct undivided_difference_1d<CC, ENO, ORDER> {
 // off=0: left sub-cell
 // off=1: right sub-cell
 template <int ORDER> struct interp1d<CC, ENO, ORDER> {
-  static_assert(ORDER % 2 == 0);
+  static_assert(ORDER > 0);
+  // p   required_ghosts
+  // 0   0
+  // 1   1
+  // 2   2
   static constexpr int required_ghosts = ORDER;
   CCTK_DEVICE
   CCTK_HOST constexpr
       __attribute__((__always_inline__, __flatten__)) std::array<int, 2>
       stencil_radius(const int shift, const int off) const {
 #ifdef CCTK_DEBUG
-    assert(-ORDER / 2 <= shift && shift <= +ORDER / 2);
     assert(off == 0 || off == 1);
+    // shift range:
+    //    p   off = 0   off = 1
+    //    0    0:0       0:0
+    //    2   -1:+1     -1:+1
+    //    4   -2:+2     -2:+2
+    assert(-(ORDER / 2) <= shift && shift <= +(ORDER / 2));
 #endif
     constexpr int N = ORDER + 1;
     const int i0 = N / 2 - shift;
+#ifdef CCTK_DEBUG
+    assert((ORDER - i0) - (0 - i0) == ORDER);
+#endif
     return {0 - i0, ORDER - i0};
   }
   template <typename F, typename T = std::invoke_result_t<F, int> >
   CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
   operator()(const F &crse, const int shift, const int off) const {
 #ifdef CCTK_DEBUG
-    assert(-ORDER / 2 <= shift && shift <= +ORDER / 2);
     assert(off == 0 || off == 1);
+    // See above in `stencil_radius`
+    assert(-(ORDER / 2) <= shift && shift <= +(ORDER / 2));
 #endif
     // For off=1, use the reversed stencil for the opposite shift
     // const std::array<T, ORDER + 1> cs =
-    //     coeffs1d<CC, ENO, ORDER, T>::coeffs[ORDER / 2 +
-    //                                         (off == 0 ? +1 : -1) * shift];
+    //     coeffs1d<CC, ENO, ORDER, T>::
+    //     coeffs[ORDER / 2 + (off == 0 ? +1 : -1) * shift];
     constexpr int N = ORDER + 1;
     const std::array<std::array<T, N>, N> css =
         coeffs1d<CC, ENO, ORDER, T>::coeffs;
-    const std::array<T, N> &cs = css[ORDER / 2 + (off == 0 ? +1 : -1) * shift];
+    const int m = off == 0 ? shift - (-(ORDER / 2)) : (+(ORDER / 2)) - shift;
+#ifdef CCTK_DEBUG
+    assert(m >= 0 && m < N);
+#endif
+    const std::array<T, N> &cs = css[m];
     const int i0 = N / 2 - shift;
 
 #ifdef CCTK_DEBUG
@@ -790,6 +838,42 @@ template <int ORDER> struct interp1d<CC, ENO, ORDER> {
   }
 };
 
+// off=0: left sub-cell
+// off=1: right sub-cell
+template <> struct interp1d<CC, MINMOD, 1> {
+  static constexpr int required_ghosts = 1;
+  CCTK_DEVICE
+  CCTK_HOST constexpr
+      __attribute__((__always_inline__, __flatten__)) std::array<int, 2>
+      stencil_radius(const int shift, const int off) const {
+#ifdef CCTK_DEBUG
+    assert(off == 0 || off == 1);
+#endif
+    return {-1, +1};
+  }
+  template <typename F, typename T = std::invoke_result_t<F, int> >
+  CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
+  operator()(const F &crse, const int shift, const int off) const {
+#ifdef CCTK_DEBUG
+    assert(off == 0 || off == 1);
+#endif
+    // Inspired by Athena-K's prolongation operator; see
+    // <https://github.com/IAS-Astrophysics/athenak/blob/main/src/mesh/prolongation.hpp>
+    using std::copysign, std::fabs, std::fmin;
+    const T cval = crse(0);
+    const T cval_minus = crse(-1);
+    const T cval_plus = crse(+1);
+    const T delta_minus = cval - cval_minus;
+    const T delta_plus = cval_plus - cval;
+    // minmod / 4
+    const T delta =
+        (copysign(T(0.125), delta_minus) + copysign(T(0.125), delta_plus)) *
+        fmin(fabs(delta_minus), fabs(delta_plus));
+    const T sign = off == 0 ? -1 : +1;
+    return cval + sign * delta;
+  }
+};
+
 // Test 1d interpolators
 
 template <centering_t CENT, interpolation_t INTP, int ORDER, typename T>
@@ -807,7 +891,9 @@ struct test_interp1d<CENT, POLY, ORDER, T> {
     T *restrict const ys = &ysarr[i0];
 
     for (int order = 0; order <= ORDER; ++order) {
-      auto f = [&](T x) __attribute__((__always_inline__, __flatten__)) { return pown(x, order); };
+      auto f = [&](T x) __attribute__((__always_inline__, __flatten__)) {
+        return pown(x, order);
+      };
       for (int off = 0; off < 2; ++off) {
         const T rmin = stencil1d.stencil_radius(0, off)[0];
         const T rmax = stencil1d.stencil_radius(0, off)[1];
@@ -851,7 +937,9 @@ template <int ORDER, typename T> struct test_interp1d<VC, HERMITE, ORDER, T> {
     std::array<T, n + 2> ys;
 
     for (int order = 0; order <= ORDER; ++order) {
-      auto f = [&](T x) __attribute__((__always_inline__, __flatten__)) { return pown(x, order); };
+      auto f = [&](T x) __attribute__((__always_inline__, __flatten__)) {
+        return pown(x, order);
+      };
       for (int off = 0; off < 2; ++off) {
         const auto [rmin, rmax] = stencil1d.stencil_radius(0, off);
         assert(rmin >= -nghosts && rmax <= +nghosts);
@@ -867,7 +955,11 @@ template <int ORDER, typename T> struct test_interp1d<VC, HERMITE, ORDER, T> {
 
         T x = int(VC) / T(4) + off / T(2);
         T y = f(x);
-        T y1 = stencil1d([&](int i) __attribute__((__always_inline__, __flatten__)) { return ys[i0 + 1 + i]; }, 0, off);
+        T y1 = stencil1d(
+            [&](int i) __attribute__((__always_inline__, __flatten__)) {
+              return ys[i0 + 1 + i];
+            },
+            0, off);
         // We carefully choose the test problem so that round-off
         // cannot be a problem here
         assert(isfinite(y1));
@@ -890,9 +982,12 @@ template <int ORDER, typename T> struct test_interp1d<CC, CONS, ORDER, T> {
 
     for (int order = 0; order <= ORDER; ++order) {
       // Function f, a polynomial
-      // const auto f{[&](T x) __attribute__((__always_inline__, __flatten__)) { return (order + 1) * pown(x, order); }};
-      // Integral of f (antiderivative)
-      const auto fint{[&](T x) __attribute__((__always_inline__, __flatten__)) { return pown(x, order + 1); }};
+      // const auto f{[&](T x) __attribute__((__always_inline__, __flatten__)) {
+      // return (order + 1) * pown(x, order); }}; Integral of f (antiderivative)
+      const auto fint = [&](T x)
+          __attribute__((__always_inline__, __flatten__)) {
+        return pown(x, order + 1);
+      };
       std::array<T, 2> x1;
       std::array<T, 2> y1;
       for (int off = 0; off < 2; ++off) {
@@ -926,6 +1021,7 @@ template <int ORDER, typename T> struct test_interp1d<CC, CONS, ORDER, T> {
             0, off);
         assert(isfinite(y1[off]));
       } // for off
+      // Ensure conservation
       assert(y1[0] / 2 + y1[1] / 2 == ys[0]);
       const T dx = x1[1] - x1[0];
       const T xlo = x1[0] - dx / 2;
@@ -933,7 +1029,7 @@ template <int ORDER, typename T> struct test_interp1d<CC, CONS, ORDER, T> {
       const T yint = fint(xhi) - fint(xlo);
       assert(y1[0] * dx + y1[1] * dx == yint);
     }
-  }
+  } // namespace CarpetX
 };
 
 template <int ORDER, typename T> struct test_interp1d<VC, CONS, ORDER, T> {
@@ -959,15 +1055,20 @@ template <int ORDER, typename T> struct test_interp1d<CC, ENO, ORDER, T> {
     for (int shift = -ORDER / 2; shift <= +ORDER / 2; ++shift) {
       for (int order = 0; order <= ORDER; ++order) {
         // Function f, a polynomial
-        // const auto f{[&](T x) __attribute__((__always_inline__, __flatten__)) { return (order + 1) * pown(x, order); }};
-        // Integral of f (antiderivative)
-        const auto fint{[&](T x) __attribute__((__always_inline__, __flatten__)) { return pown(x, order + 1); }};
+        // const auto f{[&](T x) __attribute__((__always_inline__, __flatten__))
+        // { return (order + 1) * pown(x, order); }}; Integral of f
+        // (antiderivative)
+        const auto fint = [&](T x)
+            __attribute__((__always_inline__, __flatten__)) {
+          return pown(x, order + 1);
+        };
         std::array<T, 2> x1;
         std::array<T, 2> y1;
         for (int off = 0; off < 2; ++off) {
           const T rmin = stencil1d.stencil_radius(0, off)[0];
           const T rmax = stencil1d.stencil_radius(0, off)[1];
           assert(rmin >= -nghosts && rmax <= +nghosts);
+          assert(rmin == -(ORDER / 2) && rmax == +(ORDER / 2));
           for (int i = -1; i < n + 1; ++i) {
             if (i - i0 < rmin || i - i0 > rmax) {
               xs[i + 1] = 0 / T(0);
@@ -985,9 +1086,14 @@ template <int ORDER, typename T> struct test_interp1d<CC, ENO, ORDER, T> {
           }
 
           x1[off] = int(CC) / T(4) + off / T(2);
-          y1[off] = stencil1d([&](int i) __attribute__((__always_inline__, __flatten__)) { return ys[i0 + 1 + i]; }, 0, off);
+          y1[off] = stencil1d(
+              [&](int i) __attribute__((__always_inline__, __flatten__)) {
+                return ys[i0 + 1 + i];
+              },
+              0, off);
           assert(isfinite(y1[off]));
         } // for off
+        // Ensure conservation
         assert(y1[0] / 2 + y1[1] / 2 == ys[i0 + 1]);
         const T dx = x1[1] - x1[0];
         const T xlo = x1[0] - dx / 2;
@@ -996,6 +1102,66 @@ template <int ORDER, typename T> struct test_interp1d<CC, ENO, ORDER, T> {
         assert(y1[0] * dx + y1[1] * dx == yint);
       }
     }
+  } // namespace CarpetX
+};
+
+template <typename T> struct test_interp1d<CC, MINMOD, 1, T> {
+  test_interp1d() {
+    constexpr interp1d<CC, MINMOD, 1> stencil1d;
+    constexpr int nghosts = stencil1d.required_ghosts;
+    static_assert(nghosts == 1);
+    constexpr int n = 1 + 2 * nghosts;
+    constexpr int i0 = n / 2;
+    std::array<T, n + 2> xs, ys;
+
+    for (int order = 0; order <= 1; ++order) {
+      // Function f, a polynomial
+      // const auto f{[&](T x) __attribute__((__always_inline__, __flatten__))
+      // { return (order + 1) * pown(x, order); }}; Integral of f
+      // (antiderivative)
+      const auto fint = [&](T x)
+          __attribute__((__always_inline__, __flatten__)) {
+        return pown(x, order + 1);
+      };
+      std::array<T, 2> x1;
+      std::array<T, 2> y1;
+      for (int off = 0; off < 2; ++off) {
+        const T rmin = stencil1d.stencil_radius(0, off)[0];
+        const T rmax = stencil1d.stencil_radius(0, off)[1];
+        assert(rmin >= -nghosts && rmax <= +nghosts);
+        assert(rmin == -1 && rmax == +1);
+        for (int i = -1; i < n + 1; ++i) {
+          if (i - i0 < rmin || i - i0 > rmax) {
+            xs[i + 1] = 0 / T(0);
+            ys[i + 1] = 0 / T(0);
+          } else {
+            T x = (i - i0) + int(CC) / T(2);
+            // T y = f(x);
+            const T dx = 1;
+            const T xlo = x - dx / 2;
+            const T xhi = x + dx / 2;
+            const T y = fint(xhi) - fint(xlo); // average of f over cell
+            xs[i + 1] = x;
+            ys[i + 1] = y;
+          }
+        }
+
+        x1[off] = int(CC) / T(4) + off / T(2);
+        y1[off] = stencil1d(
+            [&](int i) __attribute__((__always_inline__, __flatten__)) {
+              return ys[i0 + 1 + i];
+            },
+            0, off);
+        assert(isfinite(y1[off]));
+      } // for off
+      // Ensure conservation
+      assert(y1[0] / 2 + y1[1] / 2 == ys[i0 + 1]);
+      const T dx = x1[1] - x1[0];
+      const T xlo = x1[0] - dx / 2;
+      const T xhi = x1[1] + dx / 2;
+      const T yint = fint(xhi) - fint(xlo);
+      assert(y1[0] * dx + y1[1] * dx == yint);
+    }
   }
 };
 
@@ -1010,8 +1176,10 @@ call_stencil_0d(const F &crse) {
 template <typename F, typename Si, typename T = std::invoke_result_t<F, int> >
 CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
 call_stencil_1d(const F &crse, const Si &si) {
-  return si(
-      [&](const int i) __attribute__((__always_inline__, __flatten__)) { return call_stencil_0d([&]() __attribute__((__always_inline__, __flatten__)) { return crse(i); }); });
+  return si([&](const int i) __attribute__((__always_inline__, __flatten__)) {
+    return call_stencil_0d([&]() __attribute__((
+        __always_inline__, __flatten__)) { return crse(i); });
+  });
 }
 
 template <typename F, typename Si, typename Sj,
@@ -1019,7 +1187,11 @@ template <typename F, typename Si, typename Sj,
 CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
 call_stencil_2d(const F &crse, const Si &si, const Sj &sj) {
   return sj([&](const int j) __attribute__((__always_inline__, __flatten__)) {
-    return call_stencil_1d([&](const int i) __attribute__((__always_inline__, __flatten__)) { return crse(i, j); }, si);
+    return call_stencil_1d(
+        [&](const int i) __attribute__((__always_inline__, __flatten__)) {
+          return crse(i, j);
+        },
+        si);
   });
 }
 
@@ -1029,7 +1201,9 @@ CCTK_DEVICE CCTK_HOST inline __attribute__((__always_inline__, __flatten__)) T
 call_stencil_3d(const F &crse, const Si &si, const Sj &sj, const Sk &sk) {
   return sk([&](const int k) __attribute__((__always_inline__, __flatten__)) {
     return call_stencil_2d(
-        [&](const int i, const int j) __attribute__((__always_inline__, __flatten__)) { return crse(i, j, k); }, si, sj);
+        [&](const int i, const int j) __attribute__((
+            __always_inline__, __flatten__)) { return crse(i, j, k); },
+        si, sj);
   });
 }
 
@@ -1367,18 +1541,27 @@ void prolongate_3d_rf2<
                 INTPJ == CONS || INTPJ == ENO ? 1 : ORDERJ;
             constexpr int LINORDERK =
                 INTPK == CONS || INTPK == ENO ? 1 : ORDERK;
+            constexpr interpolation_t LININTPI =
+                INTPI == CONS || INTPI == ENO ? CONS : INTPI;
+            constexpr interpolation_t LININTPJ =
+                INTPJ == CONS || INTPJ == ENO ? CONS : INTPJ;
+            constexpr interpolation_t LININTPK =
+                INTPK == CONS || INTPK == ENO ? CONS : INTPK;
             const CCTK_REAL val_lin = call_stencil_3d(
                 [&](const int di, const int dj, const int dk) {
                   return crse(icrse[0] + di, icrse[1] + dj, icrse[2] + dk);
                 },
                 [&](const auto &crse) {
-                  return interp1d<CENTI, INTPI, LINORDERI>()(crse, 0, off[0]);
+                  return interp1d<CENTI, LININTPI, LINORDERI>()(crse, 0,
+                                                                off[0]);
                 },
                 [&](const auto &crse) {
-                  return interp1d<CENTJ, INTPJ, LINORDERJ>()(crse, 0, off[1]);
+                  return interp1d<CENTJ, LININTPJ, LINORDERJ>()(crse, 0,
+                                                                off[1]);
                 },
                 [&](const auto &crse) {
-                  return interp1d<CENTK, INTPK, LINORDERK>()(crse, 0, off[2]);
+                  return interp1d<CENTK, LININTPK, LINORDERK>()(crse, 0,
+                                                                off[2]);
                 });
 
             // Check whether we need to fall back
@@ -1773,16 +1956,21 @@ void prolongate_3d_rf2<
         std::array<CCTK_REAL, maxncomps> vals;
         for (int comp = 0; comp < ncomps; ++comp)
           vals[comp] = call_stencil_3d(
-              [&](const int di, const int dj, const int dk) __attribute__((__always_inline__, __flatten__)) {
-                return crse(icrse[0] + di, icrse[1] + dj, icrse[2] + dk, comp);
-              },
-              [&](const auto &crse) __attribute__((__always_inline__, __flatten__)) {
+              [&](const int di, const int dj, const int dk)
+                  __attribute__((__always_inline__, __flatten__)) {
+                    return crse(icrse[0] + di, icrse[1] + dj, icrse[2] + dk,
+                                comp);
+                  },
+              [&](const auto &crse) __attribute__((__always_inline__,
+                                                   __flatten__)) {
                 return interp1d<CENTI, INTPI, ORDERI>()(crse, shift[0], off[0]);
               },
-              [&](const auto &crse) __attribute__((__always_inline__, __flatten__)) {
+              [&](const auto &crse) __attribute__((__always_inline__,
+                                                   __flatten__)) {
                 return interp1d<CENTJ, INTPJ, ORDERJ>()(crse, shift[1], off[1]);
               },
-              [&](const auto &crse) __attribute__((__always_inline__, __flatten__)) {
+              [&](const auto &crse) __attribute__((__always_inline__,
+                                                   __flatten__)) {
                 return interp1d<CENTK, INTPK, ORDERK>()(crse, shift[2], off[2]);
               });
 
diff --git a/CarpetX/src/prolongate_3d_rf2_impl_eno.cxx b/CarpetX/src/prolongate_3d_rf2_impl_eno.cxx
index 6bd45dea3..1e319bcff 100644
--- a/CarpetX/src/prolongate_3d_rf2_impl_eno.cxx
+++ b/CarpetX/src/prolongate_3d_rf2_impl_eno.cxx
@@ -4,23 +4,6 @@ namespace CarpetX {
 
 // ENO (tensor product) interpolation
 
-prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c000_o1;
-prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 1, 1, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c001_o1;
-prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 1, 0, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c010_o1;
-prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 1, 0, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c011_o1;
-prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 0, 1, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c100_o1;
-prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 0, 1, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c101_o1;
-prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 0, 0, 1, FB_NONE>
-    prolongate_eno_3d_rf2_c110_o1;
-prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 0, 0, 0, FB_NONE>
-    prolongate_eno_3d_rf2_c111_o1;
-
 prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_NONE>
     prolongate_eno_3d_rf2_c000_o3;
 prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 2, FB_NONE>
@@ -40,19 +23,19 @@ prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_NONE>
 
 prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_NONE>
     prolongate_eno_3d_rf2_c000_o5;
-prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 4, FB_NONE>
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 2, FB_NONE>
     prolongate_eno_3d_rf2_c001_o5;
-prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 4, 5, FB_NONE>
+prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 2, 5, FB_NONE>
     prolongate_eno_3d_rf2_c010_o5;
-prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 4, 4, FB_NONE>
+prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 2, 2, FB_NONE>
     prolongate_eno_3d_rf2_c011_o5;
-prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 4, 5, 5, FB_NONE>
+prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 5, 5, FB_NONE>
     prolongate_eno_3d_rf2_c100_o5;
-prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 4, 5, 4, FB_NONE>
+prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 5, 2, FB_NONE>
     prolongate_eno_3d_rf2_c101_o5;
-prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 4, 4, 5, FB_NONE>
+prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 5, FB_NONE>
     prolongate_eno_3d_rf2_c110_o5;
-prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 4, 4, 4, FB_NONE>
+prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_NONE>
     prolongate_eno_3d_rf2_c111_o5;
 
 } // namespace CarpetX
diff --git a/CarpetX/src/prolongate_3d_rf2_impl_minmod.cxx b/CarpetX/src/prolongate_3d_rf2_impl_minmod.cxx
new file mode 100644
index 000000000..eeac6311d
--- /dev/null
+++ b/CarpetX/src/prolongate_3d_rf2_impl_minmod.cxx
@@ -0,0 +1,58 @@
+#include "prolongate_3d_rf2_impl.hxx"
+
+namespace CarpetX {
+
+// Minmod (tensor product) interpolation
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o1;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o1;
+prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o1;
+prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o1;
+prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o1;
+prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o1;
+prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o1;
+prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o1;
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o3;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 3, 3, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o3;
+prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 3, 1, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o3;
+prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 3, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o3;
+prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 3, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o3;
+prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 3, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o3;
+prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 3, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o3;
+prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o3;
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c000_o5;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, MINMOD, 5, 5, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c001_o5;
+prolongate_3d_rf2<VC, CC, VC, POLY, MINMOD, POLY, 5, 1, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c010_o5;
+prolongate_3d_rf2<VC, CC, CC, POLY, MINMOD, MINMOD, 5, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c011_o5;
+prolongate_3d_rf2<CC, VC, VC, MINMOD, POLY, POLY, 1, 5, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c100_o5;
+prolongate_3d_rf2<CC, VC, CC, MINMOD, POLY, MINMOD, 1, 5, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c101_o5;
+prolongate_3d_rf2<CC, CC, VC, MINMOD, MINMOD, POLY, 1, 1, 5, FB_NONE>
+    prolongate_minmod_3d_rf2_c110_o5;
+prolongate_3d_rf2<CC, CC, CC, MINMOD, MINMOD, MINMOD, 1, 1, 1, FB_NONE>
+    prolongate_minmod_3d_rf2_c111_o5;
+
+} // namespace CarpetX
diff --git a/CarpetX/src/prolongate_3d_rf2_impl_poly_eno3lfb.cxx b/CarpetX/src/prolongate_3d_rf2_impl_poly_eno3lfb.cxx
new file mode 100644
index 000000000..aef14a4e0
--- /dev/null
+++ b/CarpetX/src/prolongate_3d_rf2_impl_poly_eno3lfb.cxx
@@ -0,0 +1,130 @@
+#include "prolongate_3d_rf2_impl.hxx"
+
+namespace CarpetX {
+
+// Interpolate polynomially in vertex centred directions and conserve
+// with 3rd order accuracy and a linear fallback in cell centred
+// directions
+
+// prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o1;
+// prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o1;
+// prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o1;
+// prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o1;
+// prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o1;
+// prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o1;
+// prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o1;
+// prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 1, 1, 1, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o1;
+//
+// prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o3;
+// prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o3;
+// prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o3;
+// prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o3;
+// prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o3;
+// prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o3;
+// prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o3;
+// prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o3;
+//
+// prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c000_o5;
+// prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c001_o5;
+// prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 3, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c010_o5;
+// prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c011_o5;
+// prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 5, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c100_o5;
+// prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 5, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c101_o5;
+// prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 5, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c110_o5;
+// prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+//     prolongate_poly_eno3lfb_3d_rf2_c111_o5;
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 1, 1, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o1;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, CONS, 1, 1, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o1;
+prolongate_3d_rf2<VC, CC, VC, POLY, CONS, POLY, 1, 0, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o1;
+prolongate_3d_rf2<VC, CC, CC, POLY, CONS, CONS, 1, 0, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o1;
+prolongate_3d_rf2<CC, VC, VC, CONS, POLY, POLY, 0, 1, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o1;
+prolongate_3d_rf2<CC, VC, CC, CONS, POLY, CONS, 0, 1, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o1;
+prolongate_3d_rf2<CC, CC, VC, CONS, CONS, POLY, 0, 0, 1, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o1;
+prolongate_3d_rf2<CC, CC, CC, CONS, CONS, CONS, 0, 0, 0, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o1;
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 3, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o3;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 3, 3, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o3;
+prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 3, 2, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o3;
+prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 3, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o3;
+prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o3;
+prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 3, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o3;
+prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o3;
+prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o3;
+
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 5, 5, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o5;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 5, 5, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o5;
+prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 5, 2, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o5;
+prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 5, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o5;
+prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 2, 5, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o5;
+prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 2, 5, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o5;
+prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 2, 2, 5, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o5;
+prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 2, 2, 2, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o5;
+
+#if 0
+prolongate_3d_rf2<VC, VC, VC, POLY, POLY, POLY, 7, 7, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c000_o7;
+prolongate_3d_rf2<VC, VC, CC, POLY, POLY, ENO, 7, 7, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c001_o7;
+prolongate_3d_rf2<VC, CC, VC, POLY, ENO, POLY, 7, 3, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c010_o7;
+prolongate_3d_rf2<VC, CC, CC, POLY, ENO, ENO, 7, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c011_o7;
+prolongate_3d_rf2<CC, VC, VC, ENO, POLY, POLY, 3, 7, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c100_o7;
+prolongate_3d_rf2<CC, VC, CC, ENO, POLY, ENO, 3, 7, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c101_o7;
+prolongate_3d_rf2<CC, CC, VC, ENO, ENO, POLY, 3, 3, 7, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c110_o7;
+prolongate_3d_rf2<CC, CC, CC, ENO, ENO, ENO, 3, 3, 3, FB_LINEAR>
+    prolongate_poly_eno3lfb_3d_rf2_c111_o7;
+#endif
+
+} // namespace CarpetX
diff --git a/CarpetX/src/schedule.cxx b/CarpetX/src/schedule.cxx
index 993345626..ef6a04a9c 100644
--- a/CarpetX/src/schedule.cxx
+++ b/CarpetX/src/schedule.cxx
@@ -1368,12 +1368,6 @@ int Initialise(tFleshConfig *config) {
 bool EvolutionIsDone(cGH *restrict const cctkGH) {
   DECLARE_CCTK_PARAMETERS;
 
-  if (terminate_next || CCTK_TerminationReached(cctkGH))
-    return true;
-
-  if (CCTK_Equals(terminate, "never"))
-    return false;
-
   const bool max_iteration_reached = cctkGH->cctk_iteration >= cctk_itlast;
 
   const bool max_simulation_time_reached =
@@ -1381,28 +1375,38 @@ bool EvolutionIsDone(cGH *restrict const cctkGH) {
           ? cctkGH->cctk_time >= cctk_final_time
           : cctkGH->cctk_time <= cctk_final_time;
 
-  int runtime = CCTK_RunTime();
-  MPI_Bcast(&runtime, 1, MPI_INT, 0, MPI_COMM_WORLD);
+  const int runtime = CCTK_RunTime();
   const bool max_runtime_reached = runtime >= 60 * max_runtime;
 
-  if (CCTK_Equals(terminate, "iteration"))
-    return max_iteration_reached;
-  if (CCTK_Equals(terminate, "time"))
-    return max_simulation_time_reached;
-  if (CCTK_Equals(terminate, "runtime"))
-    return max_runtime_reached;
-  if (CCTK_Equals(terminate, "any"))
-    return max_iteration_reached || max_simulation_time_reached ||
-           max_runtime_reached;
-  if (CCTK_Equals(terminate, "all"))
-    return max_iteration_reached && max_simulation_time_reached &&
-           max_runtime_reached;
-  if (CCTK_Equals(terminate, "either"))
-    return max_iteration_reached || max_simulation_time_reached;
-  if (CCTK_Equals(terminate, "both"))
-    return max_iteration_reached && max_simulation_time_reached;
-
-  assert(0);
+  bool we_are_done;
+  if (terminate_next || CCTK_TerminationReached(cctkGH))
+    we_are_done = true;
+  else if (CCTK_Equals(terminate, "never"))
+    we_are_done = false;
+  else if (CCTK_Equals(terminate, "iteration"))
+    we_are_done = max_iteration_reached;
+  else if (CCTK_Equals(terminate, "time"))
+    we_are_done = max_simulation_time_reached;
+  else if (CCTK_Equals(terminate, "runtime"))
+    we_are_done = max_runtime_reached;
+  else if (CCTK_Equals(terminate, "any"))
+    we_are_done = max_iteration_reached || max_simulation_time_reached ||
+                  max_runtime_reached;
+  else if (CCTK_Equals(terminate, "all"))
+    we_are_done = max_iteration_reached && max_simulation_time_reached &&
+                  max_runtime_reached;
+  else if (CCTK_Equals(terminate, "either"))
+    we_are_done = max_iteration_reached || max_simulation_time_reached;
+  else if (CCTK_Equals(terminate, "both"))
+    we_are_done = max_iteration_reached && max_simulation_time_reached;
+  else
+    CCTK_ERROR("internal error");
+
+  // Ensure all processes make the same decision
+  MPI_Allreduce(MPI_IN_PLACE, &we_are_done, 1, MPI_CXX_BOOL, MPI_LOR,
+                MPI_COMM_WORLD);
+
+  return we_are_done;
 }
 
 void InvalidateTimelevels(cGH *restrict const cctkGH) {
@@ -2309,7 +2313,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
     CCTK_VINFO("SyncGroups %s", buf.str().c_str());
   }
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   vector<int> groups;
@@ -2700,7 +2704,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
   static Timer timer("Restrict");
   Interval interval(timer);
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   for (const auto &patchdata : ghext->patchdata) {
diff --git a/CarpetX/src/timer.hxx b/CarpetX/src/timer.hxx
index 8450e3cb8..80a094d5e 100644
--- a/CarpetX/src/timer.hxx
+++ b/CarpetX/src/timer.hxx
@@ -4,7 +4,7 @@
 #include <cctk.h>
 
 #ifdef __CUDACC__
-#include <nvToolsExt.h>
+#include <nvtx3/nvToolsExt.h>
 #endif
 
 #include <string>
diff --git a/CarpetX/src/valid.cxx b/CarpetX/src/valid.cxx
index e84061d16..e173b521f 100644
--- a/CarpetX/src/valid.cxx
+++ b/CarpetX/src/valid.cxx
@@ -1,9 +1,10 @@
 #include "driver.hxx"
-#include "loop_device.hxx"
 #include "schedule.hxx"
 #include "timer.hxx"
 #include "valid.hxx"
 
+#include <loop_device.hxx>
+
 #include <cctk.h>
 #include <cctk_Parameters.h>
 
@@ -169,6 +170,9 @@ void poison_invalid_gf(const active_levels_t &active_levels, const int gi,
   static Timer timer("poison_invalid<GF>");
   Interval interval(timer);
 
+  CCTK_REAL poison;
+  std::memcpy(&poison, &ipoison, sizeof poison);
+
   active_levels.loop_parallel([&](const int patch, const int level,
                                   const int index, const int component,
                                   const cGH *restrict const cctkGH) {
@@ -180,9 +184,6 @@ void poison_invalid_gf(const active_levels_t &active_levels, const int gi,
     if (valid.valid_all())
       return;
 
-    CCTK_REAL poison;
-    std::memcpy(&poison, &ipoison, sizeof poison);
-
     const Loop::GridDescBaseDevice grid(cctkGH);
     const Loop::GF3D2layout layout(cctkGH, groupdata.indextype);
     const Loop::GF3D2<CCTK_REAL> gf(
@@ -212,6 +213,8 @@ void poison_invalid_gf(const active_levels_t &active_levels, const int gi,
                 CCTK_ATTRIBUTE_ALWAYS_INLINE { gf(p.I) = poison; });
     }
   });
+
+  // Synchronize because we access GPU memory on the CPU
   synchronize();
 }
 
@@ -256,13 +259,38 @@ void check_valid_gf(const active_levels_t &active_levels, const int gi,
   if (!poison_undefined_values)
     return;
 
-#warning "TODO"
-  const nan_handling_t nan_handling = nan_handling_t::forbid_nans;
-
   static Timer timer("check_valid<GF>");
   Interval interval(timer);
 
-  bool nan_found = false;
+#warning "TODO"
+  constexpr nan_handling_t nan_handling = nan_handling_t::forbid_nans;
+
+  const auto is_poison = [] CCTK_DEVICE CCTK_HOST(
+                             const CCTK_REAL val) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+#if defined CCTK_REAL_PRECISION_4
+    std::uint32_t ival;
+#elif defined CCTK_REAL_PRECISION_8
+    std::uint64_t ival;
+#endif
+    std::memcpy(&ival, &val, sizeof ival);
+    if (ival == ipoison)
+      return true;
+    using std::isnan;
+    if (nan_handling != nan_handling_t::allow_nans && isnan(val))
+      return true;
+    return false;
+  };
+
+  amrex::FArrayBox poison_found(
+      amrex::Box(amrex::IntVect(0, 0, 0), amrex::IntVect(0, 0, 0)), 1,
+      amrex::The_Async_Arena());
+#ifdef AMREX_USE_GPU
+  constexpr auto run_on = amrex::RunOn::Device;
+#else
+  constexpr auto run_on = amrex::RunOn::Host;
+#endif
+  poison_found.operator= <run_on>(0.0);
+  CCTK_REAL *restrict const poison_found_ptr = poison_found.dataPtr();
 
   active_levels.loop_parallel([&](const int patch, const int level,
                                   const int index, const int component,
@@ -275,49 +303,38 @@ void check_valid_gf(const active_levels_t &active_levels, const int gi,
     if (!valid.valid_any())
       return;
 
-    CCTK_REAL poison;
-    std::memcpy(&poison, &ipoison, sizeof poison);
-
     const Loop::GridDescBaseDevice grid(cctkGH);
     const Loop::GF3D2layout layout(cctkGH, groupdata.indextype);
     const Loop::GF3D2<const CCTK_REAL> gf(
         layout, static_cast<const CCTK_REAL *>(CCTK_VarDataPtrI(
                     cctkGH, tl, groupdata.firstvarindex + vi)));
 
-    const auto point_is_nan = [&](const Loop::PointDesc &p) {
-      using std::isnan;
-      return CCTK_BUILTIN_EXPECT(
-          nan_handling == nan_handling_t::allow_nans
-              ? std::memcmp(&gf(p.I), &poison, sizeof gf(p.I)) == 0
-              : isnan(gf(p.I)),
-          false);
-    };
-
-    const auto update_nan_found = [&](const Loop::PointDesc &p) {
-      if (!point_is_nan(p))
-        return;
+    const auto update_poison_found =
+        [=] CCTK_DEVICE(const Loop::PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+          if (CCTK_BUILTIN_EXPECT(!is_poison(gf(p.I)), true))
+            return;
 #pragma omp atomic write
-      nan_found = true;
-    };
+          *poison_found_ptr = 0.0 / 0.0;
+        };
 
     if (valid.valid_all()) {
-      grid.loop_idx(where_t::everywhere, groupdata.indextype,
-                    groupdata.nghostzones, update_nan_found);
+      grid.loop_device_idx<where_t::everywhere>(
+          groupdata.indextype, groupdata.nghostzones, update_poison_found);
     } else {
       if (valid.valid_int)
-        grid.loop_idx(where_t::interior, groupdata.indextype,
-                      groupdata.nghostzones, update_nan_found);
+        grid.loop_device_idx<where_t::interior>(
+            groupdata.indextype, groupdata.nghostzones, update_poison_found);
       if (valid.valid_outer)
-        grid.loop_idx(where_t::boundary, groupdata.indextype,
-                      groupdata.nghostzones, update_nan_found);
+        grid.loop_device_idx<where_t::boundary>(
+            groupdata.indextype, groupdata.nghostzones, update_poison_found);
       if (valid.valid_ghosts)
-        grid.loop_idx(where_t::ghosts, groupdata.indextype,
-                      groupdata.nghostzones, update_nan_found);
+        grid.loop_device_idx<where_t::ghosts>(
+            groupdata.indextype, groupdata.nghostzones, update_poison_found);
     }
   });
   synchronize();
 
-  if (!nan_found)
+  if (!poison_found.contains_nan<run_on>())
     return;
 
   std::size_t nan_count{0};
@@ -350,27 +367,15 @@ void check_valid_gf(const active_levels_t &active_levels, const int gi,
     if (!valid.valid_any())
       return;
 
-    CCTK_REAL poison;
-    std::memcpy(&poison, &ipoison, sizeof poison);
-
     const Loop::GridDescBaseDevice grid(cctkGH);
     const Loop::GF3D2layout layout(cctkGH, groupdata.indextype);
     const Loop::GF3D2<const CCTK_REAL> gf(
         layout, static_cast<const CCTK_REAL *>(CCTK_VarDataPtrI(
                     cctkGH, tl, groupdata.firstvarindex + vi)));
 
-    const auto point_is_nan = [&](const Loop::PointDesc &p) {
-      using std::isnan;
-      return CCTK_BUILTIN_EXPECT(
-          nan_handling == nan_handling_t::allow_nans
-              ? std::memcmp(&gf(p.I), &poison, sizeof gf(p.I)) == 0
-              : isnan(gf(p.I)),
-          false);
-    };
-
     const auto update_nan_count = [&](const Loop::PointDesc &p,
                                       const where_t where) {
-      if (!point_is_nan(p))
+      if (CCTK_BUILTIN_EXPECT(!is_poison(gf(p.I)), true))
         return;
 
       ++nan_count;
diff --git a/CarpetX/stencils/stencils.jl b/CarpetX/stencils/stencils.jl
new file mode 100644
index 000000000..22bc3b1df
--- /dev/null
+++ b/CarpetX/stencils/stencils.jl
@@ -0,0 +1,288 @@
+# Julia code to calculate prolongation stencil coefficients
+
+using LinearAlgebra
+
+# General assumptions:
+# - We label vertices. Cells (cell centred) are offset by 1/2 to the right.
+# - We assume the refinement factor is 2.
+# - Fine points have an offset of either 0 or 1 with respect to the coarse grid.
+# - We only calculate vertex centred stencils for `offset = 1`. The
+#   case `offset = 0` is trivial.
+# - We only calculate cell centred stencils for `offset = 1`. The case
+#   `offset = 0` follows by symmetry, and is handled when the stencil
+#   is evaluated.
+
+# Vertex-centred layout:
+#     coarse position:    -2      -1       0      +1      +2
+#                          X       X       X       X       X
+#                          x   x   x   x   x   x   x   x   x
+#     fine offset:                         0   1
+
+# Cell-centred layout:
+#     coarse position:        -2      -1       0      +1      +2
+#                              O       O       O       O       O
+#                                o   o   o   o   o   o   o   o
+#     fine offset:                           0   1
+
+# For polynomial interpolation we do the following:
+# - Set up a generic polynomial of the respective order `p`, i.e. with `p+1` coefficients
+# - Choose `p+1` coarse grid points, and then choose the polynomial
+#   coeefficiens so that it agrees with the coarse grid values at
+#   these coarse grid points
+# - Evaluate the polynomial at the desired point
+
+const BigRat = Rational{BigInt}
+
+function stencil_vc_poly(p::Integer, x)
+    # Obviously
+    @assert p >= 0
+
+    # For symmetry we require an odd `p`
+    @assert isodd(p)
+
+    imin = -div(p - 1, 2)
+    imax = +div(p + 1, 2)
+    @assert imax - imin == p
+
+    return stencil_vc_poly(imin, imax, x)
+end
+
+function stencil_vc_poly(imin::Integer, imax::Integer, x0::Real)
+    # Obviously
+    p = imax - imin
+    @assert p >= 0
+
+    x = BigRat(x0)
+
+    # Prevent extrapolation
+    imin <= x <= imax || @show imin x imax
+    @assert imin <= x <= imax
+
+    # Coarse grid points
+    # We choose integer points for convenience. We could scale by a
+    # grid spacing `h` but that would just cancel out.
+    xs = imin:imax
+    @assert length(xs) == p + 1
+
+    # We want interpolation to be exact for functions of orders from
+    # `0` to `p`.
+    # This is the order of the function that we represent via a `p`-th
+    # order polynomial, so its order can be anything from `0` to `p`.
+
+    # Our test functions (polynomials)
+    testfun(x, q::Integer) = x^q
+
+    # Determine polynomial coefficients `cs`
+    # - We are solving a linear system `A cs = b`
+    # - Each row of the system corresponds to one condition.
+    # - Each conditions states that, when we have a function of order
+    #   `q`, the interpolation must be exact.
+    A = fill(big(1 // 0), p + 1, p + 1)
+    b = fill(big(1 // 0), p + 1)
+    for q in 0:p
+        # Function values at the grid points
+        ys = testfun.(xs, q)
+        # Evaluate at `x`
+        y = testfun(x, q)
+        # Condition: With the inputs `ys`, the result must be `y`
+        for i in 0:p
+            A[q + 1, i + 1] = ys[i + 1]
+        end
+        b[q + 1] = y
+    end
+    # Ensure all elements have been set
+    @assert all(A .!= 1 // 0)
+    @assert all(b .!= 1 // 0)
+
+    cs = A \ b
+
+    # Test the conditions
+    for q in 0:p
+        # Function values at the grid points
+        ys = testfun.(xs, q)
+        # Evaluate at `x`
+        y = testfun(x, q)
+        # Check evaluated point
+        @assert y == sum(cs .* ys)
+    end
+
+    return cs::AbstractVector{BigRat}
+end
+
+function stencil_cc_poly(p::Integer, x::Real)
+    # Obviously
+    @assert p >= 0
+
+    # Choosing `imin` and `imax`:
+    if x < 0
+        # Lean left
+        #     p    xs
+        #     0    -1:-1
+        #     1    -1:+0
+        #     2    -2:+0
+        #     3    -2:+1
+        imin = -fld(p, 2) - 1
+        imax = +cld(p, 2) - 1
+    elseif x > 0
+        # Lean right
+        #     p    xs
+        #     0    -0:+0
+        #     1    -0:+1
+        #     2    -1:+1
+        #     3    -1:+2
+        imin = -fld(p, 2)
+        imax = +cld(p, 2)
+    else
+        @assert iseven(p)
+        imin = -div(p, 2)
+        imax = +div(p, 2)
+    end
+    @assert imax - imin == p
+
+    return stencil_cc_poly(imin, imax, x)
+end
+
+function stencil_cc_poly(imin::Integer, imax::Integer, x0::Real)
+    # Obviously
+    p = imax - imin
+    @assert p >= 0
+
+    x = BigRat(x0)
+
+    # Prevent extrapolation
+    @assert imin <= x <= imax + 1
+
+    # Coarse grid points
+    # We choose integer points for convenience. We could scale by a
+    # grid spacing `h` but that would just cancel out.
+    xs = imin:imax
+    @assert length(xs) == p + 1
+
+    # We want interpolation to be exact for functions of orders from
+    # `0` to `p`.
+    # This is the order of the function that we represent via a `p`-th
+    # order polynomial, so its order can be anything from `0` to `p`.
+
+    # Our test functions (polynomials)
+    testfun(x, q::Integer) = x^q
+
+    # Determine polynomial coefficients `cs`
+    # - We are solving a linear system `A cs = b`
+    # - Each row of the system corresponds to one condition.
+    # - Each conditions states that, when we have a function of order
+    #   `q`, the interpolation must be exact.
+    A = fill(big(1 // 0), p + 1, p + 1)
+    b = fill(big(1 // 0), p + 1)
+    for q in 0:p
+        # Function values at the grid points
+        ys = testfun.(xs, q)
+        # Evaluate at `x`
+        y = testfun(x, q)
+        # Condition: With the inputs `ys`, the result must be `y`
+        for i in 0:p
+            A[q + 1, i + 1] = ys[i + 1]
+        end
+        b[q + 1] = y
+    end
+    # Ensure all elements have been set
+    @assert all(A .!= 1 // 0)
+    @assert all(b .!= 1 // 0)
+
+    cs = A \ b
+
+    # Test the conditions
+    for q in 0:p
+        # Function values at the grid points
+        ys = testfun.(xs, q)
+        # Evaluate at `x`
+        y = testfun(x, q)
+        # Check evaluated point
+        @assert y == sum(cs .* ys)
+    end
+
+    return cs::AbstractVector{BigRat}
+end
+
+function stencil_cc_cons(p::Integer, x::Real)
+    # Obviously
+    @assert p >= 0
+
+    # Choosing `imin` and `imax`:
+    if x < 0
+        # Lean left
+        #     p    xs
+        #     0    -0:+0
+        #     1    -1:+0
+        #     2    -1:+1
+        #     3    -2:+2
+        imin = -cld(p, 2)
+        imax = +fld(p, 2)
+    elseif x > 0
+        # Lean right
+        #     p    xs
+        #     0    -0:+0
+        #     1    -0:+1
+        #     2    -1:+1
+        #     3    -1:+2
+        imin = -fld(p, 2)
+        imax = +cld(p, 2)
+    else
+        @assert iseven(p)
+        imin = -div(p, 2)
+        imax = +div(p, 2)
+    end
+
+    return stencil_cc_cons(imin, imax, x)
+end
+
+function stencil_cc_cons(imin::Integer, imax::Integer, x0::Real)
+    # Obviously
+    p = imax - imin
+    @assert p >= 0
+
+    x = BigRat(x0)
+
+    # Prevent extrapolation
+    @assert imin <= x <= imax + 1
+
+    # We implement conservative cell-centred interpolation by falling
+    # back to polynomial vertex-centred interpolation.
+    # - First calculate the antiderivative, switching to vertex
+    #   centring, and increasing the order by one, and the stencil
+    #   size by one to the right
+    # - The interpolate there polynomially
+    # - Then calculate the derivative, switching back to cell centring
+
+    # The antiderivative operator
+    antideriv = [col < row ? 1 : 0 for row in 0:(p + 1), col in 0:p]
+
+    # The derivative operator
+    deriv = [col == row ? -1 : col == row + 1 ? +1 : 0 for row in 0:p, col in 0:(p + 1)]
+
+    @assert deriv * antideriv == I
+
+    # This is the derivative operator, written out explicitly
+    x_left = x - 1 // 4
+    x_right = x + 1 // 4
+    cs_poly_left = stencil_vc_poly(imin, imax + 1, x_left)
+    cs_poly_right = stencil_vc_poly(imin, imax + 1, x_right)
+
+    # Multiply by the refinement factor `2`, i.e. divide by the ratio
+    # of the grid spacings
+    cs_poly_matrix = reshape((cs_poly_right - cs_poly_left) / (x_right - x_left), 1, :)
+    cs_matrix = cs_poly_matrix * antideriv
+    cs = reshape(cs_matrix, :)
+
+    return cs::AbstractVector{BigRat}
+end
+
+function main()
+    display([(p=p, cs=stencil_vc_poly(p, 1 // 2)) for p in 1:2:5])
+    display([(p=p, cs=stencil_cc_poly(p, -1 // 4)) for p in 0:5])
+    display([(p=p, cs=stencil_cc_poly(p, +1 // 4)) for p in 0:5])
+    display([(p=p, s=s, cs=stencil_cc_cons(-p + s - 1, -1 + s, -1 // 4)) for p in 0:5 for s in 0:p])
+    display([(p=p, s=s, cs=stencil_cc_cons(-p + s, 0 + s, +1 // 4)) for p in 0:5 for s in 0:p])
+    nothing
+end
+
+nothing
diff --git a/CarpetXRegrid/README b/CarpetXRegrid/README
new file mode 100644
index 000000000..db7e81a67
--- /dev/null
+++ b/CarpetXRegrid/README
@@ -0,0 +1,11 @@
+Cactus Code Thorn CarpetXRegrid
+Author(s)    : Steven R. Brandt <sbrandt@cct.lsu.edu>
+Maintainer(s): Steven R. Brandt <sbrandt@cct.lsu.edu>
+Licence      : LGPL
+--------------------------------------------------------------------------
+
+1. Purpose
+
+Provide an extra grid function, "regrid_error," to the CarpetX driver.
+This grid function is used by CarpetX and AMReX to determine where to
+refine the grid.
diff --git a/CarpetXRegrid/configuration.ccl b/CarpetXRegrid/configuration.ccl
new file mode 100644
index 000000000..f6e66747b
--- /dev/null
+++ b/CarpetXRegrid/configuration.ccl
@@ -0,0 +1,6 @@
+# Configuration definitions for thorn CarpetXRegrid
+REQUIRES AMReX Arith Loop 
+
+PROVIDES CarpetXRegrid
+{
+}
diff --git a/CarpetXRegrid/doc/documentation.tex b/CarpetXRegrid/doc/documentation.tex
new file mode 100644
index 000000000..f826a908b
--- /dev/null
+++ b/CarpetXRegrid/doc/documentation.tex
@@ -0,0 +1,210 @@
+% *======================================================================*
+%  Cactus Thorn template for ThornGuide documentation
+%  Author: Ian Kelley
+%  Date: Sun Jun 02, 2002
+%  $Header$
+%
+%  Thorn documentation in the latex file doc/documentation.tex
+%  will be included in ThornGuides built with the Cactus make system.
+%  The scripts employed by the make system automatically include
+%  pages about variables, parameters and scheduling parsed from the
+%  relevant thorn CCL files.
+%
+%  This template contains guidelines which help to assure that your
+%  documentation will be correctly added to ThornGuides. More
+%  information is available in the Cactus UsersGuide.
+%
+%  Guidelines:
+%   - Do not change anything before the line
+%       % START CACTUS THORNGUIDE",
+%     except for filling in the title, author, date, etc. fields.
+%        - Each of these fields should only be on ONE line.
+%        - Author names should be separated with a \\ or a comma.
+%   - You can define your own macros, but they must appear after
+%     the START CACTUS THORNGUIDE line, and must not redefine standard
+%     latex commands.
+%   - To avoid name clashes with other thorns, 'labels', 'citations',
+%     'references', and 'image' names should conform to the following
+%     convention:
+%       ARRANGEMENT_THORN_LABEL
+%     For example, an image wave.eps in the arrangement CactusWave and
+%     thorn WaveToyC should be renamed to CactusWave_WaveToyC_wave.eps
+%   - Graphics should only be included using the graphicx package.
+%     More specifically, with the "\includegraphics" command.  Do
+%     not specify any graphic file extensions in your .tex file. This
+%     will allow us to create a PDF version of the ThornGuide
+%     via pdflatex.
+%   - References should be included with the latex "\bibitem" command.
+%   - Use \begin{abstract}...\end{abstract} instead of \abstract{...}
+%   - Do not use \appendix, instead include any appendices you need as
+%     standard sections.
+%   - For the benefit of our Perl scripts, and for future extensions,
+%     please use simple latex.
+%
+% *======================================================================*
+%
+% Example of including a graphic image:
+%    \begin{figure}[ht]
+% 	\begin{center}
+%    	   \includegraphics[width=6cm]{MyArrangement_MyThorn_MyFigure}
+% 	\end{center}
+% 	\caption{Illustration of this and that}
+% 	\label{MyArrangement_MyThorn_MyLabel}
+%    \end{figure}
+%
+% Example of using a label:
+%   \label{MyArrangement_MyThorn_MyLabel}
+%
+% Example of a citation:
+%    \cite{MyArrangement_MyThorn_Author99}
+%
+% Example of including a reference
+%   \bibitem{MyArrangement_MyThorn_Author99}
+%   {J. Author, {\em The Title of the Book, Journal, or periodical}, 1 (1999),
+%   1--16. {\tt http://www.nowhere.com/}}
+%
+% *======================================================================*
+
+% If you are using CVS use this line to give version information
+% $Header$
+
+\documentclass{article}
+
+% Use the Cactus ThornGuide style file
+% (Automatically used from Cactus distribution, if you have a
+%  thorn without the Cactus Flesh download this from the Cactus
+%  homepage at www.cactuscode.org)
+\usepackage{../../../../doc/latex/cactus}
+
+\begin{document}
+
+% The author of the documentation
+\author{Steven R. Brandt \textless sbrandt@cct.lsu.edu\textgreater \\
+        Roland Haas \textless rhaas@illinois.edu\textgreater}
+
+% The title of the document (not necessarily the name of the Thorn)
+\title{CarpetXRegrid}
+
+% the date your document was last changed, if your document is in CVS,
+% please use:
+%    \date{$ $Date$ $}
+% when using git instead record the commit ID:
+%    \date{\gitrevision{<path-to-your-.git-directory>}}
+\date{July 30 2024}
+
+\maketitle
+
+% Do not delete next line
+% START CACTUS THORNGUIDE
+
+% Add all definitions used in this documentation here
+%   \def\mydef etc
+
+% Add an abstract for this thorn's documentation
+\begin{abstract}
+
+Provide a grid function, \code{regrid\_error}, to the \code{CarpetX} driver.
+This grid function is used by \code{CarpetX} and \code{AMReX} to determine
+where to refine the grid.
+
+\end{abstract}
+
+% The following sections are suggestive only.
+% Remove them or add your own.
+
+\section{Introduction}
+
+\code{AMReX}~\cite{CarpetX_CarpetXRegrid_AMReX_JOSS} and thus \code{CarpetX}
+implement Berger-Oliger~\cite{CarpetX_CarpetXRegrid_Berger:1984zza} type
+structured mesh refinement.  Grid \emph{cells} are tagged for refinement in
+\code{CarpetX} using the overloaded virtual function \code{AmrCore::ErrorEst}. 
+
+This thorn, in combination with \code{CarpetX}, provides a covenient way for
+\code{Cactus} thorns to label cells needed refinement via a cell centered
+grid function \code{regrid\_error} whose value controls if a cell is marked
+for refinement or not.
+
+A cell is marked for refinement if the value found in \code{regrid\_error}
+exceeds the threshold in parameter \code{CarpetX::regrid\_error\_threshold}
+and marked as not requiring refinement otherwise.
+
+A client thorn wishing to control refinement should schedule a function in
+schedule bins \code{POSTINITIAL} and \code{POSTSTEP}. See thorn
+\code{ErrorEstimator} for an example.
+
+\section{Numerical Implementation}
+
+This thorn only provides access to the tagging grid function
+\code{regrid\_error} and initializes it to zero at the beginning of the
+simulation.
+
+\section{Using This Thorn}
+
+To use this thorn, make sure to \texttt{inherit} from \code{CarpetXRegrid} to
+gain access to the public grid function \code{regrid\_error}. 
+A client thorn wishing to control refinement should then  schedule a function in
+schedule bins \code{POSTINITIAL} and \code{POSTSTEP} which should loop over
+the \texttt{interior} of cell centered grid function \code{regrid\_error}
+marking each cell for refinement or no refinement as needed. See thorn
+\code{ErrorEstimator} for an example.
+
+In the future, to allow multiple independent regridding criteria to contribute
+to mesh refinement, grid function \code{regrid\_error} may be interpreted as a
+boolean flag with true / false indicated by values of $1.0$ and $0.0$ (and all
+other values considered invalid). In the future this will require that a thorn
+should never reset non-zero value back to zero.
+
+\subsection{Obtaining This Thorn}
+
+This thorn is included in the \code{CarpetX} arrangement which is part of the
+Einstein Toolkit. 
+
+\subsection{Special Behaviour}
+
+This thorn will initialize the error estimator grid function
+\code{regrid\_error} to zero at the beginning of a simulation but does not
+change or use its values otherwise.
+
+In the future it may reset the error estimator grid function before client
+thorns mark cells for refinement.
+
+\subsection{Interaction With Other Thorns}
+
+This thorn only provides access to \code{regrid\_error}, while the actual
+regrid happens inside of \code{CarpetX} and \code{AMReX}. 
+
+\subsection{Examples}
+
+Please consult thorn \code{ErrorEstimator} for an example on how to use this
+thorn.
+
+\begin{verbatim}
+extern "C" void MyRegrid_EstError(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_MyRegrid_EstError;
+  DECLARE_CCTK_PARAMETERS;
+
+  grid.loop_all_device<1, 1, 1>(
+      grid.nghostzones,
+      [=] CCTK_DEVICE(const Loop::PointDesc &p)
+          CCTK_ATTRIBUTE_ALWAYS_INLINE {
+              regrid_error(p.I) = fabs(p.x) < 42. ? 1.0 : 0.0;
+      }
+  );
+}
+\end{verbatim}
+
+\subsection{Support and Feedback}
+
+For questions and bug reports please use the Einstein Toolkit users mailing
+list \url{users@einsteintoolkit.org} and bug tracker
+\url{https://trac.einsteintoolkit.org}.
+
+\begin{thebibliography}{9}
+\bibitem{CarpetX_CarpetXRegrid_AMReX_JOSS} Zhang, W., Almgren, A., Beckner, V., Bell, J., Blaschke, J., Chan, C., Day, M., Friesen, B., Gott, K., Graves, D., Katz, M., Myers, A., Nguyen, T., Nonaka, A., Rosso, M., Williams, S. \& Zingale, M. AMReX: a framework for block-structured adaptive mesh refinement. {\em Journal Of Open Source Software}. \textbf{4}, 1370 (2019,5), https://doi.org/10.21105/joss.01370
+\bibitem{CarpetX_CarpetXRegrid_Berger:1984zza} M.~J.~Berger and J.~Oliger, ``Adaptive Mesh Refinement for Hyperbolic Partial Differential Equations,'' J. Comput. Phys. \textbf{53} (1984), 484 doi:10.1016/0021-9991(84)90073-1
+\end{thebibliography}
+
+% Do not delete next line
+% END CACTUS THORNGUIDE
+
+\end{document}
diff --git a/CarpetXRegrid/interface.ccl b/CarpetXRegrid/interface.ccl
new file mode 100644
index 000000000..553c446bb
--- /dev/null
+++ b/CarpetXRegrid/interface.ccl
@@ -0,0 +1,9 @@
+# Interface definition for thorn CarpetXRegrid
+IMPLEMENTS: CarpetXRegrid
+
+PUBLIC:
+
+CCTK_REAL regrid_error TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
+{
+  regrid_error
+} "Regridding condition"
diff --git a/CarpetXRegrid/param.ccl b/CarpetXRegrid/param.ccl
new file mode 100644
index 000000000..fa1f9f566
--- /dev/null
+++ b/CarpetXRegrid/param.ccl
@@ -0,0 +1 @@
+# Parameter definitions for thorn CarpetXRegrid
diff --git a/CarpetXRegrid/schedule.ccl b/CarpetXRegrid/schedule.ccl
new file mode 100644
index 000000000..778ec454c
--- /dev/null
+++ b/CarpetXRegrid/schedule.ccl
@@ -0,0 +1,6 @@
+# Schedule definitions for thorn CarpetXRegrid
+SCHEDULE CarpetXRegrid_InitError AT basegrid
+{
+  LANG: C
+  WRITES: CarpetXRegrid::regrid_error(everywhere)
+} "Initialize regridding error to zero"
diff --git a/CarpetXRegrid/src/make.code.defn b/CarpetXRegrid/src/make.code.defn
new file mode 100644
index 000000000..583586e0c
--- /dev/null
+++ b/CarpetXRegrid/src/make.code.defn
@@ -0,0 +1,7 @@
+# Main make.code.defn file for thorn CarpetXRegrid
+
+# Source files in this directory
+SRCS = regrid_error.cxx
+
+# Subdirectories containing source files
+SUBDIRS = 
diff --git a/CarpetX/src/regrid_error.cxx b/CarpetXRegrid/src/regrid_error.cxx
similarity index 55%
rename from CarpetX/src/regrid_error.cxx
rename to CarpetXRegrid/src/regrid_error.cxx
index 39a7bb09c..cb75eaaa7 100644
--- a/CarpetX/src/regrid_error.cxx
+++ b/CarpetXRegrid/src/regrid_error.cxx
@@ -1,21 +1,20 @@
-#include "schedule.hxx"
-
 #include <loop_device.hxx>
 
 #include <cctk.h>
 #include <cctk_Arguments.h>
 #include <cctk_Parameters.h>
 
-namespace CarpetX {
+namespace CarpetXRegrid {
+using namespace std;
 
-extern "C" void CarpetX_InitError(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTSX_CarpetX_InitError;
+extern "C" void CarpetXRegrid_InitError(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_CarpetXRegrid_InitError;
   DECLARE_CCTK_PARAMETERS;
 
-  grid.loop_device<1, 1, 1, where_t::everywhere>(
+  grid.loop_all_device<1, 1, 1>(
       grid.nghostzones,
       [=] CCTK_DEVICE(const Loop::PointDesc &p)
           CCTK_ATTRIBUTE_ALWAYS_INLINE { regrid_error(p.I) = 0; });
 }
 
-} // namespace CarpetX
+} // namespace CarpetXRegrid
diff --git a/ErrorEstimator/interface.ccl b/ErrorEstimator/interface.ccl
index 08e82c25c..e10c34907 100644
--- a/ErrorEstimator/interface.ccl
+++ b/ErrorEstimator/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: ErrorEstimator
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 
 
diff --git a/ErrorEstimator/schedule.ccl b/ErrorEstimator/schedule.ccl
index 7c7244946..c61a116fe 100644
--- a/ErrorEstimator/schedule.ccl
+++ b/ErrorEstimator/schedule.ccl
@@ -5,11 +5,11 @@
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE ErrorEstimator_Estimate AS EstimateError AT poststep
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
diff --git a/FluxWaveToyX/interface.ccl b/FluxWaveToyX/interface.ccl
index c385944fd..7f50e3c19 100644
--- a/FluxWaveToyX/interface.ccl
+++ b/FluxWaveToyX/interface.ccl
@@ -14,21 +14,21 @@ CCTK_REAL state TYPE=gf CENTERING={ccc} TAGS='parities={+1 +1 +1   +1 +1 +1   -1
   fx fy fz
 } "State vector"
 
-CCTK_REAL flux_x TYPE=gf CENTERING={vcc} TAGS='parities={-1 +1 +1   -1 +1 +1   +1 +1 +1   -1 -1 +1   -1 +1 -1} dependents="rhs"'
+CCTK_REAL flux_x TYPE=gf CENTERING={vcc} TAGS='parities={-1 +1 +1   -1 +1 +1   +1 +1 +1   -1 -1 +1   -1 +1 -1} dependents="rhs" checkpoint="no"'
 {
   u_flux_x
   ft_flux_x
   fx_flux_x fy_flux_x fz_flux_x
 } "Flux in x direction"
 
-CCTK_REAL flux_y TYPE=gf CENTERING={cvc} TAGS='parities={+1 -1 +1   +1 -1 +1   -1 -1 +1   +1 +1 +1   +1 -1 -1} dependents="rhs"'
+CCTK_REAL flux_y TYPE=gf CENTERING={cvc} TAGS='parities={+1 -1 +1   +1 -1 +1   -1 -1 +1   +1 +1 +1   +1 -1 -1} dependents="rhs" checkpoint="no"'
 {
   u_flux_y
   ft_flux_y
   fx_flux_y fy_flux_y fz_flux_y
 } "Flux in y direction"
 
-CCTK_REAL flux_z TYPE=gf CENTERING={ccv} TAGS='parities={+1 +1 -1   +1 +1 -1   -1 +1 -1   +1 -1 -1   +1 +1 +1} dependents="rhs"'
+CCTK_REAL flux_z TYPE=gf CENTERING={ccv} TAGS='parities={+1 +1 -1   +1 +1 -1   -1 +1 -1   +1 -1 -1   +1 +1 +1} dependents="rhs" checkpoint="no"'
 {
   u_flux_z
   ft_flux_z
diff --git a/FluxWaveToyX/par/standing.par b/FluxWaveToyX/par/standing.par
index 17fd186ad..33992ae61 100644
--- a/FluxWaveToyX/par/standing.par
+++ b/FluxWaveToyX/par/standing.par
@@ -13,9 +13,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/FluxWaveToyX/schedule.ccl b/FluxWaveToyX/schedule.ccl
index 7d79ff215..310d296a4 100644
--- a/FluxWaveToyX/schedule.ccl
+++ b/FluxWaveToyX/schedule.ccl
@@ -8,6 +8,13 @@ SCHEDULE FluxWaveToyX_Initial AT initial
   WRITES: state(interior)
 } "Initialize scalar wave state"
 
+SCHEDULE FluxWaveToyX_Boundaries IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: state
+} "Apply boundary conditions"
+
 SCHEDULE FluxWaveToyX_Fluxes IN ODESolvers_RHS
 {
   LANG: C
@@ -15,10 +22,6 @@ SCHEDULE FluxWaveToyX_Fluxes IN ODESolvers_RHS
   WRITES: flux_x(interior)
   WRITES: flux_y(interior)
   WRITES: flux_z(interior)
-  # Sync for test output
-  SYNC: flux_x
-  SYNC: flux_y
-  SYNC: flux_z
 } "Calculate scalar wave fluxes"
 
 SCHEDULE FluxWaveToyX_RHS IN ODESolvers_RHS AFTER FluxWaveToyX_Fluxes
@@ -29,18 +32,30 @@ SCHEDULE FluxWaveToyX_RHS IN ODESolvers_RHS AFTER FluxWaveToyX_Fluxes
   READS: flux_y(interior)
   READS: flux_z(interior)
   WRITES: rhs(interior)
-  # Sync for test output
-  SYNC: rhs
 } "Calculate scalar wave RHS"
 
-SCHEDULE FluxWaveToyX_Boundaries IN ODESolvers_PostStep
+SCHEDULE FluxWaveToyX_Fluxes AT analysis
 {
   LANG: C
-  OPTIONS: global
-  SYNC: state
-} "Apply boundary conditions"
+  READS: state(everywhere)
+  WRITES: flux_x(interior)
+  WRITES: flux_y(interior)
+  WRITES: flux_z(interior)
+  SYNC: flux_x flux_y flux_z
+} "Calculate scalar wave fluxes for output"
+
+SCHEDULE FluxWaveToyX_RHS AT analysis AFTER FluxWaveToyX_Fluxes
+{
+  LANG: C
+  READS: state(interior)
+  READS: flux_x(interior)
+  READS: flux_y(interior)
+  READS: flux_z(interior)
+  WRITES: rhs(interior)
+  SYNC: rhs
+} "Calculate scalar wave RHS for output"
 
-SCHEDULE FluxWaveToyX_Constraints IN ODESolvers_PostStep AFTER FluxWaveToyX_Boundaries
+SCHEDULE FluxWaveToyX_Constraints AT analysis
 {
   LANG: C
   READS: state(everywhere)
@@ -48,7 +63,7 @@ SCHEDULE FluxWaveToyX_Constraints IN ODESolvers_PostStep AFTER FluxWaveToyX_Boun
   SYNC: cons
 } "Calculate scalar wave constraints"
 
-SCHEDULE FluxWaveToyX_Energy IN ODESolvers_PostStep AFTER FluxWaveToyX_Boundaries
+SCHEDULE FluxWaveToyX_Energy AT analysis
 {
   LANG: C
   READS: state(everywhere)
@@ -56,7 +71,7 @@ SCHEDULE FluxWaveToyX_Energy IN ODESolvers_PostStep AFTER FluxWaveToyX_Boundarie
   SYNC: energy
 } "Calculate scalar wave energy density"
 
-SCHEDULE FluxWaveToyX_Error IN ODESolvers_PostStep
+SCHEDULE FluxWaveToyX_Error AT analysis
 {
   LANG: C
   READS: state(interior)
diff --git a/FluxWaveToyX/test/radiative.par b/FluxWaveToyX/test/radiative.par
index 5adc0136f..352bc5f3f 100644
--- a/FluxWaveToyX/test/radiative.par
+++ b/FluxWaveToyX/test/radiative.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    CarpetXRegrid
     FluxWaveToyX
     IOUtil
     ODESolvers
@@ -32,6 +33,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -41,6 +43,9 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     FluxWaveToyX::state
+    FluxWaveToyX::flux_x
+    FluxWaveToyX::flux_y
+    FluxWaveToyX::flux_z
     FluxWaveToyX::rhs
     FluxWaveToyX::energy
     FluxWaveToyX::error
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.x.tsv
new file mode 100644
index 000000000..7b842967a
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	5.3910168028599156e-10	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	5.3910168028599156e-10	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.1248303695418117e-21	8.7741920630261694e-05	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.9063902407733471e-18	2.6164111344322882e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	7.2980796943204849e-17	1.4541883621561212e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-7.2980796943204849e-17	1.4541883621561212e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.9063902407733471e-18	2.6164111344322882e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.1248303695418117e-21	8.7741920630261694e-05	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-5.3910168028599156e-10	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-5.3910168028599156e-10	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.y.tsv
new file mode 100644
index 000000000..ca93b1985
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.z.tsv
new file mode 100644
index 000000000..e07b3629e
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.x.tsv
new file mode 100644
index 000000000..731b8f02f
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6660021446332547e+00	-1.6660021446332547e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6660021446332547e+00	-1.6660021446332547e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.5055113671243947e+00	-1.4996164110501424e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.0344462075281076e+00	-1.8676443870298836e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	7.4746096597216871e-01	4.7923287177307232e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-7.4746096597216871e-01	4.7923287177307232e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.0344462075281076e+00	-1.8676443870298836e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.5055113671243947e+00	-1.4996164110501424e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6660021446332547e+00	-1.6660021446332547e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6660021446332547e+00	-1.6660021446332547e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.y.tsv
new file mode 100644
index 000000000..61ef56b49
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.z.tsv
new file mode 100644
index 000000000..8c221c00d
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_x.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158660e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158660e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.x.tsv
new file mode 100644
index 000000000..cb2c69477
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.y.tsv
new file mode 100644
index 000000000..4cb021599
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.1248303695418117e-21	0.0000000000000000e+00	8.7741920630261694e-05	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.9063902407733471e-18	0.0000000000000000e+00	2.6164111344322882e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	7.2980796943204849e-17	0.0000000000000000e+00	1.4541883621561212e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-7.2980796943204849e-17	0.0000000000000000e+00	1.4541883621561212e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.9063902407733471e-18	0.0000000000000000e+00	2.6164111344322882e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.1248303695418117e-21	0.0000000000000000e+00	8.7741920630261694e-05	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-5.3910168028599156e-10	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-5.3910168028599156e-10	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.z.tsv
new file mode 100644
index 000000000..703f0623e
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.x.tsv
new file mode 100644
index 000000000..4a5c2ecce
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.y.tsv
new file mode 100644
index 000000000..d95fa331f
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.5055113671243947e+00	0.0000000000000000e+00	-1.4996164110501424e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.0344462075281076e+00	0.0000000000000000e+00	-1.8676443870298836e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	7.4746096597216871e-01	0.0000000000000000e+00	4.7923287177307232e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-7.4746096597216871e-01	0.0000000000000000e+00	4.7923287177307232e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.0344462075281076e+00	0.0000000000000000e+00	-1.8676443870298836e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.5055113671243947e+00	0.0000000000000000e+00	-1.4996164110501424e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	1.6660021446332547e+00	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	1.6660021446332547e+00	0.0000000000000000e+00	-1.6660021446332547e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.z.tsv
new file mode 100644
index 000000000..58023b4fe
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_y.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158660e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158660e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638314e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.x.tsv
new file mode 100644
index 000000000..7779e4c02
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.y.tsv
new file mode 100644
index 000000000..fdb774d8f
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2310674412340052e-01
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7548276305716281e-04
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0782033605719831e-09
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.z.tsv
new file mode 100644
index 000000000..d3206e25c
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000000.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	-2.1248303695418117e-21	0.0000000000000000e+00	0.0000000000000000e+00	8.7741920630261694e-05
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	-1.9063902407733471e-18	0.0000000000000000e+00	0.0000000000000000e+00	2.6164111344322882e-01
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	7.2980796943204849e-17	0.0000000000000000e+00	0.0000000000000000e+00	1.4541883621561212e+01
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8560660498999024e+01
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-7.2980796943204849e-17	0.0000000000000000e+00	0.0000000000000000e+00	1.4541883621561212e+01
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	1.9063902407733471e-18	0.0000000000000000e+00	0.0000000000000000e+00	2.6164111344322882e-01
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	2.1248303695418117e-21	0.0000000000000000e+00	0.0000000000000000e+00	8.7741920630261694e-05
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	-5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10
+0	0.0000000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	-5.3910168028599156e-10	0.0000000000000000e+00	0.0000000000000000e+00	5.3910168028599156e-10
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.x.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.x.tsv
new file mode 100644
index 000000000..61b2a1ff6
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.y.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.y.tsv
new file mode 100644
index 000000000..06b789149
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6679270676158657e+00
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.0673617064439012e+00
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.3187111565638370e-01
diff --git a/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.z.tsv b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.z.tsv
new file mode 100644
index 000000000..25963c42c
--- /dev/null
+++ b/FluxWaveToyX/test/radiative/fluxwavetoyx-flux_z.it000010.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	-2.5055113671243943e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4996164110501422e+00
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	-1.0344462075281078e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.8676443870298836e+00
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	7.4746096597216805e-01	0.0000000000000000e+00	0.0000000000000000e+00	4.7923287177307232e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1252584503077312e+01
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-7.4746096597216805e-01	0.0000000000000000e+00	0.0000000000000000e+00	4.7923287177307232e+00
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	1.0344462075281078e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.8676443870298836e+00
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	2.5055113671243943e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4996164110501422e+00
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	1.6660021446332545e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00
+10	1.2500000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	1.6660021446332545e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.6660021446332545e+00
diff --git a/FluxWaveToyX/test/radiative/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/radiative/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/reflecting.par b/FluxWaveToyX/test/reflecting.par
index 1d1b5196e..64d2e8ffc 100644
--- a/FluxWaveToyX/test/reflecting.par
+++ b/FluxWaveToyX/test/reflecting.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    CarpetXRegrid
     FluxWaveToyX
     IOUtil
     ODESolvers
@@ -31,6 +32,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -40,6 +42,9 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     FluxWaveToyX::state
+    FluxWaveToyX::flux_x
+    FluxWaveToyX::flux_y
+    FluxWaveToyX::flux_z
     FluxWaveToyX::rhs
     FluxWaveToyX::energy
     FluxWaveToyX::error
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.x.tsv
new file mode 100644
index 000000000..5cef34220
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.y.tsv
new file mode 100644
index 000000000..6fde9217f
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.z.tsv
new file mode 100644
index 000000000..5f1a69271
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.x.tsv
new file mode 100644
index 000000000..de2630efd
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.2797322131669813e+00	-2.2521082636619136e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.1792946831485107e+00	1.9314599804640073e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.5559140897511559e+00	2.2521082636619222e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.5559140897511559e+00	2.2521082636619222e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.1792946831485107e+00	1.9314599804640073e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.2797322131669813e+00	-2.2521082636619136e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.y.tsv
new file mode 100644
index 000000000..09d3b92f8
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177524e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102647e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102647e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177524e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.z.tsv
new file mode 100644
index 000000000..7511ec14b
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_x.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102669e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102669e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.x.tsv
new file mode 100644
index 000000000..812b6d37d
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.y.tsv
new file mode 100644
index 000000000..8d38a0282
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.z.tsv
new file mode 100644
index 000000000..3c34c659b
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.x.tsv
new file mode 100644
index 000000000..d91be85a8
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102644e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102644e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.y.tsv
new file mode 100644
index 000000000..9efcde73a
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.2797322131669810e+00	0.0000000000000000e+00	-2.2521082636619125e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.1792946831485107e+00	0.0000000000000000e+00	1.9314599804640087e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.5559140897511556e+00	0.0000000000000000e+00	2.2521082636619225e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.5559140897511556e+00	0.0000000000000000e+00	2.2521082636619225e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.1792946831485107e+00	0.0000000000000000e+00	1.9314599804640087e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.2797322131669810e+00	0.0000000000000000e+00	-2.2521082636619125e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.z.tsv
new file mode 100644
index 000000000..b230d4966
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_y.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102669e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102669e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.x.tsv
new file mode 100644
index 000000000..4a4f4af82
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.y.tsv
new file mode 100644
index 000000000..888013b16
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.z.tsv
new file mode 100644
index 000000000..9ff6c841f
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000000.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00
+0	0.0000000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0261721529770311e+00
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.x.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.x.tsv
new file mode 100644
index 000000000..3910e249f
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102644e-01
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102644e-01
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177502e-01
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.y.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.y.tsv
new file mode 100644
index 000000000..a1e327bca
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177524e-01
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102647e-01
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.3597317909102647e-01
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5031881700177524e-01
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.0074046973415773e-01
diff --git a/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.z.tsv b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.z.tsv
new file mode 100644
index 000000000..f752955b3
--- /dev/null
+++ b/FluxWaveToyX/test/reflecting/fluxwavetoyx-flux_z.it000010.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	1.2797322131669810e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2521082636619136e-01
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	2.1792946831485107e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9314599804640087e-01
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	1.5559140897511559e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2521082636619236e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1444847364135802e-01
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-1.5559140897511559e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2521082636619236e-01
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	-2.1792946831485107e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9314599804640087e-01
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	-1.2797322131669810e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2521082636619136e-01
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02
+10	1.2500000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.8739148637919207e-02
diff --git a/FluxWaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
diff --git a/FluxWaveToyX/test/standing.par b/FluxWaveToyX/test/standing.par
index a6b1f1728..8630fe487 100644
--- a/FluxWaveToyX/test/standing.par
+++ b/FluxWaveToyX/test/standing.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    CarpetXRegrid
     FluxWaveToyX
     IOUtil
     ODESolvers
@@ -14,9 +15,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -26,6 +28,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -35,6 +38,9 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     FluxWaveToyX::state
+    FluxWaveToyX::flux_x
+    FluxWaveToyX::flux_y
+    FluxWaveToyX::flux_z
     FluxWaveToyX::rhs
     FluxWaveToyX::energy
     FluxWaveToyX::error
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.x.tsv
new file mode 100644
index 000000000..095aea8fb
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.y.tsv
new file mode 100644
index 000000000..6fde9217f
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.z.tsv
new file mode 100644
index 000000000..5f1a69271
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+0	0.0000000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.x.tsv
new file mode 100644
index 000000000..d61e3c855
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812730e+00	-3.7893987430543707e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812730e+00	-3.7893987430543707e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.3325306753721335e+00	1.5265566588595902e-16	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812726e+00	3.7893987430543746e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812726e+00	3.7893987430543746e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.3325306753721335e+00	1.5265566588595902e-16	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812730e+00	-3.7893987430543707e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812730e+00	-3.7893987430543707e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.y.tsv
new file mode 100644
index 000000000..8e97251a3
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416887e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416887e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.z.tsv
new file mode 100644
index 000000000..f4b91ad86
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_x.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_x	12:ft_flux_x	13:fx_flux_x	14:fy_flux_x	15:fz_flux_x
+10	1.2500000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416862e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416862e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.x.tsv
new file mode 100644
index 000000000..812b6d37d
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.y.tsv
new file mode 100644
index 000000000..4f6cae4a7
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.z.tsv
new file mode 100644
index 000000000..3c34c659b
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000000.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.x.tsv
new file mode 100644
index 000000000..0c572357e
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416893e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416923e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416923e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416893e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.y.tsv
new file mode 100644
index 000000000..7c75af541
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812735e+00	0.0000000000000000e+00	-3.7893987430543741e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812735e+00	0.0000000000000000e+00	-3.7893987430543741e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	2.3325306753721335e+00	0.0000000000000000e+00	-2.6367796834847468e-16	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812730e+00	0.0000000000000000e+00	3.7893987430543730e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	2.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812730e+00	0.0000000000000000e+00	3.7893987430543730e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	5.0000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-2.3325306753721335e+00	0.0000000000000000e+00	-2.6367796834847468e-16	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	7.5000000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	-1.6493482578812735e+00	0.0000000000000000e+00	-3.7893987430543741e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	9	4	1.2500000000000000e-01	1.2500000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	1.6493482578812735e+00	0.0000000000000000e+00	-3.7893987430543741e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.z.tsv
new file mode 100644
index 000000000..53a9d6e31
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_y.it000010.z.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_y	12:ft_flux_y	13:fx_flux_y	14:fy_flux_y	15:fz_flux_y
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	0.0000000000000000e+00	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	0.0000000000000000e+00	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	0.0000000000000000e+00	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	0.0000000000000000e+00	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416862e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	0.0000000000000000e+00	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	0.0000000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	0.0000000000000000e+00	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416862e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	0.0000000000000000e+00	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	0.0000000000000000e+00	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	0.0000000000000000e+00	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.x.tsv
new file mode 100644
index 000000000..4a4f4af82
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.y.tsv
new file mode 100644
index 000000000..888013b16
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.z.tsv
new file mode 100644
index 000000000..2e0aefef4
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000000.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+0	0.0000000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	1.7517854410118885e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-1.7517854410118885e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	-2.4773987290467461e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	-1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
+0	0.0000000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	1.7517854410118887e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.x.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.x.tsv
new file mode 100644
index 000000000..2cbe35278
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.x.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01
+10	1.2500000000000000e+00	0	0	0	4	4	-8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01
+10	1.2500000000000000e+00	0	0	1	4	4	-6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416893e-01
+10	1.2500000000000000e+00	0	0	2	4	4	-3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416923e-01
+10	1.2500000000000000e+00	0	0	3	4	4	-1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01
+10	1.2500000000000000e+00	0	0	5	4	4	3.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416923e-01
+10	1.2500000000000000e+00	0	0	6	4	4	6.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416893e-01
+10	1.2500000000000000e+00	0	0	7	4	4	8.7500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01
+10	1.2500000000000000e+00	0	0	8	4	4	1.1250000000000000e+00	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670525e-01
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.y.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.y.tsv
new file mode 100644
index 000000000..456ea7780
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.y.tsv
@@ -0,0 +1,11 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	-1	4	1.2500000000000000e-01	-1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
+10	1.2500000000000000e+00	0	0	4	0	4	1.2500000000000000e-01	-8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
+10	1.2500000000000000e+00	0	0	4	1	4	1.2500000000000000e-01	-6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01
+10	1.2500000000000000e+00	0	0	4	2	4	1.2500000000000000e-01	-3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416887e-01
+10	1.2500000000000000e+00	0	0	4	3	4	1.2500000000000000e-01	-1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01
+10	1.2500000000000000e+00	0	0	4	5	4	1.2500000000000000e-01	3.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2197783904416887e-01
+10	1.2500000000000000e+00	0	0	4	6	4	1.2500000000000000e-01	6.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.2197783904416940e-01
+10	1.2500000000000000e+00	0	0	4	7	4	1.2500000000000000e-01	8.7500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
+10	1.2500000000000000e+00	0	0	4	8	4	1.2500000000000000e-01	1.1250000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
diff --git a/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.z.tsv b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.z.tsv
new file mode 100644
index 000000000..ee62b973f
--- /dev/null
+++ b/FluxWaveToyX/test/standing/fluxwavetoyx-flux_z.it000010.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_flux_z	12:ft_flux_z	13:fx_flux_z	14:fy_flux_z	15:fz_flux_z
+10	1.2500000000000000e+00	0	0	4	4	-1	1.2500000000000000e-01	1.2500000000000000e-01	-1.2500000000000000e+00	0.0000000000000000e+00	-1.6493482578812733e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.7893987430543741e-01
+10	1.2500000000000000e+00	0	0	4	4	0	1.2500000000000000e-01	1.2500000000000000e-01	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
+10	1.2500000000000000e+00	0	0	4	4	1	1.2500000000000000e-01	1.2500000000000000e-01	-7.5000000000000000e-01	0.0000000000000000e+00	1.6493482578812733e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.7893987430543741e-01
+10	1.2500000000000000e+00	0	0	4	4	2	1.2500000000000000e-01	1.2500000000000000e-01	-5.0000000000000000e-01	0.0000000000000000e+00	2.3325306753721335e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8857805861880479e-16
+10	1.2500000000000000e+00	0	0	4	4	3	1.2500000000000000e-01	1.2500000000000000e-01	-2.5000000000000000e-01	0.0000000000000000e+00	1.6493482578812730e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7893987430543719e-01
+10	1.2500000000000000e+00	0	0	4	4	4	1.2500000000000000e-01	1.2500000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3590190956670569e-01
+10	1.2500000000000000e+00	0	0	4	4	5	1.2500000000000000e-01	1.2500000000000000e-01	2.5000000000000000e-01	0.0000000000000000e+00	-1.6493482578812730e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7893987430543719e-01
+10	1.2500000000000000e+00	0	0	4	4	6	1.2500000000000000e-01	1.2500000000000000e-01	5.0000000000000000e-01	0.0000000000000000e+00	-2.3325306753721335e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8857805861880479e-16
+10	1.2500000000000000e+00	0	0	4	4	7	1.2500000000000000e-01	1.2500000000000000e-01	7.5000000000000000e-01	0.0000000000000000e+00	-1.6493482578812733e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.7893987430543741e-01
+10	1.2500000000000000e+00	0	0	4	4	8	1.2500000000000000e-01	1.2500000000000000e-01	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3590190956670547e-01
+10	1.2500000000000000e+00	0	0	4	4	9	1.2500000000000000e-01	1.2500000000000000e-01	1.2500000000000000e+00	0.0000000000000000e+00	1.6493482578812733e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.7893987430543741e-01
diff --git a/FluxWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/FluxWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from FluxWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to FluxWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/HydroBaseX/schedule.ccl b/HydroBaseX/schedule.ccl
index a5fa4193c..4fc074e56 100644
--- a/HydroBaseX/schedule.ccl
+++ b/HydroBaseX/schedule.ccl
@@ -1,25 +1,45 @@
 # Schedule definitions for thorn HydroBaseX
 
-SCHEDULE GROUP HydroBaseX_InitialData AT initial
-{
-} "Schedule group for calculating hydro initial data"
+if (CCTK_IsThornActive("ODESolvers")) {
 
-SCHEDULE GROUP HydroBaseX_PostInitial AT initial AFTER HydroBaseX_InitialData
-{
-} "Schedule group for modifying the hydro initial data, such as e.g. adding noise"
+  SCHEDULE GROUP HydroBaseX_InitialData IN ODESolvers_Initial
+  {
+  } "Schedule group for calculating hydro initial data"
+
+  SCHEDULE GROUP HydroBaseX_PostInitial IN ODESolvers_Initial AFTER HydroBaseX_InitialData
+  {
+  } "Schedule group for modifying the hydro initial data, such as e.g. adding noise"
 
-if (CCTK_IsThornActive("ODESolvers")) {
   SCHEDULE GROUP HydroBaseX_SetHydroVars IN ODESolvers_PostStep
   {
   } "Set hydro variables in this group, or before this group"
+
 } else {
+
+  SCHEDULE GROUP HydroBaseX_InitialData AT initial
+  {
+  } "Schedule group for calculating hydro initial data"
+
+  SCHEDULE GROUP HydroBaseX_PostInitial AT initial AFTER HydroBaseX_InitialData
+  {
+  } "Schedule group for modifying the hydro initial data, such as e.g. adding noise"
+
+  SCHEDULE GROUP HydroBaseX_SetHydroVars AT post_recover_variables
+  {
+  } "Set hydro variables in this group, or before this group"
+
   SCHEDULE GROUP HydroBaseX_SetHydroVars AT postregrid
   {
   } "Set hydro variables in this group, or before this group"
 
+  SCHEDULE GROUP HydroBaseX_SetHydroVars AT postrestrict
+  {
+  } "Set hydro variables in this group, or before this group"
+
   SCHEDULE GROUP HydroBaseX_SetHydroVars AT poststep
   {
   } "Set hydro variables in this group, or before this group"
+
 }
 
 
diff --git a/Loop/src/loop.hxx b/Loop/src/loop.hxx
index 3d448aa92..e1a600bbe 100644
--- a/Loop/src/loop.hxx
+++ b/Loop/src/loop.hxx
@@ -1,8 +1,6 @@
 #ifndef CARPETX_LOOP_LOOP_HXX
 #define CARPETX_LOOP_LOOP_HXX
 
-#include <AMReX_FArrayBox.H>
-
 #include <simd.hxx>
 #include <vect.hxx>
 
@@ -10,6 +8,9 @@
 #include <cctk_Arguments.h>
 #include <cctk_Parameters.h>
 
+#include <AMReX_FArrayBox.H>
+#include <AMReX_REAL.H>
+
 #ifdef __HIPCC__
 #include <hip/hip_runtime.h>
 #endif
@@ -25,6 +26,8 @@
 #define CCTK_DEVICE AMREX_GPU_DEVICE
 #define CCTK_HOST AMREX_GPU_HOST
 
+#define CCTK_KERNEL __attribute__((__always_inline__, __flatten__))
+
 namespace Loop {
 
 using Arith::vect;
@@ -54,7 +57,7 @@ std::ostream &operator<<(std::ostream &os, const where_t where);
 struct GridDescBase;
 
 template <typename T, int D> struct units_t {
-  constexpr CCTK_ATTRIBUTE_ALWAYS_INLINE CCTK_DEVICE CCTK_HOST Arith::vect<T, D>
+  constexpr CCTK_KERNEL CCTK_DEVICE CCTK_HOST Arith::vect<T, D>
   operator[](const int d) const {
     return Arith::vect<T, D>::unit(d);
   }
@@ -94,7 +97,7 @@ struct PointDesc {
   PointDesc &operator=(const PointDesc &) = default;
   PointDesc &operator=(PointDesc &&) = default;
 
-  CCTK_ATTRIBUTE_ALWAYS_INLINE CCTK_DEVICE CCTK_HOST
+  CCTK_KERNEL CCTK_DEVICE CCTK_HOST
   PointDesc(const int level, const int patch, const int component,
             const vect<int, dim> &I, const int iter, const vect<int, dim> &NI,
             const vect<int, dim> &I0, const vect<int, dim> &BI,
@@ -140,7 +143,7 @@ public:
 
   GridDescBase(const cGH *cctkGH);
 
-  CCTK_ATTRIBUTE_ALWAYS_INLINE CCTK_DEVICE CCTK_HOST PointDesc
+  CCTK_KERNEL CCTK_DEVICE CCTK_HOST PointDesc
   point_desc(const vect<bool, dim> &CI, const vect<int, dim> &I, const int iter,
              const vect<int, dim> &NI, const vect<int, dim> &I0,
              const vect<int, dim> &BI, const vect<int, dim> &bnd_min,
@@ -184,8 +187,9 @@ public:
             // Outward boundary normal (if on outermost interior point), else 0
             const vect<int, dim> BI =
                 vect<int, dim>(I == bnd_max - 1) - vect<int, dim>(I == bnd_min);
+            const vect<bool, dim> CI1{CI, CJ, CK};
             const PointDesc p =
-                point_desc({CI, CJ, CK}, I, iter, NI, I0, BI, bnd_min, bnd_max,
+                point_desc(CI1, I, iter, NI, I0, BI, bnd_min, bnd_max,
                            loop_min, loop_max);
             f(p);
           }
@@ -253,8 +257,8 @@ public:
 
   // Loop over all points
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-  loop_all(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL void loop_all(const vect<int, dim> &group_nghostzones,
+                                   const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
     vect<int, dim> imin, imax;
@@ -264,8 +268,8 @@ public:
 
   // Loop over all interior points
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-  loop_int(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL void loop_int(const vect<int, dim> &group_nghostzones,
+                                   const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
     vect<int, dim> imin, imax;
@@ -276,7 +280,7 @@ public:
   // Loop over a part of the domain. Loop over the interior first,
   // then faces, then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_there(const vect<int, dim> &group_nghostzones,
              const vect<vect<vect<bool, dim>, dim>, dim> &there,
              const F &f) const {
@@ -337,8 +341,8 @@ public:
   // includes ghost edges/corners on non-ghost faces. Loop over faces first,
   // then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-  loop_bnd(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL void loop_bnd(const vect<int, dim> &group_nghostzones,
+                                   const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
     vect<int, dim> all_min, all_max, int_min, int_max;
@@ -396,7 +400,7 @@ public:
   // Loop over all outer ghost points. This includes ghost edges/corners on
   // non-ghost faces. Loop over faces first, then edges, then corners.
   template <int CI, int CJ, int CK, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_ghosts_inclusive(const vect<int, dim> &group_nghostzones,
                         const F &f) const {
     constexpr vect<int, dim> offset{CI, CJ, CK};
@@ -477,8 +481,8 @@ public:
   // Loop over all outer ghost points. This excludes ghost edges/corners on
   // non-ghost faces. Loop over faces first, then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-  loop_ghosts(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL void loop_ghosts(const vect<int, dim> &group_nghostzones,
+                                      const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
     vect<int, dim> all_min, all_max, int_min, int_max;
@@ -539,7 +543,7 @@ public:
   // faces. Loop over faces first, then edges, then corners. Modified from
   // loop_bnd.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_outermost_int(const vect<int, dim> &group_nghostzones,
                      const F &f) const {
     // boundary_box sets bnd_min and bnd_max
@@ -637,42 +641,38 @@ public:
   }
 
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::everywhere), void>
-      loop(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::everywhere), void>
+  loop(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_all<CI, CJ, CK>(group_nghostzones, f);
   }
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::interior), void>
-      loop(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::interior), void>
+  loop(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_int<CI, CJ, CK>(group_nghostzones, f);
   }
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::boundary), void>
-      loop(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::boundary), void>
+  loop(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_bnd<CI, CJ, CK>(group_nghostzones, f);
   }
 #if 0
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
+  inline CCTK_KERNEL
       std::enable_if_t<(where == where_t::ghosts_inclusive), void>
       loop(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_ghosts_inclusive<CI, CJ, CK>(group_nghostzones, f);
   }
 #endif
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::ghosts), void>
-      loop(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::ghosts), void>
+  loop(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_ghosts<CI, CJ, CK>(group_nghostzones, f);
   }
 
   template <int CI, int CJ, int CK, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-  loop(where_t where, const vect<int, dim> &group_nghostzones,
-       const F &f) const {
+  inline CCTK_KERNEL void loop(where_t where,
+                               const vect<int, dim> &group_nghostzones,
+                               const F &f) const {
     switch (where) {
     case where_t::everywhere:
       return noinline([&] {
@@ -703,18 +703,17 @@ public:
   }
 
   template <int CI, int CJ, int CK, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop(where_t where,
-                                                const F &f) const {
+  inline CCTK_KERNEL void loop(where_t where, const F &f) const {
     loop<CI, CJ, CK>(where, nghostzones, f);
   }
 
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop(const F &f) const {
+  inline CCTK_KERNEL void loop(const F &f) const {
     loop<CI, CJ, CK, where>(nghostzones, f);
   }
 
   template <typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_idx(where_t where, const vect<int, dim> &indextype,
            const vect<int, dim> &group_nghostzones, const F &f) const {
     switch (indextype[0] + 2 * indextype[1] + 4 * indextype[2]) {
@@ -748,67 +747,61 @@ public:
   }
 
   template <typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_idx(where_t where, const vect<int, dim> &indextype, const F &f) const {
     loop_idx(where, indextype, nghostzones, f);
   }
 };
 
 template <typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+inline CCTK_KERNEL void
 loop_idx(const cGH *cctkGH, where_t where, const vect<int, dim> &indextype,
          const vect<int, dim> &nghostzones, const F &f) {
   GridDescBase(cctkGH).loop_idx(where, indextype, nghostzones, f);
 }
 
 template <typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
-loop_idx(const cGH *cctkGH, where_t where, const vect<int, dim> &indextype,
-         const F &f) {
+inline CCTK_KERNEL void loop_idx(const cGH *cctkGH, where_t where,
+                                 const vect<int, dim> &indextype, const F &f) {
   GridDescBase(cctkGH).loop_idx(where, indextype, f);
 }
 
 template <int CI, int CJ, int CK, where_t where, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop(const cGH *cctkGH, const F &f) {
+inline CCTK_KERNEL void loop(const cGH *cctkGH, const F &f) {
   GridDescBase(cctkGH).loop<CI, CJ, CK, where>(f);
 }
 
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop(const cGH *cctkGH, where_t where,
-                                              const F &f) {
+inline CCTK_KERNEL void loop(const cGH *cctkGH, where_t where, const F &f) {
   GridDescBase(cctkGH).loop<CI, CJ, CK>(where, f);
 }
 
 // Keep these for convenience
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop_all(const cGH *cctkGH,
-                                                  const F &f) {
+inline CCTK_KERNEL void loop_all(const cGH *cctkGH, const F &f) {
   loop<CI, CJ, CK, where_t::everywhere>(cctkGH, f);
 }
 
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop_int(const cGH *cctkGH,
-                                                  const F &f) {
+inline CCTK_KERNEL void loop_int(const cGH *cctkGH, const F &f) {
   loop<CI, CJ, CK, where_t::interior>(cctkGH, f);
 }
 
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop_bnd(const cGH *cctkGH,
-                                                  const F &f) {
+inline CCTK_KERNEL void loop_bnd(const cGH *cctkGH, const F &f) {
   loop<CI, CJ, CK, where_t::boundary>(cctkGH, f);
 }
 
 #if 0
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+inline CCTK_KERNEL void
 loop_ghosts_inclusive(const cGH *cctkGH, const F &f) {
   loop<CI, CJ, CK, where_t::ghosts_inclusive>(cctkGH, f);
 }
 #endif
 
 template <int CI, int CJ, int CK, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void loop_ghosts(const cGH *cctkGH,
-                                                     const F &f) {
+inline CCTK_KERNEL void loop_ghosts(const cGH *cctkGH, const F &f) {
   loop<CI, CJ, CK, where_t::ghosts>(cctkGH, f);
 }
 
@@ -823,7 +816,7 @@ template <typename T, int CI, int CJ, int CK> struct GF3D {
   const int dj, dk, np;
   const int ni, nj, nk;
   T *restrict const ptr;
-  static constexpr CCTK_ATTRIBUTE_ALWAYS_INLINE vect<int, dim> indextype() {
+  static constexpr CCTK_KERNEL vect<int, dim> indextype() {
     return {CI, CJ, CK};
   }
   GF3D() = delete;
@@ -836,7 +829,7 @@ template <typename T, int CI, int CJ, int CK> struct GF3D {
         dk(dj * (cctkGH->cctk_ash[1] - CJ)),
         np(dk * (cctkGH->cctk_ash[2] - CK)), ni(cctkGH->cctk_lsh[0] - CI),
         nj(cctkGH->cctk_lsh[1] - CJ), nk(cctkGH->cctk_lsh[2] - CK), ptr(ptr) {}
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE int offset(int i, int j, int k) const {
+  inline CCTK_KERNEL int offset(int i, int j, int k) const {
     // These index checks prevent vectorization. We thus only enable
     // them in debug mode.
 #ifdef CCTK_DEBUG
diff --git a/Loop/src/loop_device.hxx b/Loop/src/loop_device.hxx
index b7cad9c30..c03792487 100644
--- a/Loop/src/loop_device.hxx
+++ b/Loop/src/loop_device.hxx
@@ -57,8 +57,8 @@ public:
     static_assert(CI == 0 || CI == 1);
     static_assert(CJ == 0 || CJ == 1);
     static_assert(CK == 0 || CK == 1);
-    static_assert(N >= 0);
     static_assert(VS > 0);
+    static_assert(N >= 0);
     static_assert(NT > 0);
 
     static_assert(VS == 1, "Only vector size 1 is supported on GPUs");
@@ -120,7 +120,7 @@ public:
   // Loop over all points
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_all_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
@@ -132,7 +132,7 @@ public:
   // Loop over all interior points
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_int_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
@@ -145,7 +145,7 @@ public:
   // then faces, then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_there_device(const vect<int, dim> &group_nghostzones,
                     const vect<vect<vect<bool, dim>, dim>, dim> &there,
                     const F &f) const {
@@ -208,7 +208,7 @@ public:
   // then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_bnd_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
     boundary_box<CI, CJ, CK>(group_nghostzones, bnd_min, bnd_max);
@@ -273,7 +273,7 @@ public:
   // loop_bnd_device.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_outermost_int_device(const vect<int, dim> &group_nghostzones,
                             const F &f) const {
     // boundary_box sets bnd_min and bnd_max
@@ -376,7 +376,7 @@ public:
   // non-ghost faces. Loop over faces first, then edges, then corners.
   template <int CI, int CJ, int CK, int N = 1, int VS = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_ghosts_inclusive_device(const vect<int, dim> &group_nghostzones,
                                const F &f) const {
     constexpr vect<int, dim> offset{CI, CJ, CK};
@@ -438,7 +438,7 @@ public:
   // non-ghost faces. Loop over faces first, then edges, then corners.
   template <int CI, int CJ, int CK, int VS = 1, int N = 1,
             int NT = AMREX_GPU_MAX_THREADS, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_ghosts_device(const vect<int, dim> &group_nghostzones,
                      const F &f) const {
     vect<int, dim> bnd_min, bnd_max;
@@ -495,40 +495,36 @@ public:
   }
 
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::everywhere), void>
-      loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::everywhere), void>
+  loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_all_device<CI, CJ, CK>(group_nghostzones, f);
   }
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::interior), void>
-      loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::interior), void>
+  loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_int_device<CI, CJ, CK>(group_nghostzones, f);
   }
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::boundary), void>
-      loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::boundary), void>
+  loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_bnd_device<CI, CJ, CK>(group_nghostzones, f);
   }
 #if 0
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
+  inline CCTK_KERNEL
       std::enable_if_t<(where == where_t::ghosts_inclusive), void>
       loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_ghosts_inclusive_device<CI, CJ, CK>(group_nghostzones, f);
   }
 #endif
   template <int CI, int CJ, int CK, where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE
-      std::enable_if_t<(where == where_t::ghosts), void>
-      loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
+  inline CCTK_KERNEL std::enable_if_t<(where == where_t::ghosts), void>
+  loop_device(const vect<int, dim> &group_nghostzones, const F &f) const {
     loop_ghosts_device<CI, CJ, CK>(group_nghostzones, f);
   }
 
   template <typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_there_device_idx(const vect<int, dim> &indextype,
                         const vect<vect<vect<bool, dim>, dim>, dim> &there,
                         const vect<int, dim> &group_nghostzones,
@@ -572,7 +568,7 @@ public:
   }
 
   template <where_t where, typename F>
-  inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+  inline CCTK_KERNEL void
   loop_device_idx(const vect<int, dim> &indextype,
                   const vect<int, dim> &group_nghostzones, const F &f) const {
     switch (indextype[0] + 2 * indextype[1] + 4 * indextype[2]) {
@@ -607,7 +603,7 @@ public:
 };
 
 template <where_t where, typename F>
-inline CCTK_ATTRIBUTE_ALWAYS_INLINE void
+inline CCTK_KERNEL void
 loop_device_idx(const cGH *cctkGH, const vect<int, dim> &indextype,
                 const vect<int, dim> &nghostzones, const F &f) {
   GridDescBaseDevice(cctkGH).loop_device_idx<where>(indextype, nghostzones, f);
diff --git a/MovingBoxToy/configuration.ccl b/MovingBoxToy/configuration.ccl
index dcda308e1..2705f6d82 100644
--- a/MovingBoxToy/configuration.ccl
+++ b/MovingBoxToy/configuration.ccl
@@ -1 +1 @@
-# Configuration definitions for thorn MovingBoxToy
\ No newline at end of file
+# Configuration definitions for thorn MovingBoxToy
diff --git a/MovingBoxToy/interface.ccl b/MovingBoxToy/interface.ccl
index 6f6bc2b37..2d1f48cd3 100644
--- a/MovingBoxToy/interface.ccl
+++ b/MovingBoxToy/interface.ccl
@@ -2,4 +2,4 @@
 
 IMPLEMENTS: MovingBoxToy
 
-INHERITS: BoxInBox
\ No newline at end of file
+INHERITS: BoxInBox
diff --git a/MovingBoxToy/par/circle.par b/MovingBoxToy/par/circle.par
index f41454fc1..69152153c 100644
--- a/MovingBoxToy/par/circle.par
+++ b/MovingBoxToy/par/circle.par
@@ -1,9 +1,9 @@
 ActiveThorns = "
-    MovingBoxToy
     BoxInBox
     CarpetX
     CoordinatesX
     IOUtil
+    MovingBoxToy
 "
 
 Cactus::cctk_show_schedule = no
@@ -52,8 +52,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_silo_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
-
diff --git a/MovingBoxToy/param.ccl b/MovingBoxToy/param.ccl
index d6fbedd7a..41fbcd7ed 100644
--- a/MovingBoxToy/param.ccl
+++ b/MovingBoxToy/param.ccl
@@ -1 +1 @@
-# Parameter definitions for thorn MovingBoxToy
\ No newline at end of file
+# Parameter definitions for thorn MovingBoxToy
diff --git a/MovingBoxToy/schedule.ccl b/MovingBoxToy/schedule.ccl
index 5a53eb455..6aef55c42 100644
--- a/MovingBoxToy/schedule.ccl
+++ b/MovingBoxToy/schedule.ccl
@@ -12,4 +12,4 @@ SCHEDULE MovingBoxToy_MoveBoxes AT poststep BEFORE EstimateError
   LANG: C
   READS: BoxInBox::positions
   WRITES: BoxInBox::positions
-} "Update box positions"
\ No newline at end of file
+} "Update box positions"
diff --git a/MovingBoxToy/src/movingboxtoy.cxx b/MovingBoxToy/src/movingboxtoy.cxx
index 4b9901d30..2ccc579ca 100644
--- a/MovingBoxToy/src/movingboxtoy.cxx
+++ b/MovingBoxToy/src/movingboxtoy.cxx
@@ -4,9 +4,10 @@
 
 #include <cmath>
 
-template <typename T>
-constexpr auto pow2(T val) noexcept -> T {
-    return val * val;
+namespace MovingBoxToy {
+
+template <typename T> constexpr auto pow2(T val) noexcept -> T {
+  return val * val;
 }
 
 extern "C" void MovingBoxToy_MoveBoxes(CCTK_ARGUMENTS) {
@@ -16,11 +17,13 @@ extern "C" void MovingBoxToy_MoveBoxes(CCTK_ARGUMENTS) {
   using std::cos;
   using std::sqrt;
 
-  const CCTK_REAL omega{M_PI/4};
+  const CCTK_REAL omega{M_PI / 4};
 
   // Radius of each box
-  const auto R1 = sqrt(pow2(position_x[0]) + pow2(position_y[0]) + pow2(position_z[0]));
-  const auto R2 = sqrt(pow2(position_x[1]) + pow2(position_y[1]) + pow2(position_z[1])); 
+  const auto R1 =
+      sqrt(pow2(position_x[0]) + pow2(position_y[0]) + pow2(position_z[0]));
+  const auto R2 =
+      sqrt(pow2(position_x[1]) + pow2(position_y[1]) + pow2(position_z[1]));
 
   // Trajectory of box 1
   position_x[0] = R1 * cos(omega * cctk_time);
@@ -29,4 +32,6 @@ extern "C" void MovingBoxToy_MoveBoxes(CCTK_ARGUMENTS) {
   // Trajectory of box 2
   position_x[1] = -R2 * cos(omega * cctk_time);
   position_y[1] = -R2 * sin(omega * cctk_time);
-}
\ No newline at end of file
+}
+
+} // namespace MovingBoxToy
diff --git a/MovingBoxToy/test/circle.par b/MovingBoxToy/test/circle.par
index ccdcd0b6e..5b20d271f 100644
--- a/MovingBoxToy/test/circle.par
+++ b/MovingBoxToy/test/circle.par
@@ -1,9 +1,9 @@
 ActiveThorns = "
-    MovingBoxToy
     BoxInBox
     CarpetX
     CoordinatesX
     IOUtil
+    MovingBoxToy
 "
 
 Cactus::cctk_show_schedule = no
@@ -45,6 +45,7 @@ Cactus::cctk_itlast = 5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -53,8 +54,7 @@ CarpetX::out_norm_omit_unstable = yes
 CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
-
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000000.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000000.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000001.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000001.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000001.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000002.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000002.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000002.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000003.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000003.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000003.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000004.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000004.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000004.z.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.x.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.x.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.x.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.x.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.y.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.y.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.y.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.y.tsv
diff --git a/MovingBoxToy/test/circle/carpetx-regrid_error.it000005.z.tsv b/MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.z.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/carpetx-regrid_error.it000005.z.tsv
rename to MovingBoxToy/test/circle/carpetxregrid-regrid_error.it000005.z.tsv
diff --git a/MovingBoxToy/test/circle/norms/carpetx-regrid_error.tsv b/MovingBoxToy/test/circle/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from MovingBoxToy/test/circle/norms/carpetx-regrid_error.tsv
rename to MovingBoxToy/test/circle/norms/carpetxregrid-regrid_error.tsv
diff --git a/ODESolvers/param.ccl b/ODESolvers/param.ccl
index 8c3dc1f78..99af2d3f8 100644
--- a/ODESolvers/param.ccl
+++ b/ODESolvers/param.ccl
@@ -20,6 +20,6 @@ BOOLEAN verbose "Verbose output" STEERABLE=always
 } "no"
 
 
-SHARES: CarpetX
+SHARES: Driver
 
 USES BOOLEAN use_subcycling_wip
diff --git a/ODESolvers/schedule.ccl b/ODESolvers/schedule.ccl
index 690f71bd0..acdd4c45c 100644
--- a/ODESolvers/schedule.ccl
+++ b/ODESolvers/schedule.ccl
@@ -98,6 +98,34 @@ else {
 
 
 
+# Define all groups without scheduling them
+
+  SCHEDULE GROUP ODESolvers_BaseGrid
+  {
+  } "Set up constants (e.g. coordinates) everywhere on the grid"
+  
+  SCHEDULE GROUP ODESolvers_Initial
+  {
+  } "Set up initial conditions on interior of state vector"
+  
+  SCHEDULE GROUP ODESolvers_PostStep
+  {
+  } "Apply boundary conditions to state vector, and project if necessary"
+  
+  SCHEDULE GROUP ODESolvers_RHS
+  {
+  } "Evaluate RHS for of state vector everywhere on the grid"
+
+  SCHEDULE GROUP ODESolvers_EstimateError
+  {
+  } "Estimate discretization error (for regridding)"
+
+  SCHEDULE GROUP ODESolvers_Analysis
+  {
+  } "Calculate analysis quantities everywhere"
+
+
+
 # Initialization
 
   SCHEDULE GROUP ODESolvers_BaseGrid AT basegrid
@@ -112,25 +140,45 @@ else {
   {
   } "Apply boundary conditions to state vector, and project if necessary"
   
-  SCHEDULE GROUP ODESolvers_RHS AT postinitial AFTER ODESolvers_PostStep
-  {
-  } "Evaluate RHS for of state vector everywhere on the grid"
-  
+  # SCHEDULE GROUP ODESolvers_RHS AT postinitial AFTER ODESolvers_PostStep
+  # {
+  # } "Evaluate RHS for of state vector everywhere on the grid"
+
   SCHEDULE GROUP ODESolvers_EstimateError AT postinitial AFTER (ODESolvers_PostStep, ODESolvers_RHS)
   {
   } "Estimate discretization error (for regridding)"
 
-# Time evolution
+# Recovering
 
-  # This group will also be scheduled dynamically from ODESolvers_solve
-  SCHEDULE GROUP ODESolvers_PostStep AT poststep
+  SCHEDULE GROUP ODESolvers_PostStep AT post_recover_variables
   {
   } "Apply boundary conditions to state vector, and project if necessary"
-  
-  # This group will also be scheduled dynamically from ODESolvers_solve
-  SCHEDULE GROUP ODESolvers_RHS AT poststep AFTER ODESolvers_PostStep
+
+  # SCHEDULE GROUP ODESolvers_RHS AT post_recover_variables AFTER ODESolvers_PostStep
+  # {
+  # } "Evaluate RHS for of state vector everywhere on the grid"
+
+  SCHEDULE GROUP ODESolvers_EstimateError AT post_recover_variables AFTER (ODESolvers_PostStep, ODESolvers_RHS)
   {
-  } "Evaluate the RHS for of state vector everywhere on the grid"
+  } "Estimate discretization error (for regridding)"
+
+# Regridding
+
+  SCHEDULE GROUP ODESolvers_PostStep AT postregrid
+  {
+  } "Apply boundary conditions to state vector, and project if necessary"
+
+# Time evolution
+
+  # # This group will also be scheduled dynamically from ODESolvers_solve
+  # SCHEDULE GROUP ODESolvers_PostStep AT poststep
+  # {
+  # } "Apply boundary conditions to state vector, and project if necessary"
+  
+  # # This group will also be scheduled dynamically from ODESolvers_solve
+  # SCHEDULE GROUP ODESolvers_RHS AT poststep AFTER ODESolvers_PostStep
+  # {
+  # } "Evaluate the RHS for of state vector everywhere on the grid"
   
   # # This group will also be scheduled dynamically from ODESolvers_solve
   # SCHEDULE GROUP ODESolvers_ImplicitStep AT poststep AFTER ODESolvers_PostStep
@@ -141,12 +189,6 @@ else {
   {
   } "Estimate discretization error (for regridding)"
 
-# Regridding
-
-  SCHEDULE GROUP ODESolvers_PostStep AT postregrid
-  {
-  } "Apply boundary conditions to state vector, and project if necessary"
-
 # Restricting
 
   SCHEDULE GROUP ODESolvers_PostStep AT postrestrict
diff --git a/PoissonX/par/poissonx-fd4.par b/PoissonX/par/poissonx-fd4.par
index fea9f23b0..44b40bf3d 100644
--- a/PoissonX/par/poissonx-fd4.par
+++ b/PoissonX/par/poissonx-fd4.par
@@ -27,9 +27,9 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 2
 
diff --git a/PoissonX/par/poissonx-logo.par b/PoissonX/par/poissonx-logo.par
index 382d13bca..4d1449257 100644
--- a/PoissonX/par/poissonx-logo.par
+++ b/PoissonX/par/poissonx-logo.par
@@ -26,9 +26,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
diff --git a/PoissonX/par/poissonx-rl2.par b/PoissonX/par/poissonx-rl2.par
index 7ba049dee..ed6f5896e 100644
--- a/PoissonX/par/poissonx-rl2.par
+++ b/PoissonX/par/poissonx-rl2.par
@@ -28,15 +28,15 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
 CarpetX::max_num_levels = 2
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.5 / 2.0
+Driver::regrid_error_threshold = 2.5 / 2.0
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 1
diff --git a/PoissonX/par/poissonx-rl4.par b/PoissonX/par/poissonx-rl4.par
index f00e55de3..a736563a1 100644
--- a/PoissonX/par/poissonx-rl4.par
+++ b/PoissonX/par/poissonx-rl4.par
@@ -28,15 +28,15 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
 CarpetX::max_num_levels = 4
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.5 / 2.0
+Driver::regrid_error_threshold = 2.5 / 2.0
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 1
diff --git a/PoissonX/par/poissonx.par b/PoissonX/par/poissonx.par
index ffb7fe9ab..66c9bc013 100644
--- a/PoissonX/par/poissonx.par
+++ b/PoissonX/par/poissonx.par
@@ -27,9 +27,9 @@ CarpetX::ncells_x = 16
 CarpetX::ncells_y = 16
 CarpetX::ncells_z = 16
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::ghost_size = 1
 
diff --git a/SIMDWaveToyX/par/standing.par b/SIMDWaveToyX/par/standing.par
index 219f6ca89..baf5da08b 100644
--- a/SIMDWaveToyX/par/standing.par
+++ b/SIMDWaveToyX/par/standing.par
@@ -13,9 +13,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/SIMDWaveToyX/schedule.ccl b/SIMDWaveToyX/schedule.ccl
index e4d12c231..465c680cf 100644
--- a/SIMDWaveToyX/schedule.ccl
+++ b/SIMDWaveToyX/schedule.ccl
@@ -8,23 +8,29 @@ SCHEDULE SIMDWaveToyX_Initial AT initial
   WRITES: state(interior)
 } "Initialize scalar wave state"
 
+SCHEDULE SIMDWaveToyX_Boundaries IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: state
+} "Apply boundary conditions"
+
 SCHEDULE SIMDWaveToyX_RHS IN ODESolvers_RHS
 {
   LANG: C
   READS: state(everywhere)
   WRITES: rhs(interior)
-  # Sync for test output
-  SYNC: rhs
 } "Calculate scalar wave RHS"
 
-SCHEDULE SIMDWaveToyX_Boundaries IN ODESolvers_PostStep
+SCHEDULE SIMDWaveToyX_RHS AT analysis
 {
   LANG: C
-  OPTIONS: global
-  SYNC: state
-} "Apply boundary conditions"
+  READS: state(everywhere)
+  WRITES: rhs(interior)
+  SYNC: rhs
+} "Calculate scalar wave RHS for output"
 
-SCHEDULE SIMDWaveToyX_Energy IN ODESolvers_PostStep AFTER SIMDWaveToyX_Boundaries
+SCHEDULE SIMDWaveToyX_Energy AT analysis
 {
   LANG: C
   READS: state(everywhere)
@@ -32,7 +38,7 @@ SCHEDULE SIMDWaveToyX_Energy IN ODESolvers_PostStep AFTER SIMDWaveToyX_Boundarie
   SYNC: energy
 } "Calculate scalar wave energy density"
 
-SCHEDULE SIMDWaveToyX_Error IN ODESolvers_PostStep
+SCHEDULE SIMDWaveToyX_Error AT analysis
 {
   LANG: C
   READS: state(interior)
diff --git a/SIMDWaveToyX/test/standing.par b/SIMDWaveToyX/test/standing.par
index b18695e5a..f614dc657 100644
--- a/SIMDWaveToyX/test/standing.par
+++ b/SIMDWaveToyX/test/standing.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    CarpetXRegrid
     IOUtil
     ODESolvers
     SIMDWaveToyX
@@ -14,9 +15,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -26,6 +28,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/SIMDWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/SIMDWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from SIMDWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to SIMDWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/par/standing.par b/SpacetimeWaveToyX/par/standing.par
index b5f24dbd5..55ae25ff8 100644
--- a/SpacetimeWaveToyX/par/standing.par
+++ b/SpacetimeWaveToyX/par/standing.par
@@ -12,9 +12,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/SpacetimeWaveToyX/test/standing.par b/SpacetimeWaveToyX/test/standing.par
index 5bc0e9dc3..1135d15b4 100644
--- a/SpacetimeWaveToyX/test/standing.par
+++ b/SpacetimeWaveToyX/test/standing.par
@@ -15,9 +15,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
@@ -26,6 +27,8 @@ SpacetimeWaveToyX::initial_condition = "standing wave"
 
 IO::out_dir = $parfile
 IO::out_every = $out_every
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_norm_vars = "all"
diff --git a/SpacetimeWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/SpacetimeWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from SpacetimeWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to SpacetimeWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/SpacetimeWaveToyX/test/standing/standing.par b/SpacetimeWaveToyX/test/standing/standing.par
deleted file mode 100644
index 0cd26083e..000000000
--- a/SpacetimeWaveToyX/test/standing/standing.par
+++ /dev/null
@@ -1,49 +0,0 @@
-ActiveThorns = "
-    CarpetX
-    IOUtil
-    SpacetimeWaveToyX
-"
-
-$out_every = 16
-
-Cactus::cctk_show_schedule = no
-Cactus::presync_mode = "mixed-error"
-
-CarpetX::poison_undefined_values = yes
-
-CarpetX::ncells_x = 8
-CarpetX::ncells_y = 8
-CarpetX::ncells_z = 8
-
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
-
-Cactus::terminate = "time"
-Cactus::cctk_final_time = 1.0
-
-SpacetimeWaveToyX::initial_condition = "standing wave"
-
-IO::out_dir = $parfile
-IO::out_every = $out_every
-
-CarpetX::out_metadata = no
-CarpetX::out_norm_vars = "all"
-CarpetX::out_norm_omit_unstable = yes
-
-CarpetX::out_tsv_vars = "
-    SpacetimeWaveToyX::ustate
-    SpacetimeWaveToyX::ftstate
-    SpacetimeWaveToyX::fxstate
-    SpacetimeWaveToyX::fystate
-    SpacetimeWaveToyX::fzstate
-    SpacetimeWaveToyX::curlfx
-    SpacetimeWaveToyX::curlfy
-    SpacetimeWaveToyX::curlfz
-    SpacetimeWaveToyX::energy
-    SpacetimeWaveToyX::uerror
-    SpacetimeWaveToyX::fterror
-    SpacetimeWaveToyX::fxerror
-    SpacetimeWaveToyX::fyerror
-    SpacetimeWaveToyX::fzerror
-"
diff --git a/StaggeredWaveToyX/par/standing.par b/StaggeredWaveToyX/par/standing.par
index b1a2ca2ae..8f38ca903 100644
--- a/StaggeredWaveToyX/par/standing.par
+++ b/StaggeredWaveToyX/par/standing.par
@@ -14,9 +14,10 @@ Cactus::presync_mode = "mixed-error"
 CarpetX::verbose = no
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/StaggeredWaveToyX/schedule.ccl b/StaggeredWaveToyX/schedule.ccl
index f607f389f..00dae5227 100644
--- a/StaggeredWaveToyX/schedule.ccl
+++ b/StaggeredWaveToyX/schedule.ccl
@@ -11,7 +11,30 @@ SCHEDULE StaggeredWaveToyX_Initial AT initial
   WRITES: fzstate(interior)
 } "Initialize scalar wave state"
 
+SCHEDULE StaggeredWaveToyX_Boundaries IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: ustate
+  SYNC: fxstate
+  SYNC: fystate
+  SYNC: fzstate
+} "Apply boundary conditions to scalar wave state"
+
 SCHEDULE StaggeredWaveToyX_RHS IN ODESolvers_RHS
+{
+  LANG: C
+  READS: ustate(everywhere)
+  READS: fxstate(everywhere)
+  READS: fystate(everywhere)
+  READS: fzstate(everywhere)
+  WRITES: urhs(interior)
+  WRITES: fxrhs(interior)
+  WRITES: fyrhs(interior)
+  WRITES: fzrhs(interior)
+} "Calculate scalar wave RHS"
+
+SCHEDULE StaggeredWaveToyX_RHS AT analysis
 {
   LANG: C
   READS: ustate(everywhere)
@@ -27,19 +50,9 @@ SCHEDULE StaggeredWaveToyX_RHS IN ODESolvers_RHS
   SYNC: fxrhs
   SYNC: fyrhs
   SYNC: fzrhs
-} "Calculate scalar wave RHS"
-
-SCHEDULE StaggeredWaveToyX_Boundaries IN ODESolvers_PostStep
-{
-  LANG: C
-  OPTIONS: global
-  SYNC: ustate
-  SYNC: fxstate
-  SYNC: fystate
-  SYNC: fzstate
-} "Apply boundary conditions to scalar wave state"
+} "Calculate scalar wave RHS for output"
 
-SCHEDULE StaggeredWaveToyX_Constraints IN ODESolvers_PostStep
+SCHEDULE StaggeredWaveToyX_Constraints AT analysis
 {
   LANG: C
   READS: fxstate(interior)
@@ -53,7 +66,7 @@ SCHEDULE StaggeredWaveToyX_Constraints IN ODESolvers_PostStep
   SYNC: curlfz
 } "Calculate scalar wave constraints"
 
-SCHEDULE StaggeredWaveToyX_Energy IN ODESolvers_PostStep
+SCHEDULE StaggeredWaveToyX_Energy AT analysis
 {
   LANG: C
   READS: ustate(interior)
@@ -64,7 +77,7 @@ SCHEDULE StaggeredWaveToyX_Energy IN ODESolvers_PostStep
   SYNC: energy
 } "Calculate scalar wave energy density"
 
-SCHEDULE StaggeredWaveToyX_Error IN ODESolvers_PostStep
+SCHEDULE StaggeredWaveToyX_Error AT analysis
 {
   LANG: C
   READS: ustate(interior)
diff --git a/StaggeredWaveToyX/test/standing.par b/StaggeredWaveToyX/test/standing.par
index 59086a9a2..202ab61f9 100644
--- a/StaggeredWaveToyX/test/standing.par
+++ b/StaggeredWaveToyX/test/standing.par
@@ -17,9 +17,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -29,6 +30,8 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = $out_every
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_norm_vars = "all"
diff --git a/StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/StaggeredWaveToyX/test/standing/standing.par b/StaggeredWaveToyX/test/standing/standing.par
deleted file mode 100644
index c7b9a407d..000000000
--- a/StaggeredWaveToyX/test/standing/standing.par
+++ /dev/null
@@ -1,53 +0,0 @@
-ActiveThorns = "
-    CarpetX
-    IOUtil
-    ODESolvers
-    StaggeredWaveToyX
-"
-
-$out_every = 16
-
-Cactus::cctk_show_schedule = no
-Cactus::presync_mode = "mixed-error"
-
-CarpetX::poison_undefined_values = yes
-
-CarpetX::ncells_x = 8
-CarpetX::ncells_y = 8
-CarpetX::ncells_z = 8
-
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
-
-Cactus::cctk_itlast = 10
-
-StaggeredWaveToyX::initial_condition = "standing wave"
-
-ODESolvers::method = "RK3"
-
-IO::out_dir = $parfile
-IO::out_every = $out_every
-
-CarpetX::out_metadata = no
-CarpetX::out_norm_vars = "all"
-CarpetX::out_norm_omit_unstable = yes
-
-CarpetX::out_tsv_vars = "
-    StaggeredWaveToyX::ustate
-    StaggeredWaveToyX::fxstate
-    StaggeredWaveToyX::fystate
-    StaggeredWaveToyX::fzstate
-    StaggeredWaveToyX::urhs
-    StaggeredWaveToyX::fxrhs
-    StaggeredWaveToyX::fyrhs
-    StaggeredWaveToyX::fzrhs
-    StaggeredWaveToyX::curlfx
-    StaggeredWaveToyX::curlfy
-    StaggeredWaveToyX::curlfz
-    StaggeredWaveToyX::energy
-    StaggeredWaveToyX::uerror
-    StaggeredWaveToyX::fxerror
-    StaggeredWaveToyX::fyerror
-    StaggeredWaveToyX::fzerror
-"
diff --git a/Subcycling/param.ccl b/Subcycling/param.ccl
index a6476d94a..cf6dab739 100644
--- a/Subcycling/param.ccl
+++ b/Subcycling/param.ccl
@@ -1,5 +1,5 @@
 # Parameter definitions for thorn Subcycling
 
-SHARES: CarpetX
+SHARES: Driver
 
 USES BOOLEAN use_subcycling_wip
diff --git a/TestArrayGroup/test/testarraygroup.par b/TestArrayGroup/test/testarraygroup.par
index 89ba45c3b..5739f7c42 100644
--- a/TestArrayGroup/test/testarraygroup.par
+++ b/TestArrayGroup/test/testarraygroup.par
@@ -21,8 +21,9 @@ CarpetX::max_num_levels = $nlevels
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "
diff --git a/TestBoundaries/par/test_boundaries.par b/TestBoundaries/par/test_boundaries.par
index 4c1b16c20..e5270bbf3 100644
--- a/TestBoundaries/par/test_boundaries.par
+++ b/TestBoundaries/par/test_boundaries.par
@@ -1,5 +1,6 @@
 ActiveThorns = "
     CarpetX
+    CarpetXRegrid
     IOUtil
     TestBoundaries
 "
diff --git a/TestBoxInBox/test/moving.par b/TestBoxInBox/test/moving.par
index 204da46bc..748f29f6d 100644
--- a/TestBoxInBox/test/moving.par
+++ b/TestBoxInBox/test/moving.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    CarpetXRegrid
     CoordinatesX
     IOUtil
     TestBoxInBox
@@ -33,6 +34,7 @@ Cactus::cctk_itlast = 10
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -40,7 +42,7 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
diff --git a/TestDerivs/interface.ccl b/TestDerivs/interface.ccl
index 6bff8cf65..827f05bf4 100644
--- a/TestDerivs/interface.ccl
+++ b/TestDerivs/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn TestDerivs
 IMPLEMENTS: TestDerivs
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx
diff --git a/TestDerivs/schedule.ccl b/TestDerivs/schedule.ccl
index 89fee5e2b..a459bf4c7 100644
--- a/TestDerivs/schedule.ccl
+++ b/TestDerivs/schedule.ccl
@@ -7,7 +7,7 @@ STORAGE: ddchi
 SCHEDULE TestDerivs_SetError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestDerivs_Set AT initial
diff --git a/TestDerivs/src/test.cxx b/TestDerivs/src/test.cxx
index 2cff0854b..e87aaac1f 100644
--- a/TestDerivs/src/test.cxx
+++ b/TestDerivs/src/test.cxx
@@ -117,7 +117,7 @@ extern "C" void TestDerivs_Set(CCTK_ARGUMENTS) {
         const CCTK_REAL z0 = p.z;
         chi.store(
             mask, p.I,
-            poly(kxx, kxy, kyz, Arith::cos(x0), std::sin(y0), std::sin(z0)));
+            poly(kxx, kxy, kyz, cos(x0), std::sin(y0), std::sin(z0)));
       });
 
   grid.loop_int_device<0, 0, 0>(
diff --git a/TestDerivs/test/derivs-2nd-order.par b/TestDerivs/test/derivs-2nd-order.par
index 28463b30a..4585fc9e4 100644
--- a/TestDerivs/test/derivs-2nd-order.par
+++ b/TestDerivs/test/derivs-2nd-order.par
@@ -25,9 +25,10 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +40,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestDerivs/test/derivs-4th-order.par b/TestDerivs/test/derivs-4th-order.par
index caf5f383b..b60e4b717 100644
--- a/TestDerivs/test/derivs-4th-order.par
+++ b/TestDerivs/test/derivs-4th-order.par
@@ -25,9 +25,10 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +40,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestDerivs/test/derivs-6th-order.par b/TestDerivs/test/derivs-6th-order.par
index 3d2eb3a59..0d1b99937 100644
--- a/TestDerivs/test/derivs-6th-order.par
+++ b/TestDerivs/test/derivs-6th-order.par
@@ -25,9 +25,10 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +40,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
@@ -53,7 +54,7 @@ TestDerivs::kxy = 1.0
 TestDerivs::kyz = 1.0
 
 IO::out_dir = $parfile
-IO::out_fileinfo = "none"
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = "no"
 IO::out_every = 1
 
diff --git a/TestDerivs/test/derivs-8th-order.par b/TestDerivs/test/derivs-8th-order.par
index 8b8e60224..edd762926 100644
--- a/TestDerivs/test/derivs-8th-order.par
+++ b/TestDerivs/test/derivs-8th-order.par
@@ -25,9 +25,10 @@ CarpetX::xmax = 0.1234567+$pi
 CarpetX::ymax = 0.2345678+$pi
 CarpetX::zmax = 0.3456789+$pi
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
@@ -39,7 +40,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestInterpolate/param.ccl b/TestInterpolate/param.ccl
index 76a603bec..5e9d0372c 100644
--- a/TestInterpolate/param.ccl
+++ b/TestInterpolate/param.ccl
@@ -1 +1,9 @@
 # Parameter definitions for thorn TestInterpolate
+
+BOOLEAN test_cell_interpolation "Test cell interpolation"
+{
+} "no"
+
+BOOLEAN test_vertex_interpolation "Test vertex interpolation"
+{
+} "no"
diff --git a/TestInterpolate/schedule.ccl b/TestInterpolate/schedule.ccl
index f109007c2..1a731235b 100644
--- a/TestInterpolate/schedule.ccl
+++ b/TestInterpolate/schedule.ccl
@@ -4,10 +4,22 @@ STORAGE: results_interpolate
 STORAGE: results_driver_interpolate
 STORAGE: reference
 
-SCHEDULE TestInterpolate_test_interpolation AT poststep
-{
-  LANG: C
-  OPTIONS: global
-  READS: CoordinatesX::vertex_coords(everywhere)
-  WRITES: results_interpolate, results_driver_interpolate, reference
-} "Test interpolation operators"
+if (test_cell_interpolation) {
+  SCHEDULE TestInterpolate_test_vertex_interpolation AT poststep
+  {
+    LANG: C
+    OPTIONS: global
+    READS: CoordinatesX::vertex_coords(everywhere)
+    WRITES: results_interpolate, results_driver_interpolate, reference
+  } "Test vertex interpolation operators"
+}
+
+if (test_vertex_interpolation) {
+  SCHEDULE TestInterpolate_test_cell_interpolation AT poststep
+  {
+    LANG: C
+    OPTIONS: global
+    READS: CoordinatesX::cell_coords(everywhere)
+    WRITES: results_interpolate, results_driver_interpolate, reference
+  } "Test cell interpolation operators"
+}
diff --git a/TestInterpolate/src/make.code.defn b/TestInterpolate/src/make.code.defn
index 75bb611fb..ba4354c54 100644
--- a/TestInterpolate/src/make.code.defn
+++ b/TestInterpolate/src/make.code.defn
@@ -1,7 +1,7 @@
 # Main make.code.defn file for thorn TestInterpolate
 
 # Source files in this directory
-SRCS = test_interpolation.cxx
+SRCS = test_cell_interpolation.cxx test_vertex_interpolation.cxx
 
 # Subdirectories containing source files
 SUBDIRS =
diff --git a/TestInterpolate/src/test_cell_interpolation.cxx b/TestInterpolate/src/test_cell_interpolation.cxx
new file mode 100644
index 000000000..75c45e4da
--- /dev/null
+++ b/TestInterpolate/src/test_cell_interpolation.cxx
@@ -0,0 +1,163 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <util_Table.h>
+
+namespace TestInterpolate {
+
+#define DIM(v) ((int)(sizeof(v)/sizeof((v)[0])))
+
+extern "C" void TestInterpolate_test_cell_interpolation(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTS_TestInterpolate_test_cell_interpolation;
+
+  constexpr CCTK_INT N_dims = 3;
+
+  const CCTK_INT all_operations[1 + N_dims + N_dims*(N_dims-1)] = {0, 1, 2, 3, 11, 12, 13, 22, 23, 33};
+
+  const CCTK_INT all_varinds[N_dims] = {
+      CCTK_VarIndex("CoordinatesX::ccoordx"),
+      CCTK_VarIndex("CoordinatesX::ccoordy"),
+      CCTK_VarIndex("CoordinatesX::ccoordz"),
+  };
+
+  constexpr int nvars = DIM(all_varinds) * DIM(all_operations);
+
+  CCTK_INT varinds[DIM(all_operations)][DIM(all_varinds)];
+  CCTK_INT operations[DIM(all_operations)][DIM(all_varinds)];
+  for (int op = 0 ; op < DIM(all_operations) ; op++) {
+    for (int var = 0 ; var < DIM(all_varinds) ; var++) {
+      varinds[op][var] = all_varinds[var];
+      operations[op][var] = all_operations[op];
+    }
+  }
+
+  constexpr int npoints = 4;
+  const CCTK_REAL coords[N_dims][npoints] = {
+      {0.1, 0.2, 0.3, 0.1},
+      {0.1, 0.2, 0.3, 0.2},
+      {0.1, 0.2, 0.3, 0.3},
+  };
+
+  CCTK_REAL *resultptrs[DIM(all_operations)][DIM(all_varinds)] = {
+    interpolate_x_o1_op0,
+    interpolate_y_o1_op0,
+    interpolate_z_o1_op0,
+
+    interpolate_x_o1_op1, interpolate_y_o1_op1, interpolate_z_o1_op1,
+    interpolate_x_o1_op2, interpolate_y_o1_op2, interpolate_z_o1_op2,
+    interpolate_x_o1_op3, interpolate_y_o1_op3, interpolate_z_o1_op3,
+
+    interpolate_x_o1_op11, interpolate_y_o1_op11, interpolate_z_o1_op11,
+    interpolate_x_o1_op12, interpolate_y_o1_op12, interpolate_z_o1_op12,
+    interpolate_x_o1_op13, interpolate_y_o1_op13, interpolate_z_o1_op13,
+    interpolate_x_o1_op22, interpolate_y_o1_op22, interpolate_z_o1_op22,
+    interpolate_x_o1_op23, interpolate_y_o1_op23, interpolate_z_o1_op23,
+    interpolate_x_o1_op33, interpolate_y_o1_op33, interpolate_z_o1_op33,
+  };
+  CCTK_REAL *resultptrs2[DIM(all_operations)][DIM(all_varinds)] = {
+    driver_interpolate_x_o1_op0,
+    driver_interpolate_y_o1_op0,
+    driver_interpolate_z_o1_op0,
+
+    driver_interpolate_x_o1_op1, driver_interpolate_y_o1_op1, driver_interpolate_z_o1_op1,
+    driver_interpolate_x_o1_op2, driver_interpolate_y_o1_op2, driver_interpolate_z_o1_op2,
+    driver_interpolate_x_o1_op3, driver_interpolate_y_o1_op3, driver_interpolate_z_o1_op3,
+
+    driver_interpolate_x_o1_op11, driver_interpolate_y_o1_op11, driver_interpolate_z_o1_op11,
+    driver_interpolate_x_o1_op12, driver_interpolate_y_o1_op12, driver_interpolate_z_o1_op12,
+    driver_interpolate_x_o1_op13, driver_interpolate_y_o1_op13, driver_interpolate_z_o1_op13,
+    driver_interpolate_x_o1_op22, driver_interpolate_y_o1_op22, driver_interpolate_z_o1_op22,
+    driver_interpolate_x_o1_op23, driver_interpolate_y_o1_op23, driver_interpolate_z_o1_op23,
+    driver_interpolate_x_o1_op33, driver_interpolate_y_o1_op33, driver_interpolate_z_o1_op33,
+  };
+  CCTK_REAL *referenceptrs[DIM(all_operations)][DIM(all_varinds)] = {
+    reference_x_o1_op0,
+    reference_y_o1_op0,
+    reference_z_o1_op0,
+
+    reference_x_o1_op1, reference_y_o1_op1, reference_z_o1_op1,
+    reference_x_o1_op2, reference_y_o1_op2, reference_z_o1_op2,
+    reference_x_o1_op3, reference_y_o1_op3, reference_z_o1_op3,
+
+    reference_x_o1_op11, reference_y_o1_op11, reference_z_o1_op11,
+    reference_x_o1_op12, reference_y_o1_op12, reference_z_o1_op12,
+    reference_x_o1_op13, reference_y_o1_op13, reference_z_o1_op13,
+    reference_x_o1_op22, reference_y_o1_op22, reference_z_o1_op22,
+    reference_x_o1_op23, reference_y_o1_op23, reference_z_o1_op23,
+    reference_x_o1_op33, reference_y_o1_op33, reference_z_o1_op33,
+  };
+
+  Interpolate(cctkGH, npoints, coords[0], coords[1], coords[2], nvars,
+      (CCTK_INT const * const)varinds, (CCTK_INT const * const)operations, 1,
+      (CCTK_REAL **)resultptrs);
+
+  const void* interp_coords[N_dims] = {
+    coords[0], coords[1], coords[2]
+  };
+  void *const *output_array = (void *const *)resultptrs2;
+
+  /* DriverInterpolate arguments that aren't currently used */
+  CCTK_INT const coord_system_handle = 0;
+  CCTK_INT const interp_coords_type_code = 0;
+  CCTK_INT const output_array_type_codes[1] = {0};
+  int interp_handle = CCTK_InterpHandle("CarpetX");
+
+  if(interp_handle < 0)
+    CCTK_VERROR("Could not obtain inteprolator handle for built-in 'CarpetX' interpolator: %d", interp_handle);
+
+  /* Table generation */
+  int operands[DIM(all_operations)][DIM(all_varinds)];
+  for (int op = 0 ; op < DIM(all_operations) ; op++) {
+    for (int var = 0 ; var < DIM(all_varinds) ; var++) {
+      operands[op][var] = var;
+    }
+  }
+
+  int ierr;
+  int param_table_handle = Util_TableCreate(UTIL_TABLE_FLAGS_DEFAULT);
+  if (param_table_handle < 0)
+    CCTK_VERROR("Can't create parameter table: %d", param_table_handle);
+  if ((ierr = Util_TableSetInt(param_table_handle, 1, "order")) < 0)
+    CCTK_VERROR("Can't set order in parameter table: %d", ierr);
+  if ((ierr = Util_TableSetIntArray(param_table_handle, nvars, (int const*const)operands,
+                            "operand_indices")) < 0)
+    CCTK_VERROR("Can't set operand_indices array in parameter table: %d", ierr);
+  if ((ierr = Util_TableSetIntArray(param_table_handle, nvars, (int const*const)operations,
+                            "operation_codes")) < 0)
+    CCTK_VERROR("Can't set operation_codes array in parameter table: %d", ierr);
+
+  DriverInterpolate(
+      cctkGH, N_dims, interp_handle, param_table_handle, coord_system_handle,
+      npoints, interp_coords_type_code, interp_coords, nvars, (int const*const)varinds,
+      nvars, output_array_type_codes, output_array);
+
+  for (int op = 0 ; op < DIM(all_operations) ; op++) {
+    for (int var = 0 ; var < DIM(all_varinds) ; var++) {
+      for (int n = 0; n < npoints; ++n) {
+        const int operand = operations[op][var];
+        switch (operand) {
+        case 0:
+          referenceptrs[op][var][n] = coords[var][n];
+          break;
+        case 1:
+        case 2:
+        case 3:
+          referenceptrs[op][var][n] = (operand - 1 == var ? 1. : 0.);
+          break;
+        case 11:
+        case 12:
+        case 13:
+        case 22:
+        case 23:
+        case 33:
+          referenceptrs[op][var][n] = 0.;
+          break;
+        default:
+          CCTK_VERROR("Unsupported derivative operator %d", operand);
+          break;
+        }
+      }
+    }
+  }
+}
+
+} // namespace TestInterpolate
diff --git a/TestInterpolate/src/test_interpolation.cxx b/TestInterpolate/src/test_vertex_interpolation.cxx
similarity index 97%
rename from TestInterpolate/src/test_interpolation.cxx
rename to TestInterpolate/src/test_vertex_interpolation.cxx
index 54c32e214..c9b63de5d 100644
--- a/TestInterpolate/src/test_interpolation.cxx
+++ b/TestInterpolate/src/test_vertex_interpolation.cxx
@@ -6,8 +6,8 @@ namespace TestInterpolate {
 
 #define DIM(v) ((int)(sizeof(v)/sizeof((v)[0])))
 
-extern "C" void TestInterpolate_test_interpolation(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTS_TestInterpolate_test_interpolation;
+extern "C" void TestInterpolate_test_vertex_interpolation(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTS_TestInterpolate_test_vertex_interpolation;
 
   constexpr CCTK_INT N_dims = 3;
 
diff --git a/TestInterpolate/test/interpolate.par b/TestInterpolate/test/cell_interpolate.par
similarity index 87%
rename from TestInterpolate/test/interpolate.par
rename to TestInterpolate/test/cell_interpolate.par
index e9038e00c..269d468c6 100644
--- a/TestInterpolate/test/interpolate.par
+++ b/TestInterpolate/test/cell_interpolate.par
@@ -31,12 +31,14 @@ CarpetX::ncells_z = $ncells
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 16
-CarpetX::regrid_error_threshold = 5.0
+Driver::regrid_error_threshold = 5.0
 
 CarpetX::prolongation_type = "ddf"
 
+TestInterpolate::test_cell_interpolation = yes
+
 IO::out_dir = $parfile
-IO::out_fileinfo = "none"
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = "no"
 IO::out_every = 1
 
diff --git a/TestInterpolate/test/interpolate/testinterpolate-reference.it000000.tsv b/TestInterpolate/test/cell_interpolate/testinterpolate-reference.it000000.tsv
similarity index 100%
rename from TestInterpolate/test/interpolate/testinterpolate-reference.it000000.tsv
rename to TestInterpolate/test/cell_interpolate/testinterpolate-reference.it000000.tsv
diff --git a/TestInterpolate/test/interpolate/testinterpolate-results_driver_interpolate.it000000.tsv b/TestInterpolate/test/cell_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
similarity index 100%
rename from TestInterpolate/test/interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
rename to TestInterpolate/test/cell_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
diff --git a/TestInterpolate/test/interpolate/testinterpolate-results_interpolate.it000000.tsv b/TestInterpolate/test/cell_interpolate/testinterpolate-results_interpolate.it000000.tsv
similarity index 100%
rename from TestInterpolate/test/interpolate/testinterpolate-results_interpolate.it000000.tsv
rename to TestInterpolate/test/cell_interpolate/testinterpolate-results_interpolate.it000000.tsv
diff --git a/TestInterpolate/test/vertex_interpolate.par b/TestInterpolate/test/vertex_interpolate.par
new file mode 100644
index 000000000..78e652743
--- /dev/null
+++ b/TestInterpolate/test/vertex_interpolate.par
@@ -0,0 +1,50 @@
+ActiveThorns = "
+    CarpetX
+    CoordinatesX
+    IOUtil
+    TestInterpolate
+"
+
+$nlevels = 3
+$ncells = 32
+
+Cactus::cctk_show_schedule = no
+Cactus::presync_mode = "mixed-error"
+
+Cactus::terminate = "time"
+Cactus::cctk_final_time = 0
+
+CarpetX::verbose = no
+CarpetX::poison_undefined_values = yes
+
+CarpetX::xmin = -1.0
+CarpetX::ymin = -1.0
+CarpetX::zmin = -1.0
+
+CarpetX::xmax = +1.0
+CarpetX::ymax = +1.0
+CarpetX::zmax = +1.0
+
+CarpetX::ncells_x = $ncells
+CarpetX::ncells_y = $ncells
+CarpetX::ncells_z = $ncells
+
+CarpetX::max_num_levels = $nlevels
+CarpetX::regrid_every = 16
+Driver::regrid_error_threshold = 5.0
+
+CarpetX::prolongation_type = "ddf"
+
+TestInterpolate::test_vertex_interpolation = yes
+
+IO::out_dir = $parfile
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = "no"
+IO::out_every = 1
+
+CarpetX::out_metadata = no
+CarpetX::out_tsv_vars = "
+    TestInterpolate::reference
+    TestInterpolate::results_driver_interpolate
+    TestInterpolate::results_interpolate
+"
diff --git a/TestInterpolate/test/vertex_interpolate/testinterpolate-reference.it000000.tsv b/TestInterpolate/test/vertex_interpolate/testinterpolate-reference.it000000.tsv
new file mode 100644
index 000000000..6cdfcd147
--- /dev/null
+++ b/TestInterpolate/test/vertex_interpolate/testinterpolate-reference.it000000.tsv
@@ -0,0 +1,2 @@
+# 1:iteration	2:time	3:reference_x_o1_op0[0]	4:reference_x_o1_op0[1]	5:reference_x_o1_op0[2]	6:reference_x_o1_op0[3]	7:reference_y_o1_op0[0]	8:reference_y_o1_op0[1]	9:reference_y_o1_op0[2]	10:reference_y_o1_op0[3]	11:reference_z_o1_op0[0]	12:reference_z_o1_op0[1]	13:reference_z_o1_op0[2]	14:reference_z_o1_op0[3]	15:reference_x_o1_op1[0]	16:reference_x_o1_op1[1]	17:reference_x_o1_op1[2]	18:reference_x_o1_op1[3]	19:reference_y_o1_op1[0]	20:reference_y_o1_op1[1]	21:reference_y_o1_op1[2]	22:reference_y_o1_op1[3]	23:reference_z_o1_op1[0]	24:reference_z_o1_op1[1]	25:reference_z_o1_op1[2]	26:reference_z_o1_op1[3]	27:reference_x_o1_op2[0]	28:reference_x_o1_op2[1]	29:reference_x_o1_op2[2]	30:reference_x_o1_op2[3]	31:reference_y_o1_op2[0]	32:reference_y_o1_op2[1]	33:reference_y_o1_op2[2]	34:reference_y_o1_op2[3]	35:reference_z_o1_op2[0]	36:reference_z_o1_op2[1]	37:reference_z_o1_op2[2]	38:reference_z_o1_op2[3]	39:reference_x_o1_op3[0]	40:reference_x_o1_op3[1]	41:reference_x_o1_op3[2]	42:reference_x_o1_op3[3]	43:reference_y_o1_op3[0]	44:reference_y_o1_op3[1]	45:reference_y_o1_op3[2]	46:reference_y_o1_op3[3]	47:reference_z_o1_op3[0]	48:reference_z_o1_op3[1]	49:reference_z_o1_op3[2]	50:reference_z_o1_op3[3]	51:reference_x_o1_op11[0]	52:reference_x_o1_op11[1]	53:reference_x_o1_op11[2]	54:reference_x_o1_op11[3]	55:reference_y_o1_op11[0]	56:reference_y_o1_op11[1]	57:reference_y_o1_op11[2]	58:reference_y_o1_op11[3]	59:reference_z_o1_op11[0]	60:reference_z_o1_op11[1]	61:reference_z_o1_op11[2]	62:reference_z_o1_op11[3]	63:reference_x_o1_op12[0]	64:reference_x_o1_op12[1]	65:reference_x_o1_op12[2]	66:reference_x_o1_op12[3]	67:reference_y_o1_op12[0]	68:reference_y_o1_op12[1]	69:reference_y_o1_op12[2]	70:reference_y_o1_op12[3]	71:reference_z_o1_op12[0]	72:reference_z_o1_op12[1]	73:reference_z_o1_op12[2]	74:reference_z_o1_op12[3]	75:reference_x_o1_op13[0]	76:reference_x_o1_op13[1]	77:reference_x_o1_op13[2]	78:reference_x_o1_op13[3]	79:reference_y_o1_op13[0]	80:reference_y_o1_op13[1]	81:reference_y_o1_op13[2]	82:reference_y_o1_op13[3]	83:reference_z_o1_op13[0]	84:reference_z_o1_op13[1]	85:reference_z_o1_op13[2]	86:reference_z_o1_op13[3]	87:reference_x_o1_op22[0]	88:reference_x_o1_op22[1]	89:reference_x_o1_op22[2]	90:reference_x_o1_op22[3]	91:reference_y_o1_op22[0]	92:reference_y_o1_op22[1]	93:reference_y_o1_op22[2]	94:reference_y_o1_op22[3]	95:reference_z_o1_op22[0]	96:reference_z_o1_op22[1]	97:reference_z_o1_op22[2]	98:reference_z_o1_op22[3]	99:reference_x_o1_op23[0]	100:reference_x_o1_op23[1]	101:reference_x_o1_op23[2]	102:reference_x_o1_op23[3]	103:reference_y_o1_op23[0]	104:reference_y_o1_op23[1]	105:reference_y_o1_op23[2]	106:reference_y_o1_op23[3]	107:reference_z_o1_op23[0]	108:reference_z_o1_op23[1]	109:reference_z_o1_op23[2]	110:reference_z_o1_op23[3]	111:reference_x_o1_op33[0]	112:reference_x_o1_op33[1]	113:reference_x_o1_op33[2]	114:reference_x_o1_op33[3]	115:reference_y_o1_op33[0]	116:reference_y_o1_op33[1]	117:reference_y_o1_op33[2]	118:reference_y_o1_op33[3]	119:reference_z_o1_op33[0]	120:reference_z_o1_op33[1]	121:reference_z_o1_op33[2]	122:reference_z_o1_op33[3]
+0	0.0000000000000000e+00	1.0000000000000001e-01	2.0000000000000001e-01	2.9999999999999999e-01	1.0000000000000001e-01	1.0000000000000001e-01	2.0000000000000001e-01	2.9999999999999999e-01	2.0000000000000001e-01	1.0000000000000001e-01	2.0000000000000001e-01	2.9999999999999999e-01	2.9999999999999999e-01	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestInterpolate/test/vertex_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv b/TestInterpolate/test/vertex_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
new file mode 100644
index 000000000..b35affd79
--- /dev/null
+++ b/TestInterpolate/test/vertex_interpolate/testinterpolate-results_driver_interpolate.it000000.tsv
@@ -0,0 +1,2 @@
+# 1:iteration	2:time	3:driver_interpolate_x_o1_op0[0]	4:driver_interpolate_x_o1_op0[1]	5:driver_interpolate_x_o1_op0[2]	6:driver_interpolate_x_o1_op0[3]	7:driver_interpolate_y_o1_op0[0]	8:driver_interpolate_y_o1_op0[1]	9:driver_interpolate_y_o1_op0[2]	10:driver_interpolate_y_o1_op0[3]	11:driver_interpolate_z_o1_op0[0]	12:driver_interpolate_z_o1_op0[1]	13:driver_interpolate_z_o1_op0[2]	14:driver_interpolate_z_o1_op0[3]	15:driver_interpolate_x_o1_op1[0]	16:driver_interpolate_x_o1_op1[1]	17:driver_interpolate_x_o1_op1[2]	18:driver_interpolate_x_o1_op1[3]	19:driver_interpolate_y_o1_op1[0]	20:driver_interpolate_y_o1_op1[1]	21:driver_interpolate_y_o1_op1[2]	22:driver_interpolate_y_o1_op1[3]	23:driver_interpolate_z_o1_op1[0]	24:driver_interpolate_z_o1_op1[1]	25:driver_interpolate_z_o1_op1[2]	26:driver_interpolate_z_o1_op1[3]	27:driver_interpolate_x_o1_op2[0]	28:driver_interpolate_x_o1_op2[1]	29:driver_interpolate_x_o1_op2[2]	30:driver_interpolate_x_o1_op2[3]	31:driver_interpolate_y_o1_op2[0]	32:driver_interpolate_y_o1_op2[1]	33:driver_interpolate_y_o1_op2[2]	34:driver_interpolate_y_o1_op2[3]	35:driver_interpolate_z_o1_op2[0]	36:driver_interpolate_z_o1_op2[1]	37:driver_interpolate_z_o1_op2[2]	38:driver_interpolate_z_o1_op2[3]	39:driver_interpolate_x_o1_op3[0]	40:driver_interpolate_x_o1_op3[1]	41:driver_interpolate_x_o1_op3[2]	42:driver_interpolate_x_o1_op3[3]	43:driver_interpolate_y_o1_op3[0]	44:driver_interpolate_y_o1_op3[1]	45:driver_interpolate_y_o1_op3[2]	46:driver_interpolate_y_o1_op3[3]	47:driver_interpolate_z_o1_op3[0]	48:driver_interpolate_z_o1_op3[1]	49:driver_interpolate_z_o1_op3[2]	50:driver_interpolate_z_o1_op3[3]	51:driver_interpolate_x_o1_op11[0]	52:driver_interpolate_x_o1_op11[1]	53:driver_interpolate_x_o1_op11[2]	54:driver_interpolate_x_o1_op11[3]	55:driver_interpolate_y_o1_op11[0]	56:driver_interpolate_y_o1_op11[1]	57:driver_interpolate_y_o1_op11[2]	58:driver_interpolate_y_o1_op11[3]	59:driver_interpolate_z_o1_op11[0]	60:driver_interpolate_z_o1_op11[1]	61:driver_interpolate_z_o1_op11[2]	62:driver_interpolate_z_o1_op11[3]	63:driver_interpolate_x_o1_op12[0]	64:driver_interpolate_x_o1_op12[1]	65:driver_interpolate_x_o1_op12[2]	66:driver_interpolate_x_o1_op12[3]	67:driver_interpolate_y_o1_op12[0]	68:driver_interpolate_y_o1_op12[1]	69:driver_interpolate_y_o1_op12[2]	70:driver_interpolate_y_o1_op12[3]	71:driver_interpolate_z_o1_op12[0]	72:driver_interpolate_z_o1_op12[1]	73:driver_interpolate_z_o1_op12[2]	74:driver_interpolate_z_o1_op12[3]	75:driver_interpolate_x_o1_op13[0]	76:driver_interpolate_x_o1_op13[1]	77:driver_interpolate_x_o1_op13[2]	78:driver_interpolate_x_o1_op13[3]	79:driver_interpolate_y_o1_op13[0]	80:driver_interpolate_y_o1_op13[1]	81:driver_interpolate_y_o1_op13[2]	82:driver_interpolate_y_o1_op13[3]	83:driver_interpolate_z_o1_op13[0]	84:driver_interpolate_z_o1_op13[1]	85:driver_interpolate_z_o1_op13[2]	86:driver_interpolate_z_o1_op13[3]	87:driver_interpolate_x_o1_op22[0]	88:driver_interpolate_x_o1_op22[1]	89:driver_interpolate_x_o1_op22[2]	90:driver_interpolate_x_o1_op22[3]	91:driver_interpolate_y_o1_op22[0]	92:driver_interpolate_y_o1_op22[1]	93:driver_interpolate_y_o1_op22[2]	94:driver_interpolate_y_o1_op22[3]	95:driver_interpolate_z_o1_op22[0]	96:driver_interpolate_z_o1_op22[1]	97:driver_interpolate_z_o1_op22[2]	98:driver_interpolate_z_o1_op22[3]	99:driver_interpolate_x_o1_op23[0]	100:driver_interpolate_x_o1_op23[1]	101:driver_interpolate_x_o1_op23[2]	102:driver_interpolate_x_o1_op23[3]	103:driver_interpolate_y_o1_op23[0]	104:driver_interpolate_y_o1_op23[1]	105:driver_interpolate_y_o1_op23[2]	106:driver_interpolate_y_o1_op23[3]	107:driver_interpolate_z_o1_op23[0]	108:driver_interpolate_z_o1_op23[1]	109:driver_interpolate_z_o1_op23[2]	110:driver_interpolate_z_o1_op23[3]	111:driver_interpolate_x_o1_op33[0]	112:driver_interpolate_x_o1_op33[1]	113:driver_interpolate_x_o1_op33[2]	114:driver_interpolate_x_o1_op33[3]	115:driver_interpolate_y_o1_op33[0]	116:driver_interpolate_y_o1_op33[1]	117:driver_interpolate_y_o1_op33[2]	118:driver_interpolate_y_o1_op33[3]	119:driver_interpolate_z_o1_op33[0]	120:driver_interpolate_z_o1_op33[1]	121:driver_interpolate_z_o1_op33[2]	122:driver_interpolate_z_o1_op33[3]
+0	0.0000000000000000e+00	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	1.0000000000000009e-01	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	1.9999999999999996e-01	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	3.0000000000000004e-01	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestInterpolate/test/vertex_interpolate/testinterpolate-results_interpolate.it000000.tsv b/TestInterpolate/test/vertex_interpolate/testinterpolate-results_interpolate.it000000.tsv
new file mode 100644
index 000000000..286f1740e
--- /dev/null
+++ b/TestInterpolate/test/vertex_interpolate/testinterpolate-results_interpolate.it000000.tsv
@@ -0,0 +1,2 @@
+# 1:iteration	2:time	3:interpolate_x_o1_op0[0]	4:interpolate_x_o1_op0[1]	5:interpolate_x_o1_op0[2]	6:interpolate_x_o1_op0[3]	7:interpolate_y_o1_op0[0]	8:interpolate_y_o1_op0[1]	9:interpolate_y_o1_op0[2]	10:interpolate_y_o1_op0[3]	11:interpolate_z_o1_op0[0]	12:interpolate_z_o1_op0[1]	13:interpolate_z_o1_op0[2]	14:interpolate_z_o1_op0[3]	15:interpolate_x_o1_op1[0]	16:interpolate_x_o1_op1[1]	17:interpolate_x_o1_op1[2]	18:interpolate_x_o1_op1[3]	19:interpolate_y_o1_op1[0]	20:interpolate_y_o1_op1[1]	21:interpolate_y_o1_op1[2]	22:interpolate_y_o1_op1[3]	23:interpolate_z_o1_op1[0]	24:interpolate_z_o1_op1[1]	25:interpolate_z_o1_op1[2]	26:interpolate_z_o1_op1[3]	27:interpolate_x_o1_op2[0]	28:interpolate_x_o1_op2[1]	29:interpolate_x_o1_op2[2]	30:interpolate_x_o1_op2[3]	31:interpolate_y_o1_op2[0]	32:interpolate_y_o1_op2[1]	33:interpolate_y_o1_op2[2]	34:interpolate_y_o1_op2[3]	35:interpolate_z_o1_op2[0]	36:interpolate_z_o1_op2[1]	37:interpolate_z_o1_op2[2]	38:interpolate_z_o1_op2[3]	39:interpolate_x_o1_op3[0]	40:interpolate_x_o1_op3[1]	41:interpolate_x_o1_op3[2]	42:interpolate_x_o1_op3[3]	43:interpolate_y_o1_op3[0]	44:interpolate_y_o1_op3[1]	45:interpolate_y_o1_op3[2]	46:interpolate_y_o1_op3[3]	47:interpolate_z_o1_op3[0]	48:interpolate_z_o1_op3[1]	49:interpolate_z_o1_op3[2]	50:interpolate_z_o1_op3[3]	51:interpolate_x_o1_op11[0]	52:interpolate_x_o1_op11[1]	53:interpolate_x_o1_op11[2]	54:interpolate_x_o1_op11[3]	55:interpolate_y_o1_op11[0]	56:interpolate_y_o1_op11[1]	57:interpolate_y_o1_op11[2]	58:interpolate_y_o1_op11[3]	59:interpolate_z_o1_op11[0]	60:interpolate_z_o1_op11[1]	61:interpolate_z_o1_op11[2]	62:interpolate_z_o1_op11[3]	63:interpolate_x_o1_op12[0]	64:interpolate_x_o1_op12[1]	65:interpolate_x_o1_op12[2]	66:interpolate_x_o1_op12[3]	67:interpolate_y_o1_op12[0]	68:interpolate_y_o1_op12[1]	69:interpolate_y_o1_op12[2]	70:interpolate_y_o1_op12[3]	71:interpolate_z_o1_op12[0]	72:interpolate_z_o1_op12[1]	73:interpolate_z_o1_op12[2]	74:interpolate_z_o1_op12[3]	75:interpolate_x_o1_op13[0]	76:interpolate_x_o1_op13[1]	77:interpolate_x_o1_op13[2]	78:interpolate_x_o1_op13[3]	79:interpolate_y_o1_op13[0]	80:interpolate_y_o1_op13[1]	81:interpolate_y_o1_op13[2]	82:interpolate_y_o1_op13[3]	83:interpolate_z_o1_op13[0]	84:interpolate_z_o1_op13[1]	85:interpolate_z_o1_op13[2]	86:interpolate_z_o1_op13[3]	87:interpolate_x_o1_op22[0]	88:interpolate_x_o1_op22[1]	89:interpolate_x_o1_op22[2]	90:interpolate_x_o1_op22[3]	91:interpolate_y_o1_op22[0]	92:interpolate_y_o1_op22[1]	93:interpolate_y_o1_op22[2]	94:interpolate_y_o1_op22[3]	95:interpolate_z_o1_op22[0]	96:interpolate_z_o1_op22[1]	97:interpolate_z_o1_op22[2]	98:interpolate_z_o1_op22[3]	99:interpolate_x_o1_op23[0]	100:interpolate_x_o1_op23[1]	101:interpolate_x_o1_op23[2]	102:interpolate_x_o1_op23[3]	103:interpolate_y_o1_op23[0]	104:interpolate_y_o1_op23[1]	105:interpolate_y_o1_op23[2]	106:interpolate_y_o1_op23[3]	107:interpolate_z_o1_op23[0]	108:interpolate_z_o1_op23[1]	109:interpolate_z_o1_op23[2]	110:interpolate_z_o1_op23[3]	111:interpolate_x_o1_op33[0]	112:interpolate_x_o1_op33[1]	113:interpolate_x_o1_op33[2]	114:interpolate_x_o1_op33[3]	115:interpolate_y_o1_op33[0]	116:interpolate_y_o1_op33[1]	117:interpolate_y_o1_op33[2]	118:interpolate_y_o1_op33[3]	119:interpolate_z_o1_op33[0]	120:interpolate_z_o1_op33[1]	121:interpolate_z_o1_op33[2]	122:interpolate_z_o1_op33[3]
+0	0.0000000000000000e+00	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	1.0000000000000009e-01	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	1.9999999999999996e-01	1.0000000000000009e-01	1.9999999999999996e-01	3.0000000000000004e-01	3.0000000000000004e-01	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestLoopX/interface.ccl b/TestLoopX/interface.ccl
index 8bf2c7784..1ca8ace82 100644
--- a/TestLoopX/interface.ccl
+++ b/TestLoopX/interface.ccl
@@ -1,8 +1,6 @@
 # Interface definition for thorn TestLoopX
 IMPLEMENTS: TestLoopX
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop.hxx
 USES INCLUDE HEADER: loop_device.hxx
 
diff --git a/TestLoopX/test/testloopx_outermost_interior.par b/TestLoopX/test/testloopx_outermost_interior.par
index 9560d6ea9..601add74f 100644
--- a/TestLoopX/test/testloopx_outermost_interior.par
+++ b/TestLoopX/test/testloopx_outermost_interior.par
@@ -19,9 +19,10 @@ CarpetX::xmax = +10
 CarpetX::ymax = +10
 CarpetX::zmax = +10
 
-CarpetX::periodic_x = "yes"
-CarpetX::periodic_y = "yes"
-CarpetX::periodic_z = "yes"
+Driver::periodic = "yes"
+Driver::periodic_x = "yes"
+Driver::periodic_y = "yes"
+Driver::periodic_z = "yes"
 
 CarpetX::ncells_x = 40
 CarpetX::ncells_y = 40
@@ -29,7 +30,7 @@ CarpetX::ncells_z = 40
 
 CarpetX::max_num_levels = 1
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
@@ -38,10 +39,11 @@ CarpetX::prolongation_order = 5
 CarpetX::ghost_size = 3
 
 IO::out_dir = $parfile
-IO::out_fileinfo = "none"
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "
   TestLoopX::testloop_gf
 "
diff --git a/TestNorms/interface.ccl b/TestNorms/interface.ccl
index fd4cbfe08..29d87ff0a 100644
--- a/TestNorms/interface.ccl
+++ b/TestNorms/interface.ccl
@@ -1,6 +1,6 @@
 # Interface definition for thorn TestNorms
 implements: TestNorms
-inherits: CarpetX
+inherits: Driver, CarpetXRegrid
 
 uses include header: loop.hxx
 
diff --git a/TestNorms/schedule.ccl b/TestNorms/schedule.ccl
index a570af2ed..95f895383 100644
--- a/TestNorms/schedule.ccl
+++ b/TestNorms/schedule.ccl
@@ -12,7 +12,7 @@ STORAGE: gf111
 SCHEDULE TestNorms_SetError AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestNorms_Set AT initial
diff --git a/TestNorms/test/norms.par b/TestNorms/test/norms.par
index be6a3cb59..d8c35823c 100644
--- a/TestNorms/test/norms.par
+++ b/TestNorms/test/norms.par
@@ -37,7 +37,7 @@ CarpetX::blocking_factor_z = $blocking_factor
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestNorms/test/norms/norms/carpetx-regrid_error.tsv b/TestNorms/test/norms/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestNorms/test/norms/norms/carpetx-regrid_error.tsv
rename to TestNorms/test/norms/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/schedule.ccl b/TestODESolvers/schedule.ccl
index e98e105ce..094994d37 100644
--- a/TestODESolvers/schedule.ccl
+++ b/TestODESolvers/schedule.ccl
@@ -11,19 +11,26 @@ SCHEDULE TestODESolvers_Initial AT initial
   WRITES: state2(everywhere)
 } "Initialize state vector"
 
+SCHEDULE TestODESolvers_PostStep IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: state state2
+} "Synchronize"
+
 SCHEDULE TestODESolvers_RHS IN ODESolvers_RHS
 {
   LANG: C
   READS: state(everywhere), state2(everywhere)
   WRITES: rhs(everywhere), rhs2(everywhere)
-} "RHS function"
+} "Calculate RHS"
 
-SCHEDULE TestODESolvers_PostStep IN ODESolvers_PostStep
+SCHEDULE TestODESolvers_RHS AT analysis
 {
   LANG: C
-  OPTIONS: global
-  SYNC: state state2
-} "Synchronize"
+  READS: state(everywhere), state2(everywhere)
+  WRITES: rhs(everywhere), rhs2(everywhere)
+} "Calculate RHS for output"
 
 SCHEDULE TestODESolvers_Error AT analysis
 {
diff --git a/TestODESolvers/test/test-constant.par b/TestODESolvers/test/test-constant.par
index 5907663bf..cc2d47833 100644
--- a/TestODESolvers/test/test-constant.par
+++ b/TestODESolvers/test/test-constant.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-constant/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-constant/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-constant/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-constant/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-dp87.par b/TestODESolvers/test/test-dp87.par
index 56d3a9f7f..16873d493 100644
--- a/TestODESolvers/test/test-dp87.par
+++ b/TestODESolvers/test/test-dp87.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.03
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-dp87/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-dp87/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-dp87/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-dp87/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-euler.par b/TestODESolvers/test/test-euler.par
index b27bac15a..a7844524f 100644
--- a/TestODESolvers/test/test-euler.par
+++ b/TestODESolvers/test/test-euler.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-euler/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-euler/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-euler/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-euler/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk2.par b/TestODESolvers/test/test-rk2.par
index c9c765cf4..8fd062b2c 100644
--- a/TestODESolvers/test/test-rk2.par
+++ b/TestODESolvers/test/test-rk2.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk2/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk2/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk2/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk2/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk3.par b/TestODESolvers/test/test-rk3.par
index 917514ee3..4169e6b8a 100644
--- a/TestODESolvers/test/test-rk3.par
+++ b/TestODESolvers/test/test-rk3.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk3/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk3/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk3/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rk4.par b/TestODESolvers/test/test-rk4.par
index 9eb8cd0ce..b4dc50c77 100644
--- a/TestODESolvers/test/test-rk4.par
+++ b/TestODESolvers/test/test-rk4.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rk4/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rk4/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rk4/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rk4/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-rkf78.par b/TestODESolvers/test/test-rkf78.par
index 70a64672e..55211a171 100644
--- a/TestODESolvers/test/test-rkf78.par
+++ b/TestODESolvers/test/test-rkf78.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.01
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-rkf78/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-rkf78/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-rkf78/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-rkf78/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers/test/test-ssprk3.par b/TestODESolvers/test/test-ssprk3.par
index cc06470ce..13c0952be 100644
--- a/TestODESolvers/test/test-ssprk3.par
+++ b/TestODESolvers/test/test-ssprk3.par
@@ -17,9 +17,10 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::dtfac = 0.001
 Cactus::cctk_itlast = 10
@@ -40,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 # TestODESolvers::corder requires larger tolerances (~1e-5)
 CarpetX::out_norm_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     # TestODESolvers::corder
     TestODESolvers::error
     TestODESolvers::error2
diff --git a/TestODESolvers/test/test-ssprk3/norms/carpetx-regrid_error.tsv b/TestODESolvers/test/test-ssprk3/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from TestODESolvers/test/test-ssprk3/norms/carpetx-regrid_error.tsv
rename to TestODESolvers/test/test-ssprk3/norms/carpetxregrid-regrid_error.tsv
diff --git a/TestODESolvers2/test/test-constant.par b/TestODESolvers2/test/test-constant.par
index 4b2f2bead..ba4bcae3e 100644
--- a/TestODESolvers2/test/test-constant.par
+++ b/TestODESolvers2/test/test-constant.par
@@ -39,9 +39,11 @@ ODESolvers::method = "constant"
 TestODESolvers2::porder = 0
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-dp87.par b/TestODESolvers2/test/test-dp87.par
index 2eec0a1cd..1f520224d 100644
--- a/TestODESolvers2/test/test-dp87.par
+++ b/TestODESolvers2/test/test-dp87.par
@@ -39,9 +39,11 @@ ODESolvers::method = "DP87"
 TestODESolvers2::porder = 8
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-euler.par b/TestODESolvers2/test/test-euler.par
index 123b1e984..dfe330434 100644
--- a/TestODESolvers2/test/test-euler.par
+++ b/TestODESolvers2/test/test-euler.par
@@ -39,9 +39,11 @@ ODESolvers::method = "Euler"
 TestODESolvers2::porder = 1
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-rk2.par b/TestODESolvers2/test/test-rk2.par
index bc7cdbbc4..7a38345cc 100644
--- a/TestODESolvers2/test/test-rk2.par
+++ b/TestODESolvers2/test/test-rk2.par
@@ -39,9 +39,11 @@ ODESolvers::method = "RK2"
 TestODESolvers2::porder = 2
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-rk3.par b/TestODESolvers2/test/test-rk3.par
index 6ad46a0bb..0b110fa97 100644
--- a/TestODESolvers2/test/test-rk3.par
+++ b/TestODESolvers2/test/test-rk3.par
@@ -39,9 +39,11 @@ ODESolvers::method = "RK3"
 TestODESolvers2::porder = 3
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-rk4.par b/TestODESolvers2/test/test-rk4.par
index 4ada66742..747320539 100644
--- a/TestODESolvers2/test/test-rk4.par
+++ b/TestODESolvers2/test/test-rk4.par
@@ -39,9 +39,11 @@ ODESolvers::method = "RK4"
 TestODESolvers2::porder = 4
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-rkf78.par b/TestODESolvers2/test/test-rkf78.par
index 1de07472b..17aeec830 100644
--- a/TestODESolvers2/test/test-rkf78.par
+++ b/TestODESolvers2/test/test-rkf78.par
@@ -39,9 +39,11 @@ ODESolvers::method = "RKF78"
 TestODESolvers2::porder = 7
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestODESolvers2/test/test-ssprk3.par b/TestODESolvers2/test/test-ssprk3.par
index 620bc7f4c..24860f9ca 100644
--- a/TestODESolvers2/test/test-ssprk3.par
+++ b/TestODESolvers2/test/test-ssprk3.par
@@ -39,9 +39,11 @@ ODESolvers::method = "SSPRK3"
 TestODESolvers2::porder = 3
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
+CarpetX::out_metadata = no
 CarpetX::out_norm_vars = ""
 
 CarpetX::out_tsv_vars = "
diff --git a/TestOutput/test/checkpoint-openpmd.par b/TestOutput/test/checkpoint-openpmd.par
index 13299182f..272292953 100644
--- a/TestOutput/test/checkpoint-openpmd.par
+++ b/TestOutput/test/checkpoint-openpmd.par
@@ -26,8 +26,9 @@ CarpetX::boundary_upper_y = "linear extrapolation"
 CarpetX::boundary_upper_z = "linear extrapolation"
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 
diff --git a/TestOutput/test/output-arrays.par b/TestOutput/test/output-arrays.par
index 774e4dd61..111cddebc 100644
--- a/TestOutput/test/output-arrays.par
+++ b/TestOutput/test/output-arrays.par
@@ -26,8 +26,9 @@ CarpetX::boundary_upper_y = "linear extrapolation"
 CarpetX::boundary_upper_z = "linear extrapolation"
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 
diff --git a/TestOutput/test/output-every0.par b/TestOutput/test/output-every0.par
index fd550de0a..57780a433 100644
--- a/TestOutput/test/output-every0.par
+++ b/TestOutput/test/output-every0.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 0
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-every1.par b/TestOutput/test/output-every1.par
index c8aad7f56..337bcd775 100644
--- a/TestOutput/test/output-every1.par
+++ b/TestOutput/test/output-every1.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-every3.par b/TestOutput/test/output-every3.par
index 1233c8162..f46785f15 100644
--- a/TestOutput/test/output-every3.par
+++ b/TestOutput/test/output-every3.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 3
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-openpmd.par b/TestOutput/test/output-openpmd.par
index bbcd56bbe..bfba1cfab 100644
--- a/TestOutput/test/output-openpmd.par
+++ b/TestOutput/test/output-openpmd.par
@@ -26,8 +26,9 @@ CarpetX::boundary_upper_y = "linear extrapolation"
 CarpetX::boundary_upper_z = "linear extrapolation"
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 
diff --git a/TestOutput/test/output-tsv-every0.par b/TestOutput/test/output-tsv-every0.par
index bed1d05ed..31a66d45b 100644
--- a/TestOutput/test/output-tsv-every0.par
+++ b/TestOutput/test/output-tsv-every0.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 CarpetX::out_tsv_every = 0
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-tsv-every1.par b/TestOutput/test/output-tsv-every1.par
index 623916a87..d4d8b8b9d 100644
--- a/TestOutput/test/output-tsv-every1.par
+++ b/TestOutput/test/output-tsv-every1.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 CarpetX::out_tsv_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/output-tsv-every3.par b/TestOutput/test/output-tsv-every3.par
index 330317b6a..d81c0ae31 100644
--- a/TestOutput/test/output-tsv-every3.par
+++ b/TestOutput/test/output-tsv-every3.par
@@ -12,8 +12,9 @@ CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 CarpetX::out_tsv_every = 3
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "CoordinatesX::cell_volume"
diff --git a/TestOutput/test/recover-openpmd.par b/TestOutput/test/recover-openpmd.par
index 017ecc7b4..64bdb3613 100644
--- a/TestOutput/test/recover-openpmd.par
+++ b/TestOutput/test/recover-openpmd.par
@@ -28,8 +28,9 @@ CarpetX::boundary_upper_y = "linear extrapolation"
 CarpetX::boundary_upper_z = "linear extrapolation"
 
 IO::out_dir = $parfile
-IO::parfile_write = "no"
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
+IO::parfile_write = no
 
 CarpetX::out_metadata = no
 
diff --git a/TestProlongate/interface.ccl b/TestProlongate/interface.ccl
index d68ba3ed8..65917e470 100644
--- a/TestProlongate/interface.ccl
+++ b/TestProlongate/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: TestProlongate
 
-INHERITS: CarpetX
+INHERITS: CarpetXRegrid
 
 USES INCLUDE HEADER: loop.hxx
 
diff --git a/TestProlongate/schedule.ccl b/TestProlongate/schedule.ccl
index fd796129e..f122993da 100644
--- a/TestProlongate/schedule.ccl
+++ b/TestProlongate/schedule.ccl
@@ -50,13 +50,13 @@ STORAGE: gf111_sum_count
 SCHEDULE TestProlongate_Regrid AT postinitial
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 SCHEDULE TestProlongate_Regrid AT poststep
 {
   LANG: C
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Set up test grid"
 
 
diff --git a/TestProlongate/test/test_cc_co_o1.par b/TestProlongate/test/test_cc_co_o1.par
index e8a4b932b..06eec6550 100644
--- a/TestProlongate/test/test_cc_co_o1.par
+++ b/TestProlongate/test/test_cc_co_o1.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_cc_nc_o1.par b/TestProlongate/test/test_cc_nc_o1.par
index edcf87344..e20fb2374 100644
--- a/TestProlongate/test/test_cc_nc_o1.par
+++ b/TestProlongate/test/test_cc_nc_o1.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_cc_nc_o3.par b/TestProlongate/test/test_cc_nc_o3.par
index f920b1b80..54e4d0b71 100644
--- a/TestProlongate/test/test_cc_nc_o3.par
+++ b/TestProlongate/test/test_cc_nc_o3.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_ddf_o1.par b/TestProlongate/test/test_ddf_o1.par
index 71aaf5253..faaad2b0c 100644
--- a/TestProlongate/test/test_ddf_o1.par
+++ b/TestProlongate/test/test_ddf_o1.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_ddf_o3.par b/TestProlongate/test/test_ddf_o3.par
index 6b43b15c9..4f7714062 100644
--- a/TestProlongate/test/test_ddf_o3.par
+++ b/TestProlongate/test/test_ddf_o3.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_ddf_o5.par b/TestProlongate/test/test_ddf_o5.par
index 9c692e127..0ea45b98f 100644
--- a/TestProlongate/test/test_ddf_o5.par
+++ b/TestProlongate/test/test_ddf_o5.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_ddf_o7.par b/TestProlongate/test/test_ddf_o7.par
index aefb3701e..7de28d33e 100644
--- a/TestProlongate/test/test_ddf_o7.par
+++ b/TestProlongate/test/test_ddf_o7.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_eno_o1.par b/TestProlongate/test/test_eno_o1.par
deleted file mode 100644
index 09e7edece..000000000
--- a/TestProlongate/test/test_eno_o1.par
+++ /dev/null
@@ -1,92 +0,0 @@
-ActiveThorns = "
-    CarpetX
-    IOUtil
-    TestProlongate
-"
-
-$nlevels = 2
-$ncells = 30
-$blocking_factor = 2
-
-Cactus::cctk_show_schedule = no
-
-Cactus::presync_mode = "mixed-error"
-
-Cactus::cctk_itlast = 2
-
-CarpetX::ghost_size = 1
-CarpetX::prolongation_type = "eno"
-CarpetX::prolongation_order = 1
-CarpetX::verbose = yes
-CarpetX::poison_undefined_values = yes
-
-CarpetX::xmin = -1.+0.1234567
-CarpetX::ymin = -1.+0.2345678
-CarpetX::zmin = -1.+0.3456789
-CarpetX::xmax = +1.+0.1234567
-CarpetX::ymax = +1.+0.2345678
-CarpetX::zmax = +1.+0.3456789
-
-CarpetX::ncells_x = $ncells
-CarpetX::ncells_y = $ncells
-CarpetX::ncells_z = $ncells
-
-CarpetX::blocking_factor_x = $blocking_factor
-CarpetX::blocking_factor_y = $blocking_factor
-CarpetX::blocking_factor_z = $blocking_factor
-
-CarpetX::boundary_x = "dirichlet"
-CarpetX::boundary_y = "dirichlet"
-CarpetX::boundary_z = "dirichlet"
-CarpetX::boundary_upper_x = "dirichlet"
-CarpetX::boundary_upper_y = "dirichlet"
-CarpetX::boundary_upper_z = "dirichlet"
-
-CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
-
-CarpetX::dtfac = 0.5
-
-IO::out_dir = $parfile
-IO::out_every = 1
-IO::parfile_write = no
-
-CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "
-    TestProlongate::gf000_error
-    TestProlongate::gf001_error
-    TestProlongate::gf010_error
-    TestProlongate::gf011_error
-    TestProlongate::gf100_error
-    TestProlongate::gf101_error
-    TestProlongate::gf110_error
-    TestProlongate::gf111_error
-
-    TestProlongate::gf000_count
-    TestProlongate::gf001_count
-    TestProlongate::gf010_count
-    TestProlongate::gf011_count
-    TestProlongate::gf100_count
-    TestProlongate::gf101_count
-    TestProlongate::gf110_count
-    TestProlongate::gf111_count
-
-    TestProlongate::gf000_max_error
-    TestProlongate::gf001_max_error
-    TestProlongate::gf010_max_error
-    TestProlongate::gf011_max_error
-    TestProlongate::gf100_max_error
-    TestProlongate::gf101_max_error
-    TestProlongate::gf110_max_error
-    TestProlongate::gf111_max_error
-
-    TestProlongate::gf000_sum_count
-    TestProlongate::gf001_sum_count
-    TestProlongate::gf010_sum_count
-    TestProlongate::gf011_sum_count
-    TestProlongate::gf100_sum_count
-    TestProlongate::gf101_sum_count
-    TestProlongate::gf110_sum_count
-    TestProlongate::gf111_sum_count
-"
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.x.tsv
deleted file mode 100644
index 3869bd73b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.y.tsv
deleted file mode 100644
index 8a17463e0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.z.tsv
deleted file mode 100644
index e3403e275..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.x.tsv
deleted file mode 100644
index 10107c02e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.y.tsv
deleted file mode 100644
index cfa032f4e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.z.tsv
deleted file mode 100644
index ef4224682..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.x.tsv
deleted file mode 100644
index 19e19441c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	2.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	20	3.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.y.tsv
deleted file mode 100644
index 78236ed18..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	-9.8766333333333289e-03	3.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.z.tsv
deleted file mode 100644
index 3dbc68853..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333323e-01	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.x.tsv
deleted file mode 100644
index c1003fe16..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.y.tsv
deleted file mode 100644
index c152dffa6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.z.tsv
deleted file mode 100644
index 5834398f1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.x.tsv
deleted file mode 100644
index 58437a3f1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.y.tsv
deleted file mode 100644
index cd63d6a47..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.z.tsv
deleted file mode 100644
index 52aa8d088..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.x.tsv
deleted file mode 100644
index a05cab405..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	2.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	20	3.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.y.tsv
deleted file mode 100644
index aa5d8b482..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	-9.8766333333333289e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.z.tsv
deleted file mode 100644
index cf48cc876..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	4.4408920985006262e-16
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	4.4408920985006262e-16
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	-1.1102230246251565e-16
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333323e-01	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000000.tsv
deleted file mode 100644
index 640e8674d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000001.tsv
deleted file mode 100644
index 1f1b15e9d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000002.tsv
deleted file mode 100644
index 163a5285b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000000.tsv
deleted file mode 100644
index 994716b8c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-0	0.0000000000000000e+00	2.4389000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000001.tsv
deleted file mode 100644
index 155b5b688..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-1	3.3333333333333333e-02	2.4389000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000002.tsv
deleted file mode 100644
index 852a08afa..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf000_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-2	5.0000000000000003e-02	3.5498000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.x.tsv
deleted file mode 100644
index 6cc4e38e0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.y.tsv
deleted file mode 100644
index b3d2c177e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.z.tsv
deleted file mode 100644
index 7bf55fbad..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.x.tsv
deleted file mode 100644
index 6bbd0cf6f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.y.tsv
deleted file mode 100644
index 8504e5825..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.z.tsv
deleted file mode 100644
index dad02a0d8..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.x.tsv
deleted file mode 100644
index f748b65cd..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.7654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.4320996666666670e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-3.0987663333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.7654330000000005e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.4320996666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-2.0987663333333340e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.7654330000000007e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.4320996666666674e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-1.0987663333333342e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-7.6543299999999981e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-4.3209966666666655e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	2.3456699999999997e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	5.6790033333333323e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	9.0123366666666649e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.2345669999999997e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.5679003333333319e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	1.9012336666666663e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.2345670000000006e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.5679003333333328e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	2.9012336666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.2345669999999993e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	19	3.5679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.y.tsv
deleted file mode 100644
index bc0e390df..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	-9.8766333333333289e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.z.tsv
deleted file mode 100644
index c6eb26121..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.3765443333333328e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.0432109999999996e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.7098776666666663e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.3765443333333325e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0432109999999992e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.7098776666666660e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.3765443333333327e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.0432109999999994e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-7.0987766666666618e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	9.5678900000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.2901223333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.6234556666666677e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.9567890000000010e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.2901223333333343e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.6234556666666675e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.9567890000000008e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.2901223333333340e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.6234556666666673e-01	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.x.tsv
deleted file mode 100644
index b2d31644d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.y.tsv
deleted file mode 100644
index 9e96b422d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.z.tsv
deleted file mode 100644
index bceb10794..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.x.tsv
deleted file mode 100644
index 698c83cb4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.y.tsv
deleted file mode 100644
index 45b3df83c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.z.tsv
deleted file mode 100644
index 389b4aac6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.x.tsv
deleted file mode 100644
index c99dc4ee2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.7654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.4320996666666670e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-3.0987663333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.7654330000000005e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.4320996666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-2.0987663333333340e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.7654330000000007e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.4320996666666674e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-1.0987663333333342e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-7.6543299999999981e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-4.3209966666666655e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	2.3456699999999997e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	5.6790033333333323e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	9.0123366666666649e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.2345669999999997e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.5679003333333319e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	1.9012336666666663e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.2345670000000006e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.5679003333333328e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	2.9012336666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.2345669999999993e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	19	3.5679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.y.tsv
deleted file mode 100644
index 5bd911bf6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	-9.8766333333333289e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.z.tsv
deleted file mode 100644
index 2580e30e5..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.6234556666666673e-01	-1.1102230246251565e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000000.tsv
deleted file mode 100644
index 8aaa20385..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000001.tsv
deleted file mode 100644
index ba016a022..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000002.tsv
deleted file mode 100644
index 9a6d847b0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000000.tsv
deleted file mode 100644
index 0560dda1f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-0	0.0000000000000000e+00	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000001.tsv
deleted file mode 100644
index 9311e6a80..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-1	3.3333333333333333e-02	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000002.tsv
deleted file mode 100644
index 2e22e23c6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf001_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-2	5.0000000000000003e-02	2.8878000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.x.tsv
deleted file mode 100644
index c270a0c22..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.y.tsv
deleted file mode 100644
index 617f9c67c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.z.tsv
deleted file mode 100644
index 61583baa8..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.x.tsv
deleted file mode 100644
index da3e4698b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.y.tsv
deleted file mode 100644
index 13499afb1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.z.tsv
deleted file mode 100644
index 50cf5a363..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.x.tsv
deleted file mode 100644
index be89799b6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.7654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.4320996666666670e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-3.0987663333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.7654330000000005e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.4320996666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-2.0987663333333340e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.7654330000000007e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.4320996666666674e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-1.0987663333333342e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-7.6543299999999981e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-4.3209966666666655e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	2.3456699999999997e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	5.6790033333333323e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	9.0123366666666649e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.2345669999999997e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.5679003333333319e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	1.9012336666666663e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.2345670000000006e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.5679003333333328e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	2.9012336666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.2345669999999993e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	20	3.5679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.y.tsv
deleted file mode 100644
index 6ee0eb103..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.1543219999999994e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.8209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.4876553333333329e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.1543219999999996e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.8209886666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.4876553333333331e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.1543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-8.2098866666666659e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	8.4567800000000082e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.1790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.5123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.8456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.1790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.5123446666666671e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.8456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.1790113333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.z.tsv
deleted file mode 100644
index 4f6d3b269..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	-9.8766333333333289e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.x.tsv
deleted file mode 100644
index 4c1174518..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.y.tsv
deleted file mode 100644
index 28eb6dc09..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.z.tsv
deleted file mode 100644
index e3a706072..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.x.tsv
deleted file mode 100644
index f6fbbeb5e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.y.tsv
deleted file mode 100644
index a2b27a65b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.z.tsv
deleted file mode 100644
index e1faae97a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.x.tsv
deleted file mode 100644
index f7a0d9cb4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.7654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.4320996666666670e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-3.0987663333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.7654330000000005e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.4320996666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-2.0987663333333340e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.7654330000000007e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.4320996666666674e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-1.0987663333333342e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-7.6543299999999981e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-4.3209966666666655e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	2.3456699999999997e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	5.6790033333333323e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	9.0123366666666649e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.2345669999999997e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.5679003333333319e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	1.9012336666666663e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.2345670000000006e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.5679003333333328e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	2.9012336666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.2345669999999993e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	20	3.5679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.y.tsv
deleted file mode 100644
index af8f07540..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.z.tsv
deleted file mode 100644
index a2808b31a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	-9.8766333333333289e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000000.tsv
deleted file mode 100644
index 4ad5545f4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000001.tsv
deleted file mode 100644
index f38a9e4d3..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000002.tsv
deleted file mode 100644
index f25c13f82..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000000.tsv
deleted file mode 100644
index 831636e0f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-0	0.0000000000000000e+00	1.9343000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000001.tsv
deleted file mode 100644
index 252486118..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-1	3.3333333333333333e-02	1.9343000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000002.tsv
deleted file mode 100644
index 44a5d6c33..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf010_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-2	5.0000000000000003e-02	2.7807000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.x.tsv
deleted file mode 100644
index ce8f7bba5..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.y.tsv
deleted file mode 100644
index b24c2c995..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.z.tsv
deleted file mode 100644
index 6b55f3073..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.x.tsv
deleted file mode 100644
index eb457c96d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.y.tsv
deleted file mode 100644
index 0329414b0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.z.tsv
deleted file mode 100644
index eda620794..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.x.tsv
deleted file mode 100644
index 512c767c1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.7654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.4320996666666670e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-3.0987663333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.7654330000000005e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.4320996666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-2.0987663333333340e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.7654330000000007e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.4320996666666674e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-1.0987663333333342e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-7.6543299999999981e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-4.3209966666666655e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	2.3456699999999997e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	5.6790033333333323e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	9.0123366666666649e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.2345669999999997e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.5679003333333319e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	1.9012336666666663e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.2345670000000006e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.5679003333333328e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	2.9012336666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.2345669999999993e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	19	3.5679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.y.tsv
deleted file mode 100644
index 9a0de4fe0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.z.tsv
deleted file mode 100644
index a7ad4fefa..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.x.tsv
deleted file mode 100644
index 600b066b8..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.y.tsv
deleted file mode 100644
index c7b5d8882..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.z.tsv
deleted file mode 100644
index f502c03e2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.x.tsv
deleted file mode 100644
index 0ca0f7540..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.y.tsv
deleted file mode 100644
index ca10fde33..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.z.tsv
deleted file mode 100644
index fb006b663..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.x.tsv
deleted file mode 100644
index 05a1b3eff..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.7654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.4320996666666670e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-3.0987663333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.7654330000000005e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.4320996666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-2.0987663333333340e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.7654330000000007e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.4320996666666674e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-1.0987663333333342e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-7.6543299999999981e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-4.3209966666666655e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	2.3456699999999997e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	5.6790033333333323e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	9.0123366666666649e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.2345669999999997e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.5679003333333319e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	1.9012336666666663e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.2345670000000006e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.5679003333333328e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	2.9012336666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.2345669999999993e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	19	3.5679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.y.tsv
deleted file mode 100644
index a32c45e1c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.z.tsv
deleted file mode 100644
index 18862b298..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000000.tsv
deleted file mode 100644
index 2e25eeaf3..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000001.tsv
deleted file mode 100644
index d90f3adbf..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000002.tsv
deleted file mode 100644
index 13f0acc27..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000000.tsv
deleted file mode 100644
index 6b31fcdd2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-0	0.0000000000000000e+00	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000001.tsv
deleted file mode 100644
index fd36e2d62..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-1	3.3333333333333333e-02	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000002.tsv
deleted file mode 100644
index 0f81273d8..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf011_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-2	5.0000000000000003e-02	2.2632000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.x.tsv
deleted file mode 100644
index afdf01f5e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.y.tsv
deleted file mode 100644
index 2b51fb32a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.z.tsv
deleted file mode 100644
index 321cda89c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.x.tsv
deleted file mode 100644
index 2a31cac2a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.y.tsv
deleted file mode 100644
index f2cabf814..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.z.tsv
deleted file mode 100644
index d81753740..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.x.tsv
deleted file mode 100644
index cf990aaab..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.5987663333333331e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.2654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-2.9320996666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.5987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.2654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-1.9320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.5987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.2654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-9.3209966666666699e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-5.9876633333333262e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-2.6543299999999936e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	4.0123366666666715e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	7.3456700000000041e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	1.0679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.4012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.7345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	2.0679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.4012336666666678e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.7345670000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	3.0679003333333343e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.4012336666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.y.tsv
deleted file mode 100644
index cec80ef98..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	6.7900333333333895e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.z.tsv
deleted file mode 100644
index 43628a2dc..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	6.7900333333333895e-03	1.2344666666666004e-03	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.x.tsv
deleted file mode 100644
index e23687467..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.y.tsv
deleted file mode 100644
index 8ae05b6a5..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.z.tsv
deleted file mode 100644
index 3f4606e1e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.x.tsv
deleted file mode 100644
index 2a1ba629a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.y.tsv
deleted file mode 100644
index ea4fb844c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.z.tsv
deleted file mode 100644
index f5984898e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.x.tsv
deleted file mode 100644
index 5f12eb36a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.5987663333333331e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.2654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-2.9320996666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.5987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.2654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-1.9320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.5987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.2654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-9.3209966666666699e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-5.9876633333333262e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-2.6543299999999936e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	4.0123366666666715e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	7.3456700000000041e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	1.0679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.4012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.7345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	2.0679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.4012336666666678e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.7345670000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	3.0679003333333343e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.4012336666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.y.tsv
deleted file mode 100644
index 831db8249..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	6.7900333333333895e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.z.tsv
deleted file mode 100644
index 3feadb781..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	6.7900333333333895e-03	1.2344666666666004e-03	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000000.tsv
deleted file mode 100644
index fbfbee33d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000001.tsv
deleted file mode 100644
index 68903ac0b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000002.tsv
deleted file mode 100644
index fe1017a32..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000000.tsv
deleted file mode 100644
index 369097728..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-0	0.0000000000000000e+00	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000001.tsv
deleted file mode 100644
index 83e4dc73b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-1	3.3333333333333333e-02	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000002.tsv
deleted file mode 100644
index a2c1e35e4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf100_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-2	5.0000000000000003e-02	2.8878000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.x.tsv
deleted file mode 100644
index 60ff3662e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.y.tsv
deleted file mode 100644
index 932731c29..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.z.tsv
deleted file mode 100644
index 999aaae94..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.x.tsv
deleted file mode 100644
index eb0f0b213..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.y.tsv
deleted file mode 100644
index b338baba9..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.z.tsv
deleted file mode 100644
index eca0239d2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.x.tsv
deleted file mode 100644
index b7a6cd27c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.5987663333333331e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.2654329999999998e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-2.9320996666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.5987663333333333e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.2654330000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-1.9320996666666668e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.5987663333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.2654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-9.3209966666666699e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-5.9876633333333262e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-2.6543299999999936e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	4.0123366666666715e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	7.3456700000000041e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	1.0679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.4012336666666669e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.7345669999999991e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	2.0679003333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.4012336666666678e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.7345670000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	3.0679003333333343e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.4012336666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.y.tsv
deleted file mode 100644
index 0c0de166d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	6.7900333333333895e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.z.tsv
deleted file mode 100644
index 44de168ad..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.x.tsv
deleted file mode 100644
index d74804be5..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.y.tsv
deleted file mode 100644
index 127b10ff6..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.z.tsv
deleted file mode 100644
index 358e61fe7..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.x.tsv
deleted file mode 100644
index b36e49ccf..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.y.tsv
deleted file mode 100644
index 678882531..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.z.tsv
deleted file mode 100644
index 471dbae7d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.x.tsv
deleted file mode 100644
index 98e1f7584..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.5987663333333331e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.2654329999999998e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-2.9320996666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.5987663333333333e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.2654330000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-1.9320996666666668e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.5987663333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.2654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-9.3209966666666699e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-5.9876633333333262e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-2.6543299999999936e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	4.0123366666666715e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	7.3456700000000041e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	1.0679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.4012336666666669e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.7345669999999991e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	2.0679003333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.4012336666666678e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.7345670000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	3.0679003333333343e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.4012336666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.y.tsv
deleted file mode 100644
index 323c226cd..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	6.7900333333333895e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.z.tsv
deleted file mode 100644
index 4df3c2118..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000000.tsv
deleted file mode 100644
index 282cef9d0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000001.tsv
deleted file mode 100644
index 4a7e1649b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000002.tsv
deleted file mode 100644
index d04a24d8f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000000.tsv
deleted file mode 100644
index b6d7ee668..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-0	0.0000000000000000e+00	1.6704000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000001.tsv
deleted file mode 100644
index 77da683d3..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-1	3.3333333333333333e-02	1.6704000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000002.tsv
deleted file mode 100644
index 523e1e84e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf101_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-2	5.0000000000000003e-02	2.3508000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.x.tsv
deleted file mode 100644
index 0af232bbb..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.y.tsv
deleted file mode 100644
index 6de604aec..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.z.tsv
deleted file mode 100644
index 7fb0883f4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.x.tsv
deleted file mode 100644
index 2ef968b24..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.y.tsv
deleted file mode 100644
index 2ab45fa93..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.z.tsv
deleted file mode 100644
index 9354e14df..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.x.tsv
deleted file mode 100644
index d487c7130..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.5987663333333331e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.2654329999999998e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-2.9320996666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.5987663333333333e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.2654330000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-1.9320996666666668e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.5987663333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.2654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-9.3209966666666699e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-5.9876633333333262e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-2.6543299999999936e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	4.0123366666666715e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	7.3456700000000041e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	1.0679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.4012336666666669e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.7345669999999991e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	2.0679003333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.4012336666666678e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.7345670000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	3.0679003333333343e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.4012336666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.y.tsv
deleted file mode 100644
index 24a41c2b4..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.z.tsv
deleted file mode 100644
index c280a7c0b..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	6.7900333333333895e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.x.tsv
deleted file mode 100644
index 220c199c1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.y.tsv
deleted file mode 100644
index f3258381f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.z.tsv
deleted file mode 100644
index 8c6b25057..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.x.tsv
deleted file mode 100644
index 1e18327c1..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.y.tsv
deleted file mode 100644
index 365e5b438..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.z.tsv
deleted file mode 100644
index 9d9450d77..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.x.tsv
deleted file mode 100644
index f20bb6146..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.5987663333333331e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.2654329999999998e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-2.9320996666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.5987663333333333e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.2654330000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-1.9320996666666668e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.5987663333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.2654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-9.3209966666666699e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-5.9876633333333262e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-2.6543299999999936e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	4.0123366666666715e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	7.3456700000000041e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	1.0679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.4012336666666669e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.7345669999999991e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	2.0679003333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.4012336666666678e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.7345670000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	3.0679003333333343e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.4012336666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.y.tsv
deleted file mode 100644
index 1f3ac4e1c..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.z.tsv
deleted file mode 100644
index 4bcb9373f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	6.7900333333333895e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000000.tsv
deleted file mode 100644
index 35f6c6c5e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000001.tsv
deleted file mode 100644
index 267e9dc74..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000002.tsv
deleted file mode 100644
index 5f1e84101..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000000.tsv
deleted file mode 100644
index c8ccba859..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-0	0.0000000000000000e+00	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000001.tsv
deleted file mode 100644
index 487001b52..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-1	3.3333333333333333e-02	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000002.tsv
deleted file mode 100644
index 5c0c6dc3d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf110_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-2	5.0000000000000003e-02	2.2632000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.x.tsv
deleted file mode 100644
index a404a8c24..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.y.tsv
deleted file mode 100644
index 64ec71fb2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.z.tsv
deleted file mode 100644
index 041c7ab8d..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.x.tsv
deleted file mode 100644
index a027b075f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.y.tsv
deleted file mode 100644
index 6dff72e93..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.z.tsv
deleted file mode 100644
index 036e7ecdd..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.x.tsv
deleted file mode 100644
index 7b7e3e6a5..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.5987663333333331e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.2654329999999998e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-2.9320996666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.5987663333333333e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.2654330000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-1.9320996666666668e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.5987663333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.2654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-9.3209966666666699e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-5.9876633333333262e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-2.6543299999999936e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	4.0123366666666715e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	7.3456700000000041e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	1.0679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.4012336666666669e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.7345669999999991e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	2.0679003333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.4012336666666678e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.7345670000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	3.0679003333333343e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.4012336666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.y.tsv
deleted file mode 100644
index 2f17a55a2..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.z.tsv
deleted file mode 100644
index 7da488c54..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.x.tsv
deleted file mode 100644
index 194d16ea0..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.y.tsv
deleted file mode 100644
index 8cff28548..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.z.tsv
deleted file mode 100644
index 80a7d8123..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.x.tsv
deleted file mode 100644
index 26307146f..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.y.tsv
deleted file mode 100644
index 576b9bbd3..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.z.tsv
deleted file mode 100644
index 7dfd6ec7a..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.x.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.x.tsv
deleted file mode 100644
index eea5eabbb..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.5987663333333331e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.2654329999999998e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-2.9320996666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.5987663333333333e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.2654330000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-1.9320996666666668e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.5987663333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.2654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-9.3209966666666699e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-5.9876633333333262e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-2.6543299999999936e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	4.0123366666666715e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	7.3456700000000041e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	1.0679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.4012336666666669e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.7345669999999991e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	2.0679003333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.4012336666666678e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.7345670000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	3.0679003333333343e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.4012336666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.y.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.y.tsv
deleted file mode 100644
index 2862c040e..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.z.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.z.tsv
deleted file mode 100644
index 447014a82..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000000.tsv
deleted file mode 100644
index e7d350aab..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000001.tsv
deleted file mode 100644
index c20345485..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000002.tsv
deleted file mode 100644
index e399a6759..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-2	5.0000000000000003e-02	2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000000.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000000.tsv
deleted file mode 100644
index c0ef87453..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-0	0.0000000000000000e+00	1.3248000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000001.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000001.tsv
deleted file mode 100644
index 89fc13530..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-1	3.3333333333333333e-02	1.3248000000000000e+04
diff --git a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000002.tsv b/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000002.tsv
deleted file mode 100644
index 77f8f2546..000000000
--- a/TestProlongate/test/test_eno_o1/testprolongate-gf111_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-2	5.0000000000000003e-02	1.8432000000000000e+04
diff --git a/TestProlongate/test/test_eno_o3.par b/TestProlongate/test/test_eno_o3.par
index f61254f26..fed5d4b67 100644
--- a/TestProlongate/test/test_eno_o3.par
+++ b/TestProlongate/test/test_eno_o3.par
@@ -44,12 +44,13 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
 IO::out_dir = $parfile
 IO::out_every = 1
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
diff --git a/TestProlongate/test/test_eno_per_group_o1.par b/TestProlongate/test/test_eno_per_group_o1.par
deleted file mode 100644
index 377636a18..000000000
--- a/TestProlongate/test/test_eno_per_group_o1.par
+++ /dev/null
@@ -1,93 +0,0 @@
-ActiveThorns = "
-    CarpetX
-    IOUtil
-    TestProlongate
-"
-
-$nlevels = 2
-$ncells = 30
-$blocking_factor = 2
-
-Cactus::cctk_show_schedule = no
-
-Cactus::presync_mode = "mixed-error"
-
-Cactus::cctk_itlast = 2
-
-CarpetX::ghost_size = 1
-CarpetX::prolongation_type = "eno"
-CarpetX::prolongate_per_group = yes
-CarpetX::prolongation_order = 1
-CarpetX::verbose = yes
-CarpetX::poison_undefined_values = yes
-
-CarpetX::xmin = -1.+0.1234567
-CarpetX::ymin = -1.+0.2345678
-CarpetX::zmin = -1.+0.3456789
-CarpetX::xmax = +1.+0.1234567
-CarpetX::ymax = +1.+0.2345678
-CarpetX::zmax = +1.+0.3456789
-
-CarpetX::ncells_x = $ncells
-CarpetX::ncells_y = $ncells
-CarpetX::ncells_z = $ncells
-
-CarpetX::blocking_factor_x = $blocking_factor
-CarpetX::blocking_factor_y = $blocking_factor
-CarpetX::blocking_factor_z = $blocking_factor
-
-CarpetX::boundary_x = "dirichlet"
-CarpetX::boundary_y = "dirichlet"
-CarpetX::boundary_z = "dirichlet"
-CarpetX::boundary_upper_x = "dirichlet"
-CarpetX::boundary_upper_y = "dirichlet"
-CarpetX::boundary_upper_z = "dirichlet"
-
-CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
-
-CarpetX::dtfac = 0.5
-
-IO::out_dir = $parfile
-IO::out_every = 1
-IO::parfile_write = no
-
-CarpetX::out_metadata = no
-CarpetX::out_tsv_vars = "
-    TestProlongate::gf000_error
-    TestProlongate::gf001_error
-    TestProlongate::gf010_error
-    TestProlongate::gf011_error
-    TestProlongate::gf100_error
-    TestProlongate::gf101_error
-    TestProlongate::gf110_error
-    TestProlongate::gf111_error
-
-    TestProlongate::gf000_count
-    TestProlongate::gf001_count
-    TestProlongate::gf010_count
-    TestProlongate::gf011_count
-    TestProlongate::gf100_count
-    TestProlongate::gf101_count
-    TestProlongate::gf110_count
-    TestProlongate::gf111_count
-
-    TestProlongate::gf000_max_error
-    TestProlongate::gf001_max_error
-    TestProlongate::gf010_max_error
-    TestProlongate::gf011_max_error
-    TestProlongate::gf100_max_error
-    TestProlongate::gf101_max_error
-    TestProlongate::gf110_max_error
-    TestProlongate::gf111_max_error
-
-    TestProlongate::gf000_sum_count
-    TestProlongate::gf001_sum_count
-    TestProlongate::gf010_sum_count
-    TestProlongate::gf011_sum_count
-    TestProlongate::gf100_sum_count
-    TestProlongate::gf101_sum_count
-    TestProlongate::gf110_sum_count
-    TestProlongate::gf111_sum_count
-"
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.x.tsv
deleted file mode 100644
index 3869bd73b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.y.tsv
deleted file mode 100644
index 8a17463e0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.z.tsv
deleted file mode 100644
index e3403e275..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.x.tsv
deleted file mode 100644
index 10107c02e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.y.tsv
deleted file mode 100644
index cfa032f4e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.z.tsv
deleted file mode 100644
index ef4224682..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.x.tsv
deleted file mode 100644
index 19e19441c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	2.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	20	3.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.y.tsv
deleted file mode 100644
index 78236ed18..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.6790113333333321e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	-9.8766333333333289e-03	3.3456780000000008e-01	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.z.tsv
deleted file mode 100644
index 3dbc68853..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333323e-01	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.x.tsv
deleted file mode 100644
index c1003fe16..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.y.tsv
deleted file mode 100644
index c152dffa6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.z.tsv
deleted file mode 100644
index 5834398f1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.x.tsv
deleted file mode 100644
index 58437a3f1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.y.tsv
deleted file mode 100644
index cd63d6a47..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.z.tsv
deleted file mode 100644
index 52aa8d088..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.x.tsv
deleted file mode 100644
index a05cab405..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	2.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	20	3.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.y.tsv
deleted file mode 100644
index aa5d8b482..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	-9.8766333333333289e-03	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	-9.8766333333333289e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.z.tsv
deleted file mode 100644
index cf48cc876..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf000_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.2098776666666667e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.5432109999999997e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.8765443333333331e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.2098776666666666e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.4321100000000011e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	7.9012233333333293e-02	4.4408920985006262e-16
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4567890000000006e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	2.7901223333333336e-01	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.4567890000000001e-01	4.4408920985006262e-16
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	-1.1102230246251565e-16
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333323e-01	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000000.tsv
deleted file mode 100644
index 640e8674d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000001.tsv
deleted file mode 100644
index 1f1b15e9d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000002.tsv
deleted file mode 100644
index 163a5285b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000000.tsv
deleted file mode 100644
index 994716b8c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-0	0.0000000000000000e+00	2.4389000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000001.tsv
deleted file mode 100644
index 155b5b688..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-1	3.3333333333333333e-02	2.4389000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000002.tsv
deleted file mode 100644
index 852a08afa..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf000_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf000_sum_count
-2	5.0000000000000003e-02	3.5498000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.x.tsv
deleted file mode 100644
index 6cc4e38e0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.y.tsv
deleted file mode 100644
index b3d2c177e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.z.tsv
deleted file mode 100644
index 7bf55fbad..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.x.tsv
deleted file mode 100644
index 6bbd0cf6f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.y.tsv
deleted file mode 100644
index 8504e5825..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.z.tsv
deleted file mode 100644
index dad02a0d8..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.x.tsv
deleted file mode 100644
index f748b65cd..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.7654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.4320996666666670e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-3.0987663333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.7654330000000005e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.4320996666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-2.0987663333333340e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.7654330000000007e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.4320996666666674e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-1.0987663333333342e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-7.6543299999999981e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-4.3209966666666655e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	2.3456699999999997e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	5.6790033333333323e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	9.0123366666666649e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.2345669999999997e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.5679003333333319e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	1.9012336666666663e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.2345670000000006e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.5679003333333328e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	2.9012336666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.2345669999999993e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	19	3.5679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.y.tsv
deleted file mode 100644
index bc0e390df..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	-9.8766333333333289e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.z.tsv
deleted file mode 100644
index c6eb26121..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.3765443333333328e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.0432109999999996e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.7098776666666663e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.3765443333333325e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0432109999999992e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.7098776666666660e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.3765443333333327e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.0432109999999994e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-7.0987766666666618e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	9.5678900000000011e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.2901223333333334e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.6234556666666677e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.9567890000000010e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.2901223333333343e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.6234556666666675e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.9567890000000008e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.2901223333333340e-01	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.6234556666666673e-01	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.x.tsv
deleted file mode 100644
index b2d31644d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.y.tsv
deleted file mode 100644
index 9e96b422d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.z.tsv
deleted file mode 100644
index bceb10794..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.x.tsv
deleted file mode 100644
index 698c83cb4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.y.tsv
deleted file mode 100644
index 45b3df83c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.z.tsv
deleted file mode 100644
index 389b4aac6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.x.tsv
deleted file mode 100644
index c99dc4ee2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.7654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.4320996666666670e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-3.0987663333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.7654330000000005e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.4320996666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-2.0987663333333340e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.7654330000000007e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.4320996666666674e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-1.0987663333333342e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-7.6543299999999981e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-4.3209966666666655e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	2.3456699999999997e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	5.6790033333333323e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	9.0123366666666649e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.2345669999999997e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.5679003333333319e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	1.9012336666666663e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.2345670000000006e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.5679003333333328e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	2.9012336666666672e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.2345669999999993e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	23	19	3.5679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.y.tsv
deleted file mode 100644
index 5bd911bf6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	-9.8766333333333289e-03	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	-9.8766333333333289e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.z.tsv
deleted file mode 100644
index 2580e30e5..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf001_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	-3.2098866666666726e-02	1.7901223333333338e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	-3.2098866666666726e-02	2.4567890000000003e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	-3.2098866666666726e-02	3.1234556666666669e-01	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	-9.8766333333333289e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	-9.8766333333333289e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	-9.8766333333333289e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	-9.8766333333333289e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	-9.8766333333333289e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	-9.8766333333333289e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	-9.8766333333333289e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	-9.8766333333333289e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	-9.8766333333333289e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	-9.8766333333333289e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	-9.8766333333333289e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	-9.8766333333333289e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	-9.8766333333333289e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	-9.8766333333333289e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	-9.8766333333333289e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	-9.8766333333333289e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	-9.8766333333333289e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	-9.8766333333333289e-03	1.2344666666666004e-03	3.6234556666666673e-01	-1.1102230246251565e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000000.tsv
deleted file mode 100644
index 8aaa20385..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000001.tsv
deleted file mode 100644
index ba016a022..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000002.tsv
deleted file mode 100644
index 9a6d847b0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000000.tsv
deleted file mode 100644
index 0560dda1f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-0	0.0000000000000000e+00	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000001.tsv
deleted file mode 100644
index 9311e6a80..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-1	3.3333333333333333e-02	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000002.tsv
deleted file mode 100644
index 2e22e23c6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf001_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf001_sum_count
-2	5.0000000000000003e-02	2.8878000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.x.tsv
deleted file mode 100644
index c270a0c22..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.y.tsv
deleted file mode 100644
index 617f9c67c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.z.tsv
deleted file mode 100644
index 61583baa8..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.x.tsv
deleted file mode 100644
index da3e4698b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.y.tsv
deleted file mode 100644
index 13499afb1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.z.tsv
deleted file mode 100644
index 50cf5a363..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.x.tsv
deleted file mode 100644
index be89799b6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.7654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.4320996666666670e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-3.0987663333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.7654330000000005e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.4320996666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-2.0987663333333340e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.7654330000000007e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.4320996666666674e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-1.0987663333333342e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-7.6543299999999981e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-4.3209966666666655e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	2.3456699999999997e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	5.6790033333333323e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	9.0123366666666649e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.2345669999999997e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.5679003333333319e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	1.9012336666666663e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.2345670000000006e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.5679003333333328e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	2.9012336666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.2345669999999993e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	20	3.5679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.y.tsv
deleted file mode 100644
index 6ee0eb103..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.1543219999999994e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.8209886666666661e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.4876553333333329e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.1543219999999996e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.8209886666666664e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.4876553333333331e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.1543219999999998e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-8.2098866666666659e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	8.4567800000000082e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.1790113333333341e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.5123446666666673e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.8456780000000006e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.1790113333333339e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.5123446666666671e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.8456779999999993e-01	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.1790113333333336e-01	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.z.tsv
deleted file mode 100644
index 4f6d3b269..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	-9.8766333333333289e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.x.tsv
deleted file mode 100644
index 4c1174518..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.y.tsv
deleted file mode 100644
index 28eb6dc09..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.z.tsv
deleted file mode 100644
index e3a706072..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.x.tsv
deleted file mode 100644
index f6fbbeb5e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.y.tsv
deleted file mode 100644
index a2b27a65b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.z.tsv
deleted file mode 100644
index e1faae97a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.x.tsv
deleted file mode 100644
index f7a0d9cb4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-8.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-6.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.4320996666666677e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.7654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-4.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-2.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.4320996666666674e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-7.6543299999999981e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	5.6790033333333323e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.2345669999999997e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	1.9012336666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.5679003333333328e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.2345669999999993e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	3.9012336666666658e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.5679003333333323e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.2345669999999989e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	5.9012336666666654e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.5679003333333319e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.2345670000000006e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	7.9012336666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.5679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.2345670000000002e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	9.9012336666666667e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0567900333333333e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1234567000000000e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	10	1.1901233666666664e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.7654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.4320996666666670e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-3.0987663333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.7654330000000005e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.4320996666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-2.0987663333333340e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.7654330000000007e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.4320996666666674e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-1.0987663333333342e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-7.6543299999999981e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-4.3209966666666655e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	2.3456699999999997e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	5.6790033333333323e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	9.0123366666666649e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.2345669999999997e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.5679003333333319e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	1.9012336666666663e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.2345670000000006e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.5679003333333328e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	2.9012336666666672e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.2345669999999993e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	20	3.5679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.y.tsv
deleted file mode 100644
index af8f07540..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	13	-1	10	-9.8766333333333289e-03	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	-9.8766333333333289e-03	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	-9.8766333333333289e-03	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	-9.8766333333333289e-03	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	-9.8766333333333289e-03	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	-9.8766333333333289e-03	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	-9.8766333333333289e-03	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	-9.8766333333333289e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	-9.8766333333333289e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	-9.8766333333333289e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	-9.8766333333333289e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	-9.8766333333333289e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	-9.8766333333333289e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	-9.8766333333333289e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	-9.8766333333333289e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	-9.8766333333333289e-03	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	-9.8766333333333289e-03	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	-9.8766333333333289e-03	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	-9.8766333333333289e-03	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	-9.8766333333333289e-03	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	-9.8766333333333289e-03	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	-9.8766333333333289e-03	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	-9.8766333333333289e-03	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	-9.8766333333333289e-03	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	-9.8766333333333289e-03	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	-9.8766333333333289e-03	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	-9.8766333333333289e-03	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	-9.8766333333333289e-03	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	-9.8766333333333289e-03	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	-9.8766333333333289e-03	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	-9.8766333333333289e-03	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	-9.8766333333333289e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	-9.8766333333333289e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	-9.8766333333333289e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	-9.8766333333333289e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	-9.8766333333333289e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	-9.8766333333333289e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	-9.8766333333333289e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	-9.8766333333333289e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	-9.8766333333333289e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	-9.8766333333333289e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	-9.8766333333333289e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	-9.8766333333333289e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	-9.8766333333333289e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	-9.8766333333333289e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	-9.8766333333333289e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	-9.8766333333333289e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	-9.8766333333333289e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	-9.8766333333333289e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	-9.8766333333333289e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.z.tsv
deleted file mode 100644
index a2808b31a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf010_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	-9.8766333333333289e-03	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	-9.8766333333333289e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000000.tsv
deleted file mode 100644
index 4ad5545f4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000001.tsv
deleted file mode 100644
index f38a9e4d3..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000002.tsv
deleted file mode 100644
index f25c13f82..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000000.tsv
deleted file mode 100644
index 831636e0f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-0	0.0000000000000000e+00	1.9343000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000001.tsv
deleted file mode 100644
index 252486118..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-1	3.3333333333333333e-02	1.9343000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000002.tsv
deleted file mode 100644
index 44a5d6c33..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf010_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf010_sum_count
-2	5.0000000000000003e-02	2.7807000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.x.tsv
deleted file mode 100644
index ce8f7bba5..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.y.tsv
deleted file mode 100644
index b24c2c995..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.z.tsv
deleted file mode 100644
index 6b55f3073..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.x.tsv
deleted file mode 100644
index eb457c96d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.y.tsv
deleted file mode 100644
index 0329414b0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.z.tsv
deleted file mode 100644
index eda620794..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.x.tsv
deleted file mode 100644
index 512c767c1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.7654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.4320996666666670e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-3.0987663333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.7654330000000005e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.4320996666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-2.0987663333333340e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.7654330000000007e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.4320996666666674e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-1.0987663333333342e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-7.6543299999999981e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-4.3209966666666655e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	2.3456699999999997e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	5.6790033333333323e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	9.0123366666666649e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.2345669999999997e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.5679003333333319e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	1.9012336666666663e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.2345670000000006e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.5679003333333328e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	2.9012336666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.2345669999999993e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	19	3.5679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.y.tsv
deleted file mode 100644
index 9a0de4fe0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.z.tsv
deleted file mode 100644
index a7ad4fefa..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_count
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.x.tsv
deleted file mode 100644
index 600b066b8..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.y.tsv
deleted file mode 100644
index c7b5d8882..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.z.tsv
deleted file mode 100644
index f502c03e2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-0	0.0000000000000000e+00	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.x.tsv
deleted file mode 100644
index 0ca0f7540..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.x.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.y.tsv
deleted file mode 100644
index ca10fde33..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.z.tsv
deleted file mode 100644
index fb006b663..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-1	3.3333333333333333e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.x.tsv
deleted file mode 100644
index 05a1b3eff..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.x.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-8.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-6.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.4320996666666677e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.7654330000000000e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-4.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-2.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.4320996666666674e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-7.6543299999999981e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	5.6790033333333323e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.2345669999999997e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	1.9012336666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.5679003333333328e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.2345669999999993e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	3.9012336666666658e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.5679003333333323e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.2345669999999989e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	5.9012336666666654e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.5679003333333319e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.2345670000000006e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	7.9012336666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.5679003333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.2345670000000002e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	9.9012336666666667e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0567900333333333e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1234567000000000e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	31	11	9	1.1901233666666664e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.7654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.4320996666666670e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-3.0987663333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.7654330000000005e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.4320996666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-2.0987663333333340e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.7654330000000007e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.4320996666666674e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-1.0987663333333342e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-7.6543299999999981e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-4.3209966666666655e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	2.3456699999999997e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	5.6790033333333323e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	9.0123366666666649e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.2345669999999997e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.5679003333333319e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	1.9012336666666663e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.2345670000000006e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.5679003333333328e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	2.9012336666666672e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.2345669999999993e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	37	22	19	3.5679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.y.tsv
deleted file mode 100644
index a32c45e1c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	13	-1	9	-9.8766333333333289e-03	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	-9.8766333333333289e-03	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	-9.8766333333333289e-03	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	-9.8766333333333289e-03	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	-9.8766333333333289e-03	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	-9.8766333333333289e-03	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	-9.8766333333333289e-03	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	-9.8766333333333289e-03	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	-9.8766333333333289e-03	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	-9.8766333333333289e-03	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	-9.8766333333333289e-03	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	-9.8766333333333289e-03	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	-9.8766333333333289e-03	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	-9.8766333333333289e-03	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	-9.8766333333333289e-03	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	-9.8766333333333289e-03	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	-9.8766333333333289e-03	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	-9.8766333333333289e-03	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	-9.8766333333333289e-03	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	-9.8766333333333289e-03	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	-9.8766333333333289e-03	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	-9.8766333333333289e-03	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	-9.8766333333333289e-03	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	-9.8766333333333289e-03	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	-9.8766333333333289e-03	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	-9.8766333333333289e-03	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	-9.8766333333333289e-03	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	-9.8766333333333289e-03	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	-9.8766333333333289e-03	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	-9.8766333333333289e-03	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	-9.8766333333333289e-03	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	-9.8766333333333289e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	-9.8766333333333289e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	-9.8766333333333289e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	-9.8766333333333289e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	-9.8766333333333289e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	-9.8766333333333289e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	-9.8766333333333289e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	-9.8766333333333289e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	-9.8766333333333289e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	-9.8766333333333289e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	-9.8766333333333289e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	-9.8766333333333289e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	-9.8766333333333289e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	-9.8766333333333289e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	-9.8766333333333289e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	-9.8766333333333289e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	-9.8766333333333289e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	-9.8766333333333289e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	-9.8766333333333289e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.z.tsv
deleted file mode 100644
index 18862b298..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf011_error
-2	5.0000000000000003e-02	0	0	13	11	-1	-9.8766333333333289e-03	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	-9.8766333333333289e-03	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	-9.8766333333333289e-03	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	-9.8766333333333289e-03	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	-9.8766333333333289e-03	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	-9.8766333333333289e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	-9.8766333333333289e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	-9.8766333333333289e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	-9.8766333333333289e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	-9.8766333333333289e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	-9.8766333333333289e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	-9.8766333333333289e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	-9.8766333333333289e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	-9.8766333333333289e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	-9.8766333333333289e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	-9.8766333333333289e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	-9.8766333333333289e-03	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	-9.8766333333333289e-03	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	-9.8766333333333289e-03	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	-9.8766333333333289e-03	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	-9.8766333333333289e-03	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	-9.8766333333333289e-03	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	-9.8766333333333289e-03	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	-9.8766333333333289e-03	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	-9.8766333333333289e-03	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	-9.8766333333333289e-03	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	-9.8766333333333289e-03	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	-9.8766333333333289e-03	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	-9.8766333333333289e-03	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	-9.8766333333333289e-03	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	-9.8766333333333289e-03	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	-9.8766333333333289e-03	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	-9.8766333333333289e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	-9.8766333333333289e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	-9.8766333333333289e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	-9.8766333333333289e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	-9.8766333333333289e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	-9.8766333333333289e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	-9.8766333333333289e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	-9.8766333333333289e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	-9.8766333333333289e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	-9.8766333333333289e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	-9.8766333333333289e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	-9.8766333333333289e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	-9.8766333333333289e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	-9.8766333333333289e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	-9.8766333333333289e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000000.tsv
deleted file mode 100644
index 2e25eeaf3..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000001.tsv
deleted file mode 100644
index d90f3adbf..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000002.tsv
deleted file mode 100644
index 13f0acc27..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000000.tsv
deleted file mode 100644
index 6b31fcdd2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-0	0.0000000000000000e+00	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000001.tsv
deleted file mode 100644
index fd36e2d62..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-1	3.3333333333333333e-02	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000002.tsv
deleted file mode 100644
index 0f81273d8..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf011_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf011_sum_count
-2	5.0000000000000003e-02	2.2632000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.x.tsv
deleted file mode 100644
index afdf01f5e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.y.tsv
deleted file mode 100644
index 2b51fb32a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.z.tsv
deleted file mode 100644
index 321cda89c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.x.tsv
deleted file mode 100644
index 2a31cac2a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.y.tsv
deleted file mode 100644
index f2cabf814..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.z.tsv
deleted file mode 100644
index d81753740..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.x.tsv
deleted file mode 100644
index cf990aaab..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.5987663333333331e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.2654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-2.9320996666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.5987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.2654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-1.9320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.5987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.2654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-9.3209966666666699e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-5.9876633333333262e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-2.6543299999999936e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	4.0123366666666715e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	7.3456700000000041e-02	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	1.0679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.4012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.7345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	2.0679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.4012336666666678e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.7345670000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	3.0679003333333343e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.4012336666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	1.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.y.tsv
deleted file mode 100644
index cec80ef98..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	6.7900333333333895e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.z.tsv
deleted file mode 100644
index 43628a2dc..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	6.7900333333333895e-03	1.2344666666666004e-03	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.x.tsv
deleted file mode 100644
index e23687467..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.y.tsv
deleted file mode 100644
index 8ae05b6a5..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.z.tsv
deleted file mode 100644
index 3f4606e1e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.x.tsv
deleted file mode 100644
index 2a1ba629a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.y.tsv
deleted file mode 100644
index ea4fb844c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.z.tsv
deleted file mode 100644
index f5984898e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.x.tsv
deleted file mode 100644
index 5f12eb36a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	-3.2098866666666726e-02	1.2345566666666641e-02	2.2204460492503131e-16
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	-3.2098866666666726e-02	1.2345566666666641e-02	1.1102230246251565e-16
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	20	-3.5987663333333331e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	20	-3.2654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	20	-2.9320996666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	20	-2.5987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	20	-2.2654330000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	20	-1.9320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	20	-1.5987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	20	-1.2654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	20	-9.3209966666666699e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	20	-5.9876633333333262e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	20	-2.6543299999999936e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	20	4.0123366666666715e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	20	7.3456700000000041e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	20	1.0679003333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	20	1.4012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	20	1.7345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	20	2.0679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	20	2.4012336666666678e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	20	2.7345670000000000e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	20	3.0679003333333343e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	20	3.4012336666666665e-01	1.2344666666666004e-03	1.2345566666666641e-02	-2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.y.tsv
deleted file mode 100644
index 831db8249..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-8.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-6.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.6543220000000005e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.9876553333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-4.3209886666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.6543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	3.6790113333333330e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.3456779999999995e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.0123446666666660e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	5.6790113333333325e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.3456779999999990e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.0123446666666656e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	7.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.0123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	9.6790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1012344666666667e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.1679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2345678000000000e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	10	2.3456699999999997e-02	1.3012344666666664e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-9.8765533333333377e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	3.4567800000000037e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.0123446666666669e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.6790113333333334e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.3456779999999999e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.6790113333333321e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.0123446666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	20	6.7900333333333895e-03	3.3456780000000008e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.z.tsv
deleted file mode 100644
index 3feadb781..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf100_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	-3.2098866666666726e-02	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	31	6.7900333333333895e-03	1.2344666666666004e-03	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000000.tsv
deleted file mode 100644
index fbfbee33d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000001.tsv
deleted file mode 100644
index 68903ac0b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000002.tsv
deleted file mode 100644
index fe1017a32..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_max_error
-2	5.0000000000000003e-02	8.8817841970012523e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000000.tsv
deleted file mode 100644
index 369097728..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-0	0.0000000000000000e+00	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000001.tsv
deleted file mode 100644
index 83e4dc73b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-1	3.3333333333333333e-02	2.0184000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000002.tsv
deleted file mode 100644
index a2c1e35e4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf100_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf100_sum_count
-2	5.0000000000000003e-02	2.8878000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.x.tsv
deleted file mode 100644
index 60ff3662e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.y.tsv
deleted file mode 100644
index 932731c29..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.z.tsv
deleted file mode 100644
index 999aaae94..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.x.tsv
deleted file mode 100644
index eb0f0b213..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.y.tsv
deleted file mode 100644
index b338baba9..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.z.tsv
deleted file mode 100644
index eca0239d2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.x.tsv
deleted file mode 100644
index b7a6cd27c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.5987663333333331e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.2654329999999998e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-2.9320996666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.5987663333333333e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.2654330000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-1.9320996666666668e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.5987663333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.2654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-9.3209966666666699e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-5.9876633333333262e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-2.6543299999999936e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	4.0123366666666715e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	7.3456700000000041e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	1.0679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.4012336666666669e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.7345669999999991e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	2.0679003333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.4012336666666678e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.7345670000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	3.0679003333333343e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.4012336666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.y.tsv
deleted file mode 100644
index 0c0de166d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	6.7900333333333895e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.z.tsv
deleted file mode 100644
index 44de168ad..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.x.tsv
deleted file mode 100644
index d74804be5..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.y.tsv
deleted file mode 100644
index 127b10ff6..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.z.tsv
deleted file mode 100644
index 358e61fe7..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.x.tsv
deleted file mode 100644
index b36e49ccf..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.y.tsv
deleted file mode 100644
index 678882531..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.y.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.z.tsv
deleted file mode 100644
index 471dbae7d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.x.tsv
deleted file mode 100644
index 98e1f7584..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	23	19	-3.5987663333333331e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	23	19	-3.2654329999999998e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	23	19	-2.9320996666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	23	19	-2.5987663333333333e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	23	19	-2.2654330000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	23	19	-1.9320996666666668e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	23	19	-1.5987663333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	23	19	-1.2654330000000003e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	23	19	-9.3209966666666699e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	23	19	-5.9876633333333262e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	23	19	-2.6543299999999936e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	23	19	4.0123366666666715e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	23	19	7.3456700000000041e-02	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	23	19	1.0679003333333337e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	23	19	1.4012336666666669e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	23	19	1.7345669999999991e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	23	19	2.0679003333333335e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	23	19	2.4012336666666678e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	23	19	2.7345670000000000e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	23	19	3.0679003333333343e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	23	19	3.4012336666666665e-01	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.y.tsv
deleted file mode 100644
index 323c226cd..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.y.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-8.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-6.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.6543220000000005e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.9876553333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-4.3209886666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.6543219999999998e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-2.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-9.8765533333333377e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	3.4567800000000037e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.0123446666666669e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	1.6790113333333334e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.3456779999999999e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.0123446666666664e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	3.6790113333333330e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.3456779999999995e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.0123446666666660e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	5.6790113333333325e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.3456779999999990e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.0123446666666656e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	7.6790113333333321e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.3456780000000008e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.0123446666666673e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	9.6790113333333339e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1012344666666667e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.1679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2345678000000000e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	31	9	2.3456699999999997e-02	1.3012344666666664e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.3209886666666666e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.9876553333333333e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.6543220000000001e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.3209886666666668e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.9876553333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.6543220000000003e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.3209886666666670e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-9.8765533333333377e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-6.5432200000000051e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-3.2098866666666726e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	3.4567800000000037e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	6.7901133333333363e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.0123446666666669e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.3456780000000002e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.6790113333333334e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.0123446666666667e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.3456779999999999e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.6790113333333321e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.0123446666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	33	19	6.7900333333333895e-03	3.3456780000000008e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.z.tsv
deleted file mode 100644
index 4df3c2118..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf101_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	-3.2098866666666726e-02	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	-3.2098866666666726e-02	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	-3.2098866666666726e-02	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	-3.2098866666666726e-02	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	-3.2098866666666726e-02	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	-3.2098866666666726e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	-3.2098866666666726e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	-3.2098866666666726e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	-3.2098866666666726e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	-3.2098866666666726e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	-3.2098866666666726e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	-3.2098866666666726e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	-3.2098866666666726e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	-3.2098866666666726e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	-3.2098866666666726e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	-3.2098866666666726e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	-3.2098866666666726e-02	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	-3.2098866666666726e-02	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	-3.2098866666666726e-02	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	-3.2098866666666726e-02	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	-3.2098866666666726e-02	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	-3.2098866666666726e-02	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	-3.2098866666666726e-02	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	-3.2098866666666726e-02	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	-3.2098866666666726e-02	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	-3.2098866666666726e-02	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	-3.2098866666666726e-02	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	-3.2098866666666726e-02	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	-3.2098866666666726e-02	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	-3.2098866666666726e-02	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	-3.2098866666666726e-02	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	-3.2098866666666726e-02	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	9	6.7900333333333895e-03	1.2344666666666004e-03	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	10	6.7900333333333895e-03	1.2344666666666004e-03	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	11	6.7900333333333895e-03	1.2344666666666004e-03	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	12	6.7900333333333895e-03	1.2344666666666004e-03	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	13	6.7900333333333895e-03	1.2344666666666004e-03	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	14	6.7900333333333895e-03	1.2344666666666004e-03	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	15	6.7900333333333895e-03	1.2344666666666004e-03	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	16	6.7900333333333895e-03	1.2344666666666004e-03	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	17	6.7900333333333895e-03	1.2344666666666004e-03	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	18	6.7900333333333895e-03	1.2344666666666004e-03	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.2344666666666004e-03	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.2344666666666004e-03	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	21	6.7900333333333895e-03	1.2344666666666004e-03	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	22	6.7900333333333895e-03	1.2344666666666004e-03	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	23	6.7900333333333895e-03	1.2344666666666004e-03	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	24	6.7900333333333895e-03	1.2344666666666004e-03	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	25	6.7900333333333895e-03	1.2344666666666004e-03	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	26	6.7900333333333895e-03	1.2344666666666004e-03	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	27	6.7900333333333895e-03	1.2344666666666004e-03	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	28	6.7900333333333895e-03	1.2344666666666004e-03	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	29	6.7900333333333895e-03	1.2344666666666004e-03	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	30	6.7900333333333895e-03	1.2344666666666004e-03	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000000.tsv
deleted file mode 100644
index 282cef9d0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000001.tsv
deleted file mode 100644
index 4a7e1649b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000002.tsv
deleted file mode 100644
index d04a24d8f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000000.tsv
deleted file mode 100644
index b6d7ee668..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-0	0.0000000000000000e+00	1.6704000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000001.tsv
deleted file mode 100644
index 77da683d3..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-1	3.3333333333333333e-02	1.6704000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000002.tsv
deleted file mode 100644
index 523e1e84e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf101_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf101_sum_count
-2	5.0000000000000003e-02	2.3508000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.x.tsv
deleted file mode 100644
index 0af232bbb..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.y.tsv
deleted file mode 100644
index 6de604aec..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.z.tsv
deleted file mode 100644
index 7fb0883f4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.x.tsv
deleted file mode 100644
index 2ef968b24..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.y.tsv
deleted file mode 100644
index 2ab45fa93..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.z.tsv
deleted file mode 100644
index 9354e14df..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.x.tsv
deleted file mode 100644
index d487c7130..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.5987663333333331e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.2654329999999998e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-2.9320996666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.5987663333333333e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.2654330000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-1.9320996666666668e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.5987663333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.2654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-9.3209966666666699e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-5.9876633333333262e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-2.6543299999999936e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	4.0123366666666715e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	7.3456700000000041e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	1.0679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.4012336666666669e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.7345669999999991e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	2.0679003333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.4012336666666678e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.7345670000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	3.0679003333333343e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.4012336666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.y.tsv
deleted file mode 100644
index 24a41c2b4..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.z.tsv
deleted file mode 100644
index c280a7c0b..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_count.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	6.7900333333333895e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.x.tsv
deleted file mode 100644
index 220c199c1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.y.tsv
deleted file mode 100644
index f3258381f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.z.tsv
deleted file mode 100644
index 8c6b25057..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000000.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.x.tsv
deleted file mode 100644
index 1e18327c1..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.y.tsv
deleted file mode 100644
index 365e5b438..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.z.tsv
deleted file mode 100644
index 9d9450d77..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000001.z.tsv
+++ /dev/null
@@ -1,34 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.x.tsv
deleted file mode 100644
index f20bb6146..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	-1	11	10	-9.0987663333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	10	-8.4320996666666670e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	10	-7.7654330000000005e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	10	-7.0987663333333340e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	10	-6.4320996666666663e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	10	-5.7654329999999998e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	10	-5.0987663333333333e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	10	-4.4320996666666668e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	10	-3.7654330000000003e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	10	-3.0987663333333337e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	10	-2.4320996666666672e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	10	-1.7654330000000007e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	10	-1.0987663333333342e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	10	-4.3209966666666655e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	10	9.0123366666666649e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	10	1.5679003333333330e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	10	2.2345669999999995e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	10	2.9012336666666660e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	10	3.5679003333333326e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	10	4.2345669999999991e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	10	4.9012336666666656e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	10	5.5679003333333321e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	10	6.2345669999999986e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	10	6.9012336666666652e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	10	7.5679003333333339e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	10	8.2345670000000004e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	10	8.9012336666666669e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	10	9.5679003333333335e-01	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	10	1.0234567000000001e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	10	1.0901233666666665e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	10	1.1567900333333334e+00	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	20	-3.5987663333333331e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	20	-3.2654329999999998e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	20	-2.9320996666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	20	-2.5987663333333333e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	20	-2.2654330000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	20	-1.9320996666666668e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	20	-1.5987663333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	20	-1.2654330000000003e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	20	-9.3209966666666699e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	20	-5.9876633333333262e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	20	-2.6543299999999936e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	20	4.0123366666666715e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	20	7.3456700000000041e-02	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	20	1.0679003333333337e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	20	1.4012336666666669e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	20	1.7345669999999991e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	20	2.0679003333333335e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	20	2.4012336666666678e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	20	2.7345670000000000e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	20	3.0679003333333343e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	20	3.4012336666666665e-01	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.y.tsv
deleted file mode 100644
index 1f3ac4e1c..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	13	-1	10	2.3456699999999997e-02	-7.9876553333333333e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	10	2.3456699999999997e-02	-7.3209886666666668e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	10	2.3456699999999997e-02	-6.6543220000000003e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	10	2.3456699999999997e-02	-5.9876553333333338e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	10	2.3456699999999997e-02	-5.3209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	10	2.3456699999999997e-02	-4.6543220000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	10	2.3456699999999997e-02	-3.9876553333333337e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	10	2.3456699999999997e-02	-3.3209886666666666e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	10	2.3456699999999997e-02	-2.6543220000000001e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	10	2.3456699999999997e-02	-1.9876553333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	10	2.3456699999999997e-02	-1.3209886666666670e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	10	2.3456699999999997e-02	-6.5432200000000051e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	10	2.3456699999999997e-02	6.7901133333333363e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	10	2.3456699999999997e-02	1.3456780000000002e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	10	2.3456699999999997e-02	2.0123446666666667e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	10	2.3456699999999997e-02	2.6790113333333332e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	10	2.3456699999999997e-02	3.3456779999999997e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	10	2.3456699999999997e-02	4.0123446666666662e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	10	2.3456699999999997e-02	4.6790113333333327e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	10	2.3456699999999997e-02	5.3456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	10	2.3456699999999997e-02	6.0123446666666658e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	10	2.3456699999999997e-02	6.6790113333333323e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	10	2.3456699999999997e-02	7.3456779999999988e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	10	2.3456699999999997e-02	8.0123446666666653e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	10	2.3456699999999997e-02	8.6790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	10	2.3456699999999997e-02	9.3456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	10	2.3456699999999997e-02	1.0012344666666668e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	10	2.3456699999999997e-02	1.0679011333333333e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	10	2.3456699999999997e-02	1.1345678000000001e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	10	2.3456699999999997e-02	1.2012344666666666e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	10	2.3456699999999997e-02	1.2679011333333334e+00	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	20	6.7900333333333895e-03	-3.1543219999999994e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	20	6.7900333333333895e-03	-2.8209886666666661e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	20	6.7900333333333895e-03	-2.4876553333333329e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	20	6.7900333333333895e-03	-2.1543219999999996e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	20	6.7900333333333895e-03	-1.8209886666666664e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	20	6.7900333333333895e-03	-1.4876553333333331e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	20	6.7900333333333895e-03	-1.1543219999999998e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	20	6.7900333333333895e-03	-8.2098866666666659e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	20	6.7900333333333895e-03	-4.8765533333333333e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	20	6.7900333333333895e-03	1.7901133333333319e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	20	6.7900333333333895e-03	5.1234466666666756e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	20	6.7900333333333895e-03	8.4567800000000082e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	20	6.7900333333333895e-03	1.1790113333333341e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	20	6.7900333333333895e-03	1.5123446666666673e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	20	6.7900333333333895e-03	1.8456780000000006e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	20	6.7900333333333895e-03	2.1790113333333339e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	20	6.7900333333333895e-03	2.5123446666666671e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	20	6.7900333333333895e-03	2.8456779999999993e-01	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	20	6.7900333333333895e-03	3.1790113333333336e-01	1.2345566666666641e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.z.tsv
deleted file mode 100644
index 4bcb9373f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_error.it000002.z.tsv
+++ /dev/null
@@ -1,57 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf110_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-7.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.8765443333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-5.2098776666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.5432109999999998e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.8765443333333333e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.1234556666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	4.7901223333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.4567889999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	6.7901223333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.4567889999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.1234556666666657e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	8.7901223333333323e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.4567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.0790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2123455666666667e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.2790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	31	2.3456699999999997e-02	1.2344666666666004e-03	1.4123455666666664e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.2098776666666667e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.5432109999999997e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-5.4321100000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	1.2345566666666641e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	7.9012233333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.4567890000000006e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.1234556666666671e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.7901223333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.4567890000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	31	6.7900333333333895e-03	-1.5432200000000007e-02	3.7901223333333323e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000000.tsv
deleted file mode 100644
index 35f6c6c5e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000001.tsv
deleted file mode 100644
index 267e9dc74..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000002.tsv
deleted file mode 100644
index 5f1e84101..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_max_error
-2	5.0000000000000003e-02	4.4408920985006262e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000000.tsv
deleted file mode 100644
index c8ccba859..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-0	0.0000000000000000e+00	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000001.tsv
deleted file mode 100644
index 487001b52..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-1	3.3333333333333333e-02	1.6008000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000002.tsv
deleted file mode 100644
index 5c0c6dc3d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf110_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf110_sum_count
-2	5.0000000000000003e-02	2.2632000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.x.tsv
deleted file mode 100644
index a404a8c24..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.y.tsv
deleted file mode 100644
index 64ec71fb2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.z.tsv
deleted file mode 100644
index 041c7ab8d..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.x.tsv
deleted file mode 100644
index a027b075f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.y.tsv
deleted file mode 100644
index 6dff72e93..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.z.tsv
deleted file mode 100644
index 036e7ecdd..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.x.tsv
deleted file mode 100644
index 7b7e3e6a5..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.5987663333333331e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.2654329999999998e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-2.9320996666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.5987663333333333e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.2654330000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-1.9320996666666668e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.5987663333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.2654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-9.3209966666666699e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-5.9876633333333262e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-2.6543299999999936e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	4.0123366666666715e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	7.3456700000000041e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	1.0679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.4012336666666669e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.7345669999999991e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	2.0679003333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.4012336666666678e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.7345670000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	3.0679003333333343e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.4012336666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.y.tsv
deleted file mode 100644
index 2f17a55a2..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.z.tsv
deleted file mode 100644
index 7da488c54..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_count.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_count
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.x.tsv
deleted file mode 100644
index 194d16ea0..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.y.tsv
deleted file mode 100644
index 8cff28548..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.z.tsv
deleted file mode 100644
index 80a7d8123..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000000.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-0	0.0000000000000000e+00	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-0	0.0000000000000000e+00	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.x.tsv
deleted file mode 100644
index 26307146f..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.x.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.y.tsv
deleted file mode 100644
index 576b9bbd3..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.y.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.z.tsv
deleted file mode 100644
index 7dfd6ec7a..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000001.z.tsv
+++ /dev/null
@@ -1,33 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-1	3.3333333333333333e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-1	3.3333333333333333e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.x.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.x.tsv
deleted file mode 100644
index eea5eabbb..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.x.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	-1	11	9	-9.0987663333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	0	11	9	-8.4320996666666670e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	1	11	9	-7.7654330000000005e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	2	11	9	-7.0987663333333340e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	3	11	9	-6.4320996666666663e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	4	11	9	-5.7654329999999998e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	5	11	9	-5.0987663333333333e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	6	11	9	-4.4320996666666668e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	7	11	9	-3.7654330000000003e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	8	11	9	-3.0987663333333337e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	9	11	9	-2.4320996666666672e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	10	11	9	-1.7654330000000007e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	11	11	9	-1.0987663333333342e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	12	11	9	-4.3209966666666655e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	14	11	9	9.0123366666666649e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	15	11	9	1.5679003333333330e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	16	11	9	2.2345669999999995e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	17	11	9	2.9012336666666660e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	18	11	9	3.5679003333333326e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	19	11	9	4.2345669999999991e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	20	11	9	4.9012336666666656e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	21	11	9	5.5679003333333321e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	22	11	9	6.2345669999999986e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	23	11	9	6.9012336666666652e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	24	11	9	7.5679003333333339e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	25	11	9	8.2345670000000004e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	26	11	9	8.9012336666666669e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	27	11	9	9.5679003333333335e-01	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	28	11	9	1.0234567000000001e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	29	11	9	1.0901233666666665e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	30	11	9	1.1567900333333334e+00	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	15	22	19	-3.5987663333333331e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	16	22	19	-3.2654329999999998e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	17	22	19	-2.9320996666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	18	22	19	-2.5987663333333333e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	19	22	19	-2.2654330000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	20	22	19	-1.9320996666666668e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	21	22	19	-1.5987663333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	22	22	19	-1.2654330000000003e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	23	22	19	-9.3209966666666699e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	24	22	19	-5.9876633333333262e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	25	22	19	-2.6543299999999936e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	27	22	19	4.0123366666666715e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	28	22	19	7.3456700000000041e-02	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	29	22	19	1.0679003333333337e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	30	22	19	1.4012336666666669e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	31	22	19	1.7345669999999991e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	32	22	19	2.0679003333333335e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	33	22	19	2.4012336666666678e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	34	22	19	2.7345670000000000e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	35	22	19	3.0679003333333343e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	36	22	19	3.4012336666666665e-01	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.y.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.y.tsv
deleted file mode 100644
index 2862c040e..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.y.tsv
+++ /dev/null
@@ -1,53 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	13	-1	9	2.3456699999999997e-02	-7.9876553333333333e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	0	9	2.3456699999999997e-02	-7.3209886666666668e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	1	9	2.3456699999999997e-02	-6.6543220000000003e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	2	9	2.3456699999999997e-02	-5.9876553333333338e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	3	9	2.3456699999999997e-02	-5.3209886666666661e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	4	9	2.3456699999999997e-02	-4.6543220000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	5	9	2.3456699999999997e-02	-3.9876553333333337e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	6	9	2.3456699999999997e-02	-3.3209886666666666e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	7	9	2.3456699999999997e-02	-2.6543220000000001e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	8	9	2.3456699999999997e-02	-1.9876553333333336e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	9	9	2.3456699999999997e-02	-1.3209886666666670e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	10	9	2.3456699999999997e-02	-6.5432200000000051e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	12	9	2.3456699999999997e-02	6.7901133333333363e-02	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	13	9	2.3456699999999997e-02	1.3456780000000002e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	14	9	2.3456699999999997e-02	2.0123446666666667e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	15	9	2.3456699999999997e-02	2.6790113333333332e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	16	9	2.3456699999999997e-02	3.3456779999999997e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	17	9	2.3456699999999997e-02	4.0123446666666662e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	18	9	2.3456699999999997e-02	4.6790113333333327e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	19	9	2.3456699999999997e-02	5.3456779999999993e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	20	9	2.3456699999999997e-02	6.0123446666666658e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	21	9	2.3456699999999997e-02	6.6790113333333323e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	22	9	2.3456699999999997e-02	7.3456779999999988e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	23	9	2.3456699999999997e-02	8.0123446666666653e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	24	9	2.3456699999999997e-02	8.6790113333333341e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	25	9	2.3456699999999997e-02	9.3456780000000006e-01	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	26	9	2.3456699999999997e-02	1.0012344666666668e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	27	9	2.3456699999999997e-02	1.0679011333333333e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	28	9	2.3456699999999997e-02	1.1345678000000001e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	29	9	2.3456699999999997e-02	1.2012344666666666e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	30	9	2.3456699999999997e-02	1.2679011333333334e+00	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	13	19	6.7900333333333895e-03	-3.1543219999999994e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	14	19	6.7900333333333895e-03	-2.8209886666666661e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	15	19	6.7900333333333895e-03	-2.4876553333333329e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	16	19	6.7900333333333895e-03	-2.1543219999999996e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	17	19	6.7900333333333895e-03	-1.8209886666666664e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	18	19	6.7900333333333895e-03	-1.4876553333333331e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	19	19	6.7900333333333895e-03	-1.1543219999999998e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	20	19	6.7900333333333895e-03	-8.2098866666666659e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	21	19	6.7900333333333895e-03	-4.8765533333333333e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	23	19	6.7900333333333895e-03	1.7901133333333319e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	24	19	6.7900333333333895e-03	5.1234466666666756e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	25	19	6.7900333333333895e-03	8.4567800000000082e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	26	19	6.7900333333333895e-03	1.1790113333333341e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	27	19	6.7900333333333895e-03	1.5123446666666673e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	28	19	6.7900333333333895e-03	1.8456780000000006e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	29	19	6.7900333333333895e-03	2.1790113333333339e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	30	19	6.7900333333333895e-03	2.5123446666666671e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	31	19	6.7900333333333895e-03	2.8456779999999993e-01	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	32	19	6.7900333333333895e-03	3.1790113333333336e-01	-4.3210999999999666e-03	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.z.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.z.tsv
deleted file mode 100644
index 447014a82..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_error.it000002.z.tsv
+++ /dev/null
@@ -1,55 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:gf111_error
-2	5.0000000000000003e-02	0	0	13	11	-1	2.3456699999999997e-02	1.2344666666666004e-03	-6.8765443333333331e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	0	2.3456699999999997e-02	1.2344666666666004e-03	-6.2098776666666666e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	1	2.3456699999999997e-02	1.2344666666666004e-03	-5.5432110000000001e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	2	2.3456699999999997e-02	1.2344666666666004e-03	-4.8765443333333336e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	3	2.3456699999999997e-02	1.2344666666666004e-03	-4.2098776666666665e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	4	2.3456699999999997e-02	1.2344666666666004e-03	-3.5432110000000000e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	5	2.3456699999999997e-02	1.2344666666666004e-03	-2.8765443333333335e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	6	2.3456699999999997e-02	1.2344666666666004e-03	-2.2098776666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	7	2.3456699999999997e-02	1.2344666666666004e-03	-1.5432109999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	8	2.3456699999999997e-02	1.2344666666666004e-03	-8.7654433333333337e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	9	2.3456699999999997e-02	1.2344666666666004e-03	-2.0987766666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	10	2.3456699999999997e-02	1.2344666666666004e-03	4.5678899999999967e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	11	2.3456699999999997e-02	1.2344666666666004e-03	1.1234556666666662e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	12	2.3456699999999997e-02	1.2344666666666004e-03	1.7901223333333338e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	13	2.3456699999999997e-02	1.2344666666666004e-03	2.4567890000000003e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	14	2.3456699999999997e-02	1.2344666666666004e-03	3.1234556666666669e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	15	2.3456699999999997e-02	1.2344666666666004e-03	3.7901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	16	2.3456699999999997e-02	1.2344666666666004e-03	4.4567889999999999e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	17	2.3456699999999997e-02	1.2344666666666004e-03	5.1234556666666664e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	18	2.3456699999999997e-02	1.2344666666666004e-03	5.7901223333333329e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	19	2.3456699999999997e-02	1.2344666666666004e-03	6.4567889999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	20	2.3456699999999997e-02	1.2344666666666004e-03	7.1234556666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	21	2.3456699999999997e-02	1.2344666666666004e-03	7.7901223333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	22	2.3456699999999997e-02	1.2344666666666004e-03	8.4567889999999990e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	23	2.3456699999999997e-02	1.2344666666666004e-03	9.1234556666666655e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	24	2.3456699999999997e-02	1.2344666666666004e-03	9.7901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	25	2.3456699999999997e-02	1.2344666666666004e-03	1.0456789000000000e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	26	2.3456699999999997e-02	1.2344666666666004e-03	1.1123455666666668e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	27	2.3456699999999997e-02	1.2344666666666004e-03	1.1790122333333333e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	28	2.3456699999999997e-02	1.2344666666666004e-03	1.2456789000000001e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	29	2.3456699999999997e-02	1.2344666666666004e-03	1.3123455666666666e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	0	13	11	30	2.3456699999999997e-02	1.2344666666666004e-03	1.3790122333333334e+00	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	9	6.7900333333333895e-03	-1.5432200000000007e-02	-3.3765443333333328e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	10	6.7900333333333895e-03	-1.5432200000000007e-02	-3.0432109999999996e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	11	6.7900333333333895e-03	-1.5432200000000007e-02	-2.7098776666666663e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	12	6.7900333333333895e-03	-1.5432200000000007e-02	-2.3765443333333325e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	13	6.7900333333333895e-03	-1.5432200000000007e-02	-2.0432109999999992e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	14	6.7900333333333895e-03	-1.5432200000000007e-02	-1.7098776666666660e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	15	6.7900333333333895e-03	-1.5432200000000007e-02	-1.3765443333333327e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	16	6.7900333333333895e-03	-1.5432200000000007e-02	-1.0432109999999994e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	17	6.7900333333333895e-03	-1.5432200000000007e-02	-7.0987766666666618e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	18	6.7900333333333895e-03	-1.5432200000000007e-02	-3.7654433333333293e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	19	6.7900333333333895e-03	-1.5432200000000007e-02	-4.3210999999999666e-03	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	20	6.7900333333333895e-03	-1.5432200000000007e-02	2.9012233333333359e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	21	6.7900333333333895e-03	-1.5432200000000007e-02	6.2345566666666685e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	22	6.7900333333333895e-03	-1.5432200000000007e-02	9.5678900000000011e-02	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	23	6.7900333333333895e-03	-1.5432200000000007e-02	1.2901223333333334e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	24	6.7900333333333895e-03	-1.5432200000000007e-02	1.6234556666666677e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	25	6.7900333333333895e-03	-1.5432200000000007e-02	1.9567890000000010e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	26	6.7900333333333895e-03	-1.5432200000000007e-02	2.2901223333333343e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	27	6.7900333333333895e-03	-1.5432200000000007e-02	2.6234556666666675e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	28	6.7900333333333895e-03	-1.5432200000000007e-02	2.9567890000000008e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	29	6.7900333333333895e-03	-1.5432200000000007e-02	3.2901223333333340e-01	0.0000000000000000e+00
-2	5.0000000000000003e-02	0	1	26	22	30	6.7900333333333895e-03	-1.5432200000000007e-02	3.6234556666666673e-01	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000000.tsv
deleted file mode 100644
index e7d350aab..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-0	0.0000000000000000e+00	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000001.tsv
deleted file mode 100644
index c20345485..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-1	3.3333333333333333e-02	0.0000000000000000e+00
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000002.tsv
deleted file mode 100644
index e399a6759..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_max_error.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_max_error
-2	5.0000000000000003e-02	2.2204460492503131e-16
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000000.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000000.tsv
deleted file mode 100644
index c0ef87453..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000000.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-0	0.0000000000000000e+00	1.3248000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000001.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000001.tsv
deleted file mode 100644
index 89fc13530..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000001.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-1	3.3333333333333333e-02	1.3248000000000000e+04
diff --git a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000002.tsv b/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000002.tsv
deleted file mode 100644
index 77f8f2546..000000000
--- a/TestProlongate/test/test_eno_per_group_o1/testprolongate-gf111_sum_count.it000002.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-# 1:iteration	2:time	3:gf111_sum_count
-2	5.0000000000000003e-02	1.8432000000000000e+04
diff --git a/TestProlongate/test/test_hermite_o1.par b/TestProlongate/test/test_hermite_o1.par
index 6bf46211a..fc9edcd06 100644
--- a/TestProlongate/test/test_hermite_o1.par
+++ b/TestProlongate/test/test_hermite_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_hermite_o3.par b/TestProlongate/test/test_hermite_o3.par
index 96a798b8e..db7fd8192 100644
--- a/TestProlongate/test/test_hermite_o3.par
+++ b/TestProlongate/test/test_hermite_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_hermite_o5.par b/TestProlongate/test/test_hermite_o5.par
index 5d6c5345d..6073ab0a5 100644
--- a/TestProlongate/test/test_hermite_o5.par
+++ b/TestProlongate/test/test_hermite_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o1.par b/TestProlongate/test/test_natural_o1.par
index da484e1b3..f74b3e4bf 100644
--- a/TestProlongate/test/test_natural_o1.par
+++ b/TestProlongate/test/test_natural_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o3.par b/TestProlongate/test/test_natural_o3.par
index 2f924de16..946a7ead1 100644
--- a/TestProlongate/test/test_natural_o3.par
+++ b/TestProlongate/test/test_natural_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o5.par b/TestProlongate/test/test_natural_o5.par
index a15814b7d..2d99fd3c0 100644
--- a/TestProlongate/test/test_natural_o5.par
+++ b/TestProlongate/test/test_natural_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_natural_o7.par b/TestProlongate/test/test_natural_o7.par
index 3064d750b..d71be4b31 100644
--- a/TestProlongate/test/test_natural_o7.par
+++ b/TestProlongate/test/test_natural_o7.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o1.par b/TestProlongate/test/test_poly_cons3lfb_o1.par
index 878a1ca6b..9caa4e5bb 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o1.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o1.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o3.par b/TestProlongate/test/test_poly_cons3lfb_o3.par
index ca93e5c24..d3293b058 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o3.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o3.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestProlongate/test/test_poly_cons3lfb_o5.par b/TestProlongate/test/test_poly_cons3lfb_o5.par
index 6f7b465b7..a4540f577 100644
--- a/TestProlongate/test/test_poly_cons3lfb_o5.par
+++ b/TestProlongate/test/test_poly_cons3lfb_o5.par
@@ -44,7 +44,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 1
-CarpetX::regrid_error_threshold = 0.01
+Driver::regrid_error_threshold = 0.01
 
 CarpetX::dtfac = 0.5
 
diff --git a/TestSubcycling/test/subcycle.par b/TestSubcycling/test/subcycle.par
index 70cdfd19c..ab5c912eb 100644
--- a/TestSubcycling/test/subcycle.par
+++ b/TestSubcycling/test/subcycle.par
@@ -13,9 +13,10 @@ CarpetX::ncells_x = 32
 CarpetX::ncells_y = 32
 CarpetX::ncells_z = 32
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::max_grid_size_x = 10000000
 CarpetX::max_grid_size_y = 10000000
@@ -34,7 +35,7 @@ CarpetX::restrict_during_sync = no
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = "yes"
-CarpetX::regrid_error_threshold = 4.
+Driver::regrid_error_threshold = 4.
 CarpetX::max_num_levels = 2
 
 IO::out_dir = $parfile
@@ -50,5 +51,5 @@ CarpetX::out_performance = no
 CarpetX::out_metadata = no
 CarpetX::out_tsv_vars = "
   TestSubcycling::iteration
-  CarpetX::regrid_error
+  CarpetXRegrid::regrid_error
 "
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000000.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000001.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000001.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000002.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000002.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000003.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000003.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000004.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000004.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000005.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000005.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000006.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000006.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000007.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000007.z.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.x.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.x.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.x.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.x.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.y.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.y.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.y.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.y.tsv
diff --git a/TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.z.tsv b/TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.z.tsv
similarity index 100%
rename from TestSubcycling/test/subcycle/carpetx-regrid_error.it000008.z.tsv
rename to TestSubcycling/test/subcycle/carpetxregrid-regrid_error.it000008.z.tsv
diff --git a/TestSubcyclingMC/interface.ccl b/TestSubcyclingMC/interface.ccl
index 8e2d3e147..dfafa56f9 100644
--- a/TestSubcyclingMC/interface.ccl
+++ b/TestSubcyclingMC/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: TestSubcyclingMC
 
-INHERITS: CarpetX Subcycling
-
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: subcycling.hxx
 USES INCLUDE HEADER: vect.hxx
diff --git a/TestSubcyclingMC/param.ccl b/TestSubcyclingMC/param.ccl
index dde3d2693..0db5c790b 100644
--- a/TestSubcyclingMC/param.ccl
+++ b/TestSubcyclingMC/param.ccl
@@ -32,6 +32,6 @@ CCTK_REAL gaussian_width "width of Gaussian"
 } 1.0
 
 
-SHARES: CarpetX
+SHARES: Driver
 
 USES BOOLEAN use_subcycling_wip
diff --git a/TestSubcyclingMC/test/gaussian.par b/TestSubcyclingMC/test/gaussian.par
index dedc8cfed..75708eaf4 100644
--- a/TestSubcyclingMC/test/gaussian.par
+++ b/TestSubcyclingMC/test/gaussian.par
@@ -33,13 +33,14 @@ CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
 CarpetX::ncells_z = $ncells
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 128
-CarpetX::regrid_error_threshold = 0.9
+Driver::regrid_every = 128
+Driver::regrid_error_threshold = 0.9
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 5
diff --git a/TestSubcyclingMC/test/gaussian_noSC.par b/TestSubcyclingMC/test/gaussian_noSC.par
index 873763076..d13fa5aa8 100644
--- a/TestSubcyclingMC/test/gaussian_noSC.par
+++ b/TestSubcyclingMC/test/gaussian_noSC.par
@@ -33,13 +33,14 @@ CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
 CarpetX::ncells_z = $ncells
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 128
-CarpetX::regrid_error_threshold = 0.9
+Driver::regrid_every = 128
+Driver::regrid_error_threshold = 0.9
 
 CarpetX::prolongation_type = "ddf"
 CarpetX::prolongation_order = 5
diff --git a/TestSubcyclingMC2/interface.ccl b/TestSubcyclingMC2/interface.ccl
index 94240b487..3144d4cc2 100644
--- a/TestSubcyclingMC2/interface.ccl
+++ b/TestSubcyclingMC2/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: TestSubcyclingMC2
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: vect.hxx
 
diff --git a/TestSubcyclingMC2/test/gaussian.par b/TestSubcyclingMC2/test/gaussian.par
index ba184ff42..74a5e6a5f 100644
--- a/TestSubcyclingMC2/test/gaussian.par
+++ b/TestSubcyclingMC2/test/gaussian.par
@@ -35,13 +35,14 @@ CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
 CarpetX::ncells_z = $ncells
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 128
-CarpetX::regrid_error_threshold = 0.9
+Driver::regrid_every = 128
+Driver::regrid_error_threshold = 0.9
 
 CarpetX::prolongation_type = "ddf"
 #CarpetX::prolongation_order = 5
diff --git a/TestSubcyclingMC2/test/gaussian_noSC.par b/TestSubcyclingMC2/test/gaussian_noSC.par
index 45d7a9ca8..6ba5ec4aa 100644
--- a/TestSubcyclingMC2/test/gaussian_noSC.par
+++ b/TestSubcyclingMC2/test/gaussian_noSC.par
@@ -35,13 +35,14 @@ CarpetX::ncells_x = $ncells
 CarpetX::ncells_y = $ncells
 CarpetX::ncells_z = $ncells
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::max_num_levels = $nlevels
-CarpetX::regrid_every = 128
-CarpetX::regrid_error_threshold = 0.9
+Driver::regrid_every = 128
+Driver::regrid_error_threshold = 0.9
 
 CarpetX::prolongation_type = "ddf"
 #CarpetX::prolongation_order = 5
diff --git a/TestSymmetries/configuration.ccl b/TestSymmetries/configuration.ccl
index 38fae9ac2..e3b43dff3 100644
--- a/TestSymmetries/configuration.ccl
+++ b/TestSymmetries/configuration.ccl
@@ -1,3 +1,5 @@
 # Configuration definitions for thorn TestSymmetries
 
+REQUIRES Arith
 REQUIRES CarpetX
+REQUIRES Loop
diff --git a/TestSymmetries/interface.ccl b/TestSymmetries/interface.ccl
index 4df5d4367..b30e95a5a 100644
--- a/TestSymmetries/interface.ccl
+++ b/TestSymmetries/interface.ccl
@@ -3,6 +3,7 @@
 IMPLEMENTS: TestSymmetries
 
 USES INCLUDE HEADER: loop_device.hxx
+USES INCLUDE HEADER: vect.hxx
 
 CCTK_REAL var_vvv_ppp TYPE=gf CENTERING={vvv} TAGS="parities={+1 +1 +1}" "var_vvv_ppp"
 CCTK_REAL var_vvc_ppp TYPE=gf CENTERING={vvc} TAGS="parities={+1 +1 +1}" "var_vvc_ppp"
diff --git a/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par b/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
index 3a3063ccd..16842dd75 100644
--- a/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
+++ b/TestSymmetries/par/test_symmetry_xnone_ynone_znone.par
@@ -19,9 +19,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::reflection_x = no
 CarpetX::reflection_y = no
diff --git a/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par b/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
index a7488aafe..8c8722574 100644
--- a/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
+++ b/TestSymmetries/par/test_symmetry_xperiodic_yperiodic_zperiodic.par
@@ -19,9 +19,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 CarpetX::reflection_x = no
 CarpetX::reflection_y = no
diff --git a/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par b/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
index 5399f5a2f..3acedfa42 100644
--- a/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
+++ b/TestSymmetries/par/test_symmetry_xreflohi_yreflohi_zreflohi.par
@@ -19,9 +19,9 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 
 CarpetX::reflection_x = yes
 CarpetX::reflection_y = yes
diff --git a/TestSymmetries/src/init.cxx b/TestSymmetries/src/init.cxx
index 81c56e3ce..e6604c688 100644
--- a/TestSymmetries/src/init.cxx
+++ b/TestSymmetries/src/init.cxx
@@ -1,10 +1,11 @@
 #include <loop_device.hxx>
 
+#include <vect.hxx>
+
 #include <cctk.h>
 #include <cctk_Arguments.h>
 #include <cctk_Parameters.h>
 
-#include <array>
 #include <cassert>
 #include <cmath>
 #include <limits>
@@ -12,6 +13,8 @@
 
 namespace TestSymmetries {
 
+using Arith::vect;
+
 bool get_parameter(const std::string &name, const std::string &thorn) {
   int type;
   const void *const ptr = CCTK_ParameterGet(name.c_str(), thorn.c_str(), &type);
@@ -23,21 +26,21 @@ bool get_parameter(const std::string &name, const std::string &thorn) {
 
 template <int CI, int CJ, int CK, Loop::where_t where, typename F>
 void map_centering_parity(const cGH *restrict const cctkGH,
-                          const std::array<int, 3> &parity, const F &f) {
+                          const vect<int, 3> &parity, const F &f) {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
-  const std::array<bool, 3> periodic{
+  const vect<bool, 3> periodic{
       get_parameter("periodic_x", "CarpetX"),
       get_parameter("periodic_y", "CarpetX"),
       get_parameter("periodic_z", "CarpetX"),
   };
-  const std::array<bool, 3> reflection_lower{
+  const vect<bool, 3> reflection_lower{
       get_parameter("reflection_x", "CarpetX"),
       get_parameter("reflection_y", "CarpetX"),
       get_parameter("reflection_z", "CarpetX"),
   };
-  const std::array<bool, 3> reflection_upper{
+  const vect<bool, 3> reflection_upper{
       get_parameter("reflection_upper_x", "CarpetX"),
       get_parameter("reflection_upper_y", "CarpetX"),
       get_parameter("reflection_upper_z", "CarpetX"),
@@ -46,7 +49,7 @@ void map_centering_parity(const cGH *restrict const cctkGH,
   // We assume the domain is [-1; +1]
 
   const auto makevalue =
-      [=] CCTK_DEVICE CCTK_HOST(const std::array<CCTK_REAL, Loop::dim> &x)
+      [=] CCTK_DEVICE CCTK_HOST(const vect<CCTK_REAL, Loop::dim> &x)
           CCTK_ATTRIBUTE_ALWAYS_INLINE {
             using std::acos, std::cos, std::sin;
             const CCTK_REAL pi = acos(CCTK_REAL(-1));
@@ -89,9 +92,9 @@ void map_centering_parity(const cGH *restrict const cctkGH,
     for (int k = -3; k <= 3; ++k) {
       for (int j = -3; j <= 3; ++j) {
         for (int i = -3; i <= 3; ++i) {
-          const std::array<CCTK_REAL, 3> x{
-              CCTK_REAL(0.5) * i, CCTK_REAL(0.5) * j, CCTK_REAL(0.5) * k};
-          std::array<CCTK_REAL, 3> x0 = x;
+          const vect<CCTK_REAL, 3> x{CCTK_REAL(0.5) * i, CCTK_REAL(0.5) * j,
+                                     CCTK_REAL(0.5) * k};
+          vect<CCTK_REAL, 3> x0 = x;
           CCTK_REAL f = makevalue(x);
           // map f back into the domain
           for (int d = 0; d < 3; ++d) {
@@ -129,15 +132,15 @@ void map_centering_parity(const cGH *restrict const cctkGH,
                    10 * std::numeric_limits<CCTK_REAL>::epsilon());
           }
         } // for i
-      }   // for j
-    }     // for k
+      } // for j
+    } // for k
     // Test that the function is not just zero
     for (int k = -5; k <= 5; ++k) {
       for (int j = -5; j <= 5; ++j) {
         for (int i = -5; i <= 5; ++i) {
           if (abs(i) >= 3 && abs(j) >= 3 && abs(k) >= 3) {
-            const std::array<CCTK_REAL, 3> x{
-                CCTK_REAL(0.25) * i, CCTK_REAL(0.25) * j, CCTK_REAL(0.25) * k};
+            const vect<CCTK_REAL, 3> x{CCTK_REAL(0.25) * i, CCTK_REAL(0.25) * j,
+                                       CCTK_REAL(0.25) * k};
             const CCTK_REAL f = makevalue(x);
             const bool want_zero =
                 (parity[0] < 0 && reflection_lower[0] && i == -4) ||
@@ -160,9 +163,9 @@ void map_centering_parity(const cGH *restrict const cctkGH,
     }
   }
 
-  constexpr std::array<int, Loop::dim> centering{CI, CJ, CK};
+  constexpr vect<int, Loop::dim> centering{CI, CJ, CK};
   const Loop::GF3D2layout layout(cctkGH, centering);
-  const std::array<std::array<CCTK_REAL *, 8>, 2> gfptrs{{
+  const vect<vect<CCTK_REAL *, 8>, 2> gfptrs{{
       {{
           var_vvv_mmm,
           var_vvc_mmm,
@@ -202,7 +205,7 @@ void map_centering_all_parities(const cGH *restrict const cctkGH, const F &f) {
   for (int pk = -1; pk <= +1; pk += 2) {
     for (int pj = -1; pj <= +1; pj += 2) {
       for (int pi = -1; pi <= +1; pi += 2) {
-        const std::array<int, 3> parity{pi, pj, pk};
+        const vect<int, 3> parity{pi, pj, pk};
 
         // Other parities are not (yet?) implemented and tested
         if (!((pi < 0 && pj < 0 && pk < 0) || (pi > 0 && pj > 0 && pk > 0)))
diff --git a/WaveToyX/interface.ccl b/WaveToyX/interface.ccl
index ddfbbdb47..fd399a45c 100644
--- a/WaveToyX/interface.ccl
+++ b/WaveToyX/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: WaveToyX
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: vect.hxx
 
diff --git a/WaveToyX/par/standing.par b/WaveToyX/par/standing.par
index 74b9c31d6..3a3b5dc7d 100644
--- a/WaveToyX/par/standing.par
+++ b/WaveToyX/par/standing.par
@@ -13,9 +13,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0
diff --git a/WaveToyX/schedule.ccl b/WaveToyX/schedule.ccl
index d91981e83..41c59a776 100644
--- a/WaveToyX/schedule.ccl
+++ b/WaveToyX/schedule.ccl
@@ -12,33 +12,40 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 
+SCHEDULE WaveToyX_Boundaries IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: state
+} "Apply boundary conditions"
+
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS
 {
   LANG: C
   READS: state(everywhere)
   WRITES: rhs(interior)
-  # Sync for test output
-  SYNC: rhs
 } "Calculate scalar wave RHS"
 
-SCHEDULE WaveToyX_Boundaries IN ODESolvers_PostStep
+SCHEDULE WaveToyX_RHS AT analysis
 {
   LANG: C
-  OPTIONS: global
-  SYNC: state
-} "Apply boundary conditions"
+  READS: state(everywhere)
+  WRITES: rhs(interior)
+  # Sync for test output
+  SYNC: rhs
+} "Calculate scalar wave RHS (so that it can be output)"
 
-SCHEDULE WaveToyX_Energy IN ODESolvers_PostStep AFTER WaveToyX_Boundaries
+SCHEDULE WaveToyX_Energy at analysis
 {
   LANG: C
   READS: state(everywhere)
@@ -46,7 +53,7 @@ SCHEDULE WaveToyX_Energy IN ODESolvers_PostStep AFTER WaveToyX_Boundaries
   SYNC: energy
 } "Calculate scalar wave energy density"
 
-SCHEDULE WaveToyX_Error IN ODESolvers_PostStep
+SCHEDULE WaveToyX_Error at analysis
 {
   LANG: C
   READS: state(interior)
diff --git a/WaveToyX/test/presync.par b/WaveToyX/test/presync.par
index 49d9acb59..bd9684c82 100644
--- a/WaveToyX/test/presync.par
+++ b/WaveToyX/test/presync.par
@@ -14,9 +14,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -26,6 +27,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -35,7 +37,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
+    WaveToyX::rhs
 "
diff --git a/WaveToyX/test/presync/norms/carpetx-regrid_error.tsv b/WaveToyX/test/presync/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/presync/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/presync/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000000.x.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000000.x.tsv
new file mode 100644
index 000000000..0e8f7a1a4
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000000.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+0	0.0000000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091444e+01
+0	0.0000000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-2.8117749006091437e+01
+0	0.0000000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091444e+01
+0	0.0000000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000000.y.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000000.y.tsv
new file mode 100644
index 000000000..fc8385b19
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000000.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+0	0.0000000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091444e+01
+0	0.0000000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-5.0000000000000000e-01	0.0000000000000000e+00	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-2.5000000000000000e-01	0.0000000000000000e+00	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-2.8117749006091437e+01
+0	0.0000000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	2.5000000000000000e-01	0.0000000000000000e+00	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	5.0000000000000000e-01	0.0000000000000000e+00	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091444e+01
+0	0.0000000000000000e+00	0	0	4	9	4	0.0000000000000000e+00	1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000000.z.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000000.z.tsv
new file mode 100644
index 000000000..71c459bb4
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000000.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+0	0.0000000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.2500000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091440e+01
+0	0.0000000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	0.0000000000000000e+00	-7.5000000000000000e-01	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	0.0000000000000000e+00	-5.0000000000000000e-01	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	0.0000000000000000e+00	-2.5000000000000000e-01	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-0.0000000000000000e+00	-2.8117749006091437e+01
+0	0.0000000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	0.0000000000000000e+00	2.5000000000000000e-01	-0.0000000000000000e+00	-1.9882250993908560e+01
+0	0.0000000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	0.0000000000000000e+00	5.0000000000000000e-01	-0.0000000000000000e+00	-1.1478103773179512e-15
+0	0.0000000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	0.0000000000000000e+00	7.5000000000000000e-01	0.0000000000000000e+00	1.9882250993908556e+01
+0	0.0000000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	2.8117749006091440e+01
+0	0.0000000000000000e+00	0	0	4	4	9	0.0000000000000000e+00	0.0000000000000000e+00	1.2500000000000000e+00	0.0000000000000000e+00	1.9882250993908556e+01
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000010.x.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000010.x.tsv
new file mode 100644
index 000000000..bfbf338b6
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000010.x.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+10	1.2500000000000000e+00	0	0	-1	4	4	-1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3167771636375232e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	0	4	4	-1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8622041234393587e+00	2.4310942915024711e+01
+10	1.2500000000000000e+00	0	0	1	4	4	-7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.3167771636375234e+00	1.7190432592252975e+01
+10	1.2500000000000000e+00	0	0	2	4	4	-5.0000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.3684225283389090e-16	6.5263469327843072e-15
+10	1.2500000000000000e+00	0	0	3	4	4	-2.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.3167771636375218e+00	-1.7190432592253003e+01
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.8622041234393623e+00	-2.4310942915024683e+01
+10	1.2500000000000000e+00	0	0	5	4	4	2.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	-1.3167771636375218e+00	-1.7190432592253003e+01
+10	1.2500000000000000e+00	0	0	6	4	4	5.0000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	6.9960068410921409e-17	4.0476782657880230e-15
+10	1.2500000000000000e+00	0	0	7	4	4	7.5000000000000000e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.3167771636375232e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	8	4	4	1.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8622041234393587e+00	2.4310942915024711e+01
+10	1.2500000000000000e+00	0	0	9	4	4	1.2500000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3167771636375234e+00	1.7190432592252975e+01
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000010.y.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000010.y.tsv
new file mode 100644
index 000000000..aa8bb2182
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000010.y.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+10	1.2500000000000000e+00	0	0	4	-1	4	0.0000000000000000e+00	-1.2500000000000000e+00	0.0000000000000000e+00	1.3167771636375232e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	4	0	4	0.0000000000000000e+00	-1.0000000000000000e+00	0.0000000000000000e+00	1.8622041234393587e+00	2.4310942915024711e+01
+10	1.2500000000000000e+00	0	0	4	1	4	0.0000000000000000e+00	-7.5000000000000000e-01	0.0000000000000000e+00	1.3167771636375234e+00	1.7190432592252975e+01
+10	1.2500000000000000e+00	0	0	4	2	4	0.0000000000000000e+00	-5.0000000000000000e-01	0.0000000000000000e+00	-4.3684225283389090e-16	6.5263469327843072e-15
+10	1.2500000000000000e+00	0	0	4	3	4	0.0000000000000000e+00	-2.5000000000000000e-01	0.0000000000000000e+00	-1.3167771636375218e+00	-1.7190432592253003e+01
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.8622041234393623e+00	-2.4310942915024683e+01
+10	1.2500000000000000e+00	0	0	4	5	4	0.0000000000000000e+00	2.5000000000000000e-01	0.0000000000000000e+00	-1.3167771636375218e+00	-1.7190432592253003e+01
+10	1.2500000000000000e+00	0	0	4	6	4	0.0000000000000000e+00	5.0000000000000000e-01	0.0000000000000000e+00	6.9960068410921409e-17	4.0476782657880230e-15
+10	1.2500000000000000e+00	0	0	4	7	4	0.0000000000000000e+00	7.5000000000000000e-01	0.0000000000000000e+00	1.3167771636375232e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	4	8	4	0.0000000000000000e+00	1.0000000000000000e+00	0.0000000000000000e+00	1.8622041234393587e+00	2.4310942915024711e+01
+10	1.2500000000000000e+00	0	0	4	9	4	0.0000000000000000e+00	1.2500000000000000e+00	0.0000000000000000e+00	1.3167771636375234e+00	1.7190432592252975e+01
diff --git a/WaveToyX/test/presync/wavetoyx-rhs.it000010.z.tsv b/WaveToyX/test/presync/wavetoyx-rhs.it000010.z.tsv
new file mode 100644
index 000000000..dad8612da
--- /dev/null
+++ b/WaveToyX/test/presync/wavetoyx-rhs.it000010.z.tsv
@@ -0,0 +1,12 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:u_rhs	12:rho_rhs
+10	1.2500000000000000e+00	0	0	4	4	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.2500000000000000e+00	1.3167771636375223e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	4	4	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+00	1.8622041234393611e+00	2.4310942915024697e+01
+10	1.2500000000000000e+00	0	0	4	4	1	0.0000000000000000e+00	0.0000000000000000e+00	-7.5000000000000000e-01	1.3167771636375225e+00	1.7190432592252986e+01
+10	1.2500000000000000e+00	0	0	4	4	2	0.0000000000000000e+00	0.0000000000000000e+00	-5.0000000000000000e-01	-2.5450533252964536e-16	3.7656431876638559e-15
+10	1.2500000000000000e+00	0	0	4	4	3	0.0000000000000000e+00	0.0000000000000000e+00	-2.5000000000000000e-01	-1.3167771636375218e+00	-1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	4	4	4	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.8622041234393623e+00	-2.4310942915024683e+01
+10	1.2500000000000000e+00	0	0	4	4	5	0.0000000000000000e+00	0.0000000000000000e+00	2.5000000000000000e-01	-1.3167771636375234e+00	-1.7190432592252979e+01
+10	1.2500000000000000e+00	0	0	4	4	6	0.0000000000000000e+00	0.0000000000000000e+00	5.0000000000000000e-01	-7.1556612141240883e-16	-1.7214687860755355e-15
+10	1.2500000000000000e+00	0	0	4	4	7	0.0000000000000000e+00	0.0000000000000000e+00	7.5000000000000000e-01	1.3167771636375223e+00	1.7190432592252996e+01
+10	1.2500000000000000e+00	0	0	4	4	8	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+00	1.8622041234393611e+00	2.4310942915024697e+01
+10	1.2500000000000000e+00	0	0	4	4	9	0.0000000000000000e+00	0.0000000000000000e+00	1.2500000000000000e+00	1.3167771636375225e+00	1.7190432592252986e+01
diff --git a/WaveToyX/test/radiative.par b/WaveToyX/test/radiative.par
index 6fb37594d..864621c45 100644
--- a/WaveToyX/test/radiative.par
+++ b/WaveToyX/test/radiative.par
@@ -41,7 +41,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
+    WaveToyX::rhs
 "
diff --git a/WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv b/WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/radiative/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/radiative/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/reflecting.par b/WaveToyX/test/reflecting.par
index 00d702d0c..f1805b7a1 100644
--- a/WaveToyX/test/reflecting.par
+++ b/WaveToyX/test/reflecting.par
@@ -40,7 +40,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
+    WaveToyX::rhs
 "
diff --git a/WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv b/WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/reflecting/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/reflecting/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing.par b/WaveToyX/test/standing.par
index 2193a1bc1..70bb3b7ab 100644
--- a/WaveToyX/test/standing.par
+++ b/WaveToyX/test/standing.par
@@ -14,9 +14,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -35,7 +36,7 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
+    WaveToyX::rhs
 "
diff --git a/WaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/WaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
similarity index 100%
rename from WaveToyX/test/standing/norms/carpetx-regrid_error.tsv
rename to WaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv
diff --git a/docker/carpetx-arm64v8-cpu.dockerfile b/docker/carpetx-arm64v8-cpu.dockerfile
index 58353cb53..271819077 100644
--- a/docker/carpetx-arm64v8-cpu.dockerfile
+++ b/docker/carpetx-arm64v8-cpu.dockerfile
@@ -7,8 +7,9 @@
 #     docker push einsteintoolkit/carpetx:arm64v8-cpu-real32
 
 # noble is ubuntu:24.04
-# FROM arm64v8/ubuntu:noble-20240530
-FROM arm64v8/ubuntu:noble-20240605
+# FROM arm64v8/ubuntu:noble-20240801
+# FROM arm64v8/ubuntu:noble-20240904.1
+FROM arm64v8/ubuntu:noble-20241011
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -24,10 +25,13 @@ WORKDIR /cactus
 #        python2
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
+        bzip2 \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
+        elfutils \
         g++ \
         gcc \
         gdb \
@@ -45,9 +49,13 @@ RUN apt-get update && \
         libgsl-dev \
         libhdf5-dev \
         libhwloc-dev \
+        libiberty-dev \
+        liblzma-dev \
         libopenblas-dev \
         libopenmpi-dev \
+        libpapi-dev \
         libpetsc-real-dev \
+        libprotobuf-dev \
         libtool \
         libudev-dev \
         libyaml-cpp-dev \
@@ -58,58 +66,64 @@ RUN apt-get update && \
         meson \
         ninja-build \
         numactl \
+        papi-tools \
+        patch \
         perl \
         pkgconf \
+        protobuf-compiler \
         python3 \
         python3-pip \
         python3-requests \
         rsync \
         subversion \
+        tar \
         vim \
         wget \
         xz-utils \
         zlib1g-dev \
+        zstd \
         && \
     rm -rf /var/lib/apt/lists/*
 
-# # Install HPCToolkit
-# # Install this first because it is expensive to build
-# RUN mkdir src && \
-#     (cd src && \
-#     wget https://github.com/spack/spack/archive/refs/tags/v0.21.0.tar.gz && \
-#     tar xzf v0.21.0.tar.gz && \
-#     export SPACK_ROOT="$(pwd)/spack-0.21.0" && \
-#     mkdir -p "${HOME}/.spack" && \
-#     echo 'config: {install_tree: {root: /spack}}' >"${HOME}/.spack/config.yaml" && \
-#     . ${SPACK_ROOT}/share/spack/setup-env.sh && \
-#     spack external find \
-#         autoconf \
-#         automake \
-#         cmake \
-#         diffutils \
-#         elfutils \
-#         gmake \
-#         libtool \
-#         m4 \
-#         meson \
-#         ninja \
-#         numactl \
-#         perl \
-#         pkgconf \
-#         python \
-#     && \
-#     spack install --fail-fast hpctoolkit ~viewer && \
-#     spack view --dependencies no hardlink /hpctoolkit hpctoolkit && \
-#     true) && \
-#     rm -rf src "${HOME}/.spack"
+# Install HPCToolkit
+# Install this first because it is expensive to build
+# Try to reuse build tools from Ubuntu, but do not use any libraries because HPC Toolkit is a bit iffy to install.
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/spack/spack/archive/refs/tags/v0.22.2.tar.gz && \
+    tar xzf v0.22.2.tar.gz && \
+    export SPACK_ROOT="$(pwd)/spack-0.22.2" && \
+    mkdir -p "${HOME}/.spack" && \
+    echo 'config: {install_tree: {root: /spack}}' >"${HOME}/.spack/config.yaml" && \
+    . ${SPACK_ROOT}/share/spack/setup-env.sh && \
+    spack external find \
+        autoconf \
+        automake \
+        cmake \
+        diffutils \
+        elfutils \
+        gmake \
+        libtool \
+        m4 \
+        meson \
+        ninja \
+        numactl \
+        perl \
+        pkgconf \
+        python \
+    && \
+    spack install --fail-fast hpctoolkit ~viewer && \
+    spack view --dependencies no hardlink /hpctoolkit hpctoolkit && \
+    true) && \
+    rm -rf src "${HOME}/.spack"
 
 # Install blosc2
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -124,14 +138,35 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+# Install MGARD
+# MGARD is a lossy compression library
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/CODARcode/MGARD/archive/refs/tags/1.5.2.tar.gz && \
+    tar xzf 1.5.2.tar.gz && \
+    cd MGARD-1.5.2 && \
+    cmake -B build -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_PREFIX_PATH=/usr/local \
+        -DMGARD_ENABLE_OPENMP=ON \
+        -DMGARD_ENABLE_SERIAL=ON \
+        && \
+    cmake --build build && \
+    cmake --install build && \
+    true) && \
+    rm -rf src
+
 # Install ADIOS2
 # ADIOS2 is a parallel I/O library, comparable to HDF5
 # - depends on blosc2
+# - depends on MGARD
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.1.tar.gz && \
-    tar xzf v2.10.1.tar.gz && \
-    cd ADIOS2-2.10.1 && \
+    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.2.tar.gz && \
+    tar xzf v2.10.2.tar.gz && \
+    cd ADIOS2-2.10.2 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -141,6 +176,7 @@ RUN mkdir src && \
         -DADIOS2_Blosc2_PREFER_SHARED=ON \
         -DADIOS2_USE_Blosc2=ON \
         -DADIOS2_USE_Fortran=OFF \
+        -DADIOS2_USE_MGARD=ON \
         && \
     cmake --build build && \
     cmake --install build && \
@@ -188,9 +224,9 @@ RUN mkdir src && \
 # - depends on ADIOS2
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.15.2.tar.gz && \
-    tar xzf 0.15.2.tar.gz && \
-    cd openPMD-api-0.15.2 && \
+    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
+    tar xzf 0.16.0.tar.gz && \
+    cd openPMD-api-0.16.0 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -267,10 +303,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -285,9 +321,9 @@ ARG real_precision=real64
 # Should we keep the AMReX source tree around for debugging?
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/AMReX-Codes/amrex/archive/24.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.11.tar.gz && \
+    tar xzf 24.11.tar.gz && \
+    cd amrex-24.11 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \
diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile
index e0368e39d..e6b40aa0e 100644
--- a/docker/carpetx-cpu.dockerfile
+++ b/docker/carpetx-cpu.dockerfile
@@ -7,8 +7,9 @@
 #     docker push einsteintoolkit/carpetx:cpu-real32
 
 # noble is ubuntu:24.04
-# FROM ubuntu:noble-20240530
-FROM ubuntu:noble-20240605
+# FROM amd64/ubuntu:noble-20240801
+# FROM amd64/ubuntu:noble-20240904.1
+FROM amd64/ubuntu:noble-20241011
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -26,6 +27,7 @@ RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         bzip2 \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -53,6 +55,7 @@ RUN apt-get update && \
         libopenmpi-dev \
         libpapi-dev \
         libpetsc-real-dev \
+        libprotobuf-dev \
         libtool \
         libudev-dev \
         libyaml-cpp-dev \
@@ -67,6 +70,7 @@ RUN apt-get update && \
         patch \
         perl \
         pkgconf \
+        protobuf-compiler \
         python3 \
         python3-pip \
         python3-requests \
@@ -86,9 +90,9 @@ RUN apt-get update && \
 # Try to reuse build tools from Ubuntu, but do not use any libraries because HPC Toolkit is a bit iffy to install.
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/spack/spack/archive/refs/tags/v0.22.1.tar.gz && \
-    tar xzf v0.22.1.tar.gz && \
-    export SPACK_ROOT="$(pwd)/spack-0.22.1" && \
+    wget https://github.com/spack/spack/archive/refs/tags/v0.22.2.tar.gz && \
+    tar xzf v0.22.2.tar.gz && \
+    export SPACK_ROOT="$(pwd)/spack-0.22.2" && \
     mkdir -p "${HOME}/.spack" && \
     echo 'config: {install_tree: {root: /spack}}' >"${HOME}/.spack/config.yaml" && \
     . ${SPACK_ROOT}/share/spack/setup-env.sh && \
@@ -117,9 +121,9 @@ RUN mkdir src && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -134,14 +138,35 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+# Install MGARD
+# MGARD is a lossy compression library
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/CODARcode/MGARD/archive/refs/tags/1.5.2.tar.gz && \
+    tar xzf 1.5.2.tar.gz && \
+    cd MGARD-1.5.2 && \
+    cmake -B build -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_PREFIX_PATH=/usr/local \
+        -DMGARD_ENABLE_OPENMP=ON \
+        -DMGARD_ENABLE_SERIAL=ON \
+        && \
+    cmake --build build && \
+    cmake --install build && \
+    true) && \
+    rm -rf src
+
 # Install ADIOS2
 # ADIOS2 is a parallel I/O library, comparable to HDF5
 # - depends on blosc2
+# - depends on MGARD
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.1.tar.gz && \
-    tar xzf v2.10.1.tar.gz && \
-    cd ADIOS2-2.10.1 && \
+    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.2.tar.gz && \
+    tar xzf v2.10.2.tar.gz && \
+    cd ADIOS2-2.10.2 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -151,6 +176,7 @@ RUN mkdir src && \
         -DADIOS2_Blosc2_PREFER_SHARED=ON \
         -DADIOS2_USE_Blosc2=ON \
         -DADIOS2_USE_Fortran=OFF \
+        -DADIOS2_USE_MGARD=ON \
         && \
     cmake --build build && \
     cmake --install build && \
@@ -198,9 +224,9 @@ RUN mkdir src && \
 # - depends on ADIOS2
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.15.2.tar.gz && \
-    tar xzf 0.15.2.tar.gz && \
-    cd openPMD-api-0.15.2 && \
+    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
+    tar xzf 0.16.0.tar.gz && \
+    cd openPMD-api-0.16.0 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -277,10 +303,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -295,9 +321,9 @@ ARG real_precision=real64
 # Should we keep the AMReX source tree around for debugging?
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/AMReX-Codes/amrex/archive/24.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.11.tar.gz && \
+    tar xzf 24.11.tar.gz && \
+    cd amrex-24.11 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \
diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile
index 668a42b78..9ddaa5432 100644
--- a/docker/carpetx-cuda.dockerfile
+++ b/docker/carpetx-cuda.dockerfile
@@ -6,8 +6,9 @@
 #     docker build --build-arg real_precision=real32 --file carpetx-cuda.dockerfile --tag einsteintoolkit/carpetx:cuda-real32 .
 #     docker push einsteintoolkit/carpetx:cuda-real32
 
-# FROM nvidia/cuda:12.5.1-devel-ubuntu22.04
-FROM nvidia/cuda:12.5.1-devel-ubuntu24.04
+# FROM nvidia/cuda:12.5.1-devel-ubuntu24.04
+# FROM nvidia/cuda:12.6.1-devel-ubuntu24.04
+FROM nvidia/cuda:12.6.2-devel-ubuntu24.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -24,6 +25,7 @@ WORKDIR /cactus
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -47,6 +49,7 @@ RUN apt-get update && \
         libopenblas-dev \
         libopenmpi-dev \
         libpetsc-real-dev \
+        libprotobuf-dev \
         libtool \
         libudev-dev \
         libyaml-cpp-dev \
@@ -58,6 +61,7 @@ RUN apt-get update && \
         numactl \
         perl \
         pkgconf \
+        protobuf-compiler \
         python3 \
         python3-pip \
         python3-requests \
@@ -105,9 +109,9 @@ RUN apt-get update && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -122,14 +126,36 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+# Install MGARD
+# MGARD is a lossy compression library
+# Note: -DMGARD_ENABLE_CUDA=ON requires nvcomp with a restrictive licence
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/CODARcode/MGARD/archive/refs/tags/1.5.2.tar.gz && \
+    tar xzf 1.5.2.tar.gz && \
+    cd MGARD-1.5.2 && \
+    cmake -B build -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_PREFIX_PATH=/usr/local \
+        -DMGARD_ENABLE_OPENMP=ON \
+        -DMGARD_ENABLE_SERIAL=ON \
+        && \
+    cmake --build build && \
+    cmake --install build && \
+    true) && \
+    rm -rf src
+
 # Install ADIOS2
 # ADIOS2 is a parallel I/O library, comparable to HDF5
 # - depends on blosc2
+# - depends on MGARD
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.1.tar.gz && \
-    tar xzf v2.10.1.tar.gz && \
-    cd ADIOS2-2.10.1 && \
+    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.2.tar.gz && \
+    tar xzf v2.10.2.tar.gz && \
+    cd ADIOS2-2.10.2 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -139,6 +165,7 @@ RUN mkdir src && \
         -DADIOS2_Blosc2_PREFER_SHARED=ON \
         -DADIOS2_USE_Blosc2=ON \
         -DADIOS2_USE_Fortran=OFF \
+        -DADIOS2_USE_MGARD=ON \
         && \
     cmake --build build && \
     cmake --install build && \
@@ -186,9 +213,9 @@ RUN mkdir src && \
 # - depends on ADIOS2
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.15.2.tar.gz && \
-    tar xzf 0.15.2.tar.gz && \
-    cd openPMD-api-0.15.2 && \
+    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
+    tar xzf 0.16.0.tar.gz && \
+    cd openPMD-api-0.16.0 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -265,10 +292,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -283,9 +310,9 @@ ARG real_precision=real64
 # Should we keep the AMReX source tree around for debugging?
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/AMReX-Codes/amrex/archive/24.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.11.tar.gz && \
+    tar xzf 24.11.tar.gz && \
+    cd amrex-24.11 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \
diff --git a/docker/carpetx-oneapi.dockerfile b/docker/carpetx-oneapi.dockerfile
index eeb9867f5..885c1e127 100644
--- a/docker/carpetx-oneapi.dockerfile
+++ b/docker/carpetx-oneapi.dockerfile
@@ -6,8 +6,8 @@
 #     docker build --build-arg real_precision=real32 --file carpetx-oneapi.dockerfile --tag einsteintoolkit/carpetx:oneapi-real32 .
 #     docker push einsteintoolkit/carpetx:oneapi-real32
 
-# FROM intel/oneapi-basekit:2024.2.0-devel-ubuntu22.04
-FROM intel/oneapi-basekit:2024.2.0-1-devel-ubuntu22.04
+# FROM intel/oneapi-basekit:2024.2.0-1-devel-ubuntu22.04
+FROM intel/oneapi-basekit:2024.2.1-0-devel-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -23,6 +23,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 28DA432DAAC8BAEA &&
     apt-get update --allow-insecure-repositories && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -46,6 +47,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 28DA432DAAC8BAEA &&
         libopenblas-dev \
         libopenmpi-dev \
         libpetsc-real-dev \
+        libprotobuf-dev \
         libtool \
         libudev-dev \
         libyaml-cpp-dev \
@@ -57,6 +59,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 28DA432DAAC8BAEA &&
         numactl \
         perl \
         pkgconf \
+        protobuf-compiler \
         python3 \
         python3-pip \
         python3-requests \
@@ -84,9 +87,9 @@ RUN find /opt/intel -name 'impi.pc' -delete && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -101,13 +104,36 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+# Install MGARD
+# MGARD is a lossy compression library
+# Note: -DMGARD_ENABLE_SYCL=ON does not work
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/CODARcode/MGARD/archive/refs/tags/1.5.2.tar.gz && \
+    tar xzf 1.5.2.tar.gz && \
+    cd MGARD-1.5.2 && \
+    cmake -B build -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_PREFIX_PATH=/usr/local \
+        -DMGARD_ENABLE_OPENMP=ON \
+        -DMGARD_ENABLE_SERIAL=ON \
+        && \
+    cmake --build build && \
+    cmake --install build && \
+    true) && \
+    rm -rf src
+
 # Install ADIOS2
 # ADIOS2 is a parallel I/O library, comparable to HDF5
+# - depends on blosc2
+# - depends on MGARD
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.1.tar.gz && \
-    tar xzf v2.10.1.tar.gz && \
-    cd ADIOS2-2.10.1 && \
+    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.2.tar.gz && \
+    tar xzf v2.10.2.tar.gz && \
+    cd ADIOS2-2.10.2 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -117,6 +143,7 @@ RUN mkdir src && \
         -DADIOS2_Blosc2_PREFER_SHARED=ON \
         -DADIOS2_USE_Blosc2=ON \
         -DADIOS2_USE_Fortran=OFF \
+        -DADIOS2_USE_MGARD=ON \
         && \
     cmake --build build && \
     cmake --install build && \
@@ -164,9 +191,9 @@ RUN mkdir src && \
 # - depends on ADIOS2
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.15.2.tar.gz && \
-    tar xzf 0.15.2.tar.gz && \
-    cd openPMD-api-0.15.2 && \
+    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
+    tar xzf 0.16.0.tar.gz && \
+    cd openPMD-api-0.16.0 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -243,10 +270,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -261,10 +288,10 @@ ARG real_precision=real64
 # Should we keep the AMReX source tree around for debugging?
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/AMReX-Codes/amrex/archive/24.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.11.tar.gz && \
+    tar xzf 24.11.tar.gz && \
     rm -rf /opt/intel/oneapi/mpi && \
-    cd amrex-24.08 && \
+    cd amrex-24.11 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \
diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile
index 28f3ed28d..3081c958b 100644
--- a/docker/carpetx-rocm.dockerfile
+++ b/docker/carpetx-rocm.dockerfile
@@ -7,6 +7,7 @@
 #     docker push einsteintoolkit/carpetx:rocm-real32
 
 # FROM rocm/dev-ubuntu-22.04:6.1.2
+# FROM rocm/dev-ubuntu-24.04:6.2
 FROM rocm/dev-ubuntu-24.04:6.2
 
 ENV DEBIAN_FRONTEND=noninteractive \
@@ -24,6 +25,7 @@ WORKDIR /cactus
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -48,6 +50,7 @@ RUN apt-get update && \
         libopenblas-dev \
         libopenmpi-dev \
         libpetsc-real-dev \
+        libprotobuf-dev \
         libtool \
         libudev-dev \
         libyaml-cpp-dev \
@@ -59,6 +62,7 @@ RUN apt-get update && \
         numactl \
         perl \
         pkgconf \
+        protobuf-compiler \
         python3 \
         python3-pip \
         python3-requests \
@@ -108,9 +112,9 @@ RUN apt-get update && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -125,13 +129,36 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+# Install MGARD
+# MGARD is a lossy compression library
+# Note: -DMGARD_ENABLE_HIP=ON doesn't work
+RUN mkdir src && \
+    (cd src && \
+    wget https://github.com/CODARcode/MGARD/archive/refs/tags/1.5.2.tar.gz && \
+    tar xzf 1.5.2.tar.gz && \
+    cd MGARD-1.5.2 && \
+    cmake -B build -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_PREFIX_PATH=/usr/local \
+        -DMGARD_ENABLE_OPENMP=ON \
+        -DMGARD_ENABLE_SERIAL=ON \
+        && \
+    cmake --build build && \
+    cmake --install build && \
+    true) && \
+    rm -rf src
+
 # Install ADIOS2
 # ADIOS2 is a parallel I/O library, comparable to HDF5
+# - depends on blosc2
+# - depends on MGARD
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.1.tar.gz && \
-    tar xzf v2.10.1.tar.gz && \
-    cd ADIOS2-2.10.1 && \
+    wget https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.2.tar.gz && \
+    tar xzf v2.10.2.tar.gz && \
+    cd ADIOS2-2.10.2 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -141,6 +168,7 @@ RUN mkdir src && \
         -DADIOS2_Blosc2_PREFER_SHARED=ON \
         -DADIOS2_USE_Blosc2=ON \
         -DADIOS2_USE_Fortran=OFF \
+        -DADIOS2_USE_MGARD=ON \
         && \
     cmake --build build && \
     cmake --install build && \
@@ -188,9 +216,9 @@ RUN mkdir src && \
 # - depends on ADIOS2
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.15.2.tar.gz && \
-    tar xzf 0.15.2.tar.gz && \
-    cd openPMD-api-0.15.2 && \
+    wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
+    tar xzf 0.16.0.tar.gz && \
+    cd openPMD-api-0.16.0 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -267,10 +295,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -285,9 +313,9 @@ ARG real_precision=real64
 # Should we keep the AMReX source tree around for debugging?
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/AMReX-Codes/amrex/archive/24.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.11.tar.gz && \
+    tar xzf 24.11.tar.gz && \
+    cd amrex-24.11 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \
diff --git a/scripts/actions-cuda-real32.cfg b/scripts/actions-cuda-real32.cfg
index 46b94a970..f0c895eae 100644
--- a/scripts/actions-cuda-real32.cfg
+++ b/scripts/actions-cuda-real32.cfg
@@ -15,7 +15,7 @@ FC = gfortran
 F90 = gfortran
 LD = nvcc
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 # - We use "--relocatable-device-code=true" to allow building with
 #   debug versions of AMReX
diff --git a/scripts/actions-cuda-real64.cfg b/scripts/actions-cuda-real64.cfg
index f81beb5dd..8f9f1bba6 100644
--- a/scripts/actions-cuda-real64.cfg
+++ b/scripts/actions-cuda-real64.cfg
@@ -15,7 +15,7 @@ FC = gfortran
 F90 = gfortran
 LD = nvcc
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 # - We use "--relocatable-device-code=true" to allow building with
 #   debug versions of AMReX
diff --git a/scripts/actions-oneapi-real64.cfg b/scripts/actions-oneapi-real64.cfg
index 972d35a73..01fbebb07 100644
--- a/scripts/actions-oneapi-real64.cfg
+++ b/scripts/actions-oneapi-real64.cfg
@@ -16,7 +16,7 @@ F90 = gfortran
 LD = /opt/intel/oneapi/compiler/2024.2/bin/icpx
 
 # -g   # Debug information uses too much disk space on CI
-CPPFLAGS = -DSIMD_DISABLE -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -fp-model=precise -march=x86-64-v3 -pipe -std=gnu11
 CXXFLAGS = -fp-model=precise -fsycl -march=x86-64-v3 -pipe -std=c++17
 FPPFLAGS = -traditional
@@ -45,8 +45,9 @@ FPP_DEBUG_FLAGS = -DCARPET_DEBUG
 F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -finit-character=65 -finit-integer=42424242 -finit-real=nan
 
 OPTIMISE = yes
+# -O3 for SYCL leads to a segfault
 C_OPTIMISE_FLAGS = -O3 -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math
-CXX_OPTIMISE_FLAGS = -O3 -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math
+CXX_OPTIMISE_FLAGS = -O2 -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math
 F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
 
 # Clang segfaults with OpenMP enabled
diff --git a/scripts/actions-rocm-real64.cfg b/scripts/actions-rocm-real64.cfg
index 1fe8a0ecf..f067f13ba 100644
--- a/scripts/actions-rocm-real64.cfg
+++ b/scripts/actions-rocm-real64.cfg
@@ -16,7 +16,7 @@ FC = gfortran
 F90 = gfortran
 LD = /opt/rocm/llvm/bin/clang++
 
-CPPFLAGS = -DSIMD_CPU
+CPPFLAGS = -DSIMD_DISABLE
 CFLAGS = -pipe -g -std=gnu11
 CXXFLAGS = -pipe -g -std=c++17 --offload-arch=gfx90a
 FPPFLAGS = -traditional
diff --git a/scripts/carpetx.th b/scripts/carpetx.th
index 0aea55a49..157477267 100644
--- a/scripts/carpetx.th
+++ b/scripts/carpetx.th
@@ -701,6 +701,7 @@ CarpetX/Algo
 CarpetX/Arith
 CarpetX/BoxInBox
 CarpetX/CarpetX
+CarpetX/CarpetXRegrid
 CarpetX/CoordinatesX
 CarpetX/Derivs
 CarpetX/ErrorEstimator