diff --git a/Docs/thornlist/spacetimex.th b/Docs/thornlist/spacetimex.th
index a01f1bc2..580c5da1 100644
--- a/Docs/thornlist/spacetimex.th
+++ b/Docs/thornlist/spacetimex.th
@@ -171,6 +171,7 @@ SpacetimeX/AHFinderX
 SpacetimeX/BrillLindquist
 SpacetimeX/Cowling
 SpacetimeX/NewRadX
+SpacetimeX/TestNewRadX
 SpacetimeX/Punctures
 SpacetimeX/PunctureTracker
 SpacetimeX/SphericalHarmonics
diff --git a/NewRadX/configuration.ccl b/NewRadX/configuration.ccl
index a1507080..02aa190b 100644
--- a/NewRadX/configuration.ccl
+++ b/NewRadX/configuration.ccl
@@ -1,7 +1,9 @@
 # Configuration definition for thorn NewRadX
 
-REQUIRES GSL Loop
+REQUIRES Loop
+
 PROVIDES NewRadX
 {
 }
+
 REQUIRES NewRadX
diff --git a/NewRadX/interface.ccl b/NewRadX/interface.ccl
index a210f929..123c7162 100644
--- a/NewRadX/interface.ccl
+++ b/NewRadX/interface.ccl
@@ -2,28 +2,8 @@
 
 IMPLEMENTS: NewRadX
 
-USES INCLUDE HEADER: loop.hxx
-USES INCLUDE HEADER: loop_device.hxx
-
-INCLUDE HEADER: newradx.hxx in newradx.hxx
-
 INHERITS: CarpetX
 
-# Scalar field grid functions for the unit test
-CCTK_REAL state TYPE=gf CENTERING={VVV} TAGS='rhs="rhs"'
-{
-  uu
-  vv
-} "Scalar wave state vector: scalar field and its time derivative"
-
-CCTK_REAL rhs TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
-{
-  uu_rhs
-  vv_rhs
-} "RHS of scalar wave state vector"
+USES INCLUDE HEADER: loop_device.hxx
 
-CCTK_REAL error TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
-{
-  uu_err
-  vv_err
-} "Error in scalar wave state vector"
+INCLUDE HEADER: newradx.hxx in newradx.hxx
diff --git a/NewRadX/param.ccl b/NewRadX/param.ccl
index 3046e7ae..7ba1a5f0 100644
--- a/NewRadX/param.ccl
+++ b/NewRadX/param.ccl
@@ -1,52 +1 @@
 # Parameter definitions for thorn NewRadX
-#
-# To use radiative boundary conditions in another thorn, the parameters here are not relevant.
-# These parameters are only used in the unit test for NewRadX, which applies NewRadX in the evolution of a test scalar field
-BOOLEAN run_test "Run scalar field evolution test"
-{
-} "no"
-
-BOOLEAN test_use_newradx "Use radiative boundary conditions for scalar field"
-{
-} "yes"
-
-BOOLEAN test_add_dissipation "Add Kreiss-Oliger dissipation to scalar field RHS"
-{
-} "yes"
-
-CCTK_REAL eps_dissipation "Coefficient for Kreiss-Oliger dissipation"
-{
-  0.0:1.0 :: ""
-} 0.15
-
-CCTK_REAL n_falloff "Exponent of the falloff term r^(-n_falloff) in the scalar field potential"
-{
-  0.0:* :: ""
-} 2.0
-
-
-# Parameters scalar field test initial data
-CCTK_REAL gaussian_a0 "Scalar field initial Gaussian amplitude"
-{
-  *:* :: ""
-} 1.0
-
-CCTK_REAL gaussian_w0 "Scalar field initial Gaussian profile width"
-{
-  0.0:* :: ""
-} 1.0
-
-CCTK_REAL gaussian_x0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0
-
-CCTK_REAL gaussian_y0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0
-
-CCTK_REAL gaussian_z0 "Scalar field initial Gaussian profile center"
-{
-  *:* :: ""
-} 0.0
diff --git a/NewRadX/schedule.ccl b/NewRadX/schedule.ccl
index 32f9e2a9..42e426b6 100644
--- a/NewRadX/schedule.ccl
+++ b/NewRadX/schedule.ccl
@@ -1,42 +1 @@
 # Schedule definitions for thorn NewRadX 
-
-if (run_test) {
-  STORAGE: state
-
-  SCHEDULE NewRadX_Init AT initial
-  {
-    LANG: C
-    WRITES: state(interior)
-    SYNC: state
-  } "Initialize scalar wave state"
-
-  SCHEDULE NewRadX_EstimateError AT postinitial
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
-  } "Estimate error for regridding"
-
-  SCHEDULE NewRadX_EstimateError AT poststep
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: CarpetX::regrid_error(interior)
-  } "Estimate error for regridding"
-
-  SCHEDULE NewRadX_RHS IN ODESolvers_RHS
-  {
-    LANG: C
-    READS: state(everywhere)
-    WRITES: rhs(interior)
-    SYNC: rhs
-  } "Calculate scalar wave RHS"
-
-  SCHEDULE NewRadX_CompareSolution IN ODESolvers_PostStep
-  {
-    LANG: C
-    READS: state(interior)
-    WRITES: error(interior)
-    SYNC: error
-  } "Calculate error between numerical and analytic solutions"
-}
diff --git a/NewRadX/src/make.code.defn b/NewRadX/src/make.code.defn
index add3937d..f9dc14f3 100644
--- a/NewRadX/src/make.code.defn
+++ b/NewRadX/src/make.code.defn
@@ -1,8 +1,7 @@
 # Main make.code.defn file for thorn NewRadX
 
 # Source files in this directory
-SRCS = newradx.cxx           \
-       test_newradx.cxx
+SRCS = newradx.cxx
 
 # Subdirectories containing source files
 SUBDIRS =
diff --git a/NewRadX/src/test_newradx.cxx b/NewRadX/src/test_newradx.cxx
deleted file mode 100644
index 95550429..00000000
--- a/NewRadX/src/test_newradx.cxx
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <cctk.h>
-#include <cctk_Arguments.h>
-#include <cctk_Parameters.h>
-#include <loop_device.hxx>
-#include <newradx.hxx>
-
-namespace NewRadX {
-
-#define ijk p.I
-#define im3jk p.I - 3 * p.DI[0]
-#define im2jk p.I - 2 * p.DI[0]
-#define im1jk p.I - 1 * p.DI[0]
-#define ip3jk p.I + 3 * p.DI[0]
-#define ip2jk p.I + 2 * p.DI[0]
-#define ip1jk p.I + 1 * p.DI[0]
-
-#define ijm3k p.I - 3 * p.DI[1]
-#define ijm2k p.I - 2 * p.DI[1]
-#define ijm1k p.I - 1 * p.DI[1]
-#define ijp3k p.I + 3 * p.DI[1]
-#define ijp2k p.I + 2 * p.DI[1]
-#define ijp1k p.I + 1 * p.DI[1]
-
-#define ijkm3 p.I - 3 * p.DI[2]
-#define ijkm2 p.I - 2 * p.DI[2]
-#define ijkm1 p.I - 1 * p.DI[2]
-#define ijkp3 p.I + 3 * p.DI[2]
-#define ijkp2 p.I + 2 * p.DI[2]
-#define ijkp1 p.I + 1 * p.DI[2]
-
-// Flat Laplacian operator at 4th order accuracy
-template <typename T>
-constexpr T Laplacian_4thorder(const Loop::GF3D2<T> gf,
-                               const Loop::PointDesc &p) {
-  return 1.0 / 12.0 *
-         ((-gf(ip2jk) + 16 * gf(ip1jk) - 30 * gf(ijk)
-           -gf(im2jk) + 16 * gf(im1jk)) /
-              (p.DX[0] * p.DX[0]) +
-          (-gf(ijp2k) + 16 * gf(ijp1k) - 30 * gf(ijk)
-           -gf(ijm2k) + 16 * gf(ijm1k)) /
-              (p.DX[1] * p.DX[1]) +
-          (-gf(ijkp2) + 16 * gf(ijkp1) - 30 * gf(ijk)
-           -gf(ijkm2) + 16 * gf(ijkm1)) /
-              (p.DX[2] * p.DX[2]));
-}
-
-// 5th order Kreiss-Oliger dissipation
-template <typename T>
-constexpr T KO_diss_5thorder(const Loop::GF3D2<T> gf,
-                             const Loop::PointDesc &p) {
-  return 1.0 / 64.0 *
-         ((gf(im3jk) - 6.0 * gf(im2jk) + 15.0 * gf(im1jk) - 20.0 * gf(ijk) +
-           gf(ip3jk) - 6.0 * gf(ip2jk) + 15.0 * gf(ip1jk)) /
-              p.DX[0] +
-          (gf(ijm3k) - 6.0 * gf(ijm2k) + 15.0 * gf(ijm1k) - 20.0 * gf(ijk) +
-           gf(ijp3k) - 6.0 * gf(ijp2k) + 15.0 * gf(ijp1k)) /
-              p.DX[1] +
-          (gf(ijkm3) - 6.0 * gf(ijkm2) + 15.0 * gf(ijkm1) - 20.0 * gf(ijk) +
-           gf(ijkp3) - 6.0 * gf(ijkp2) + 15.0 * gf(ijkp1)) /
-              p.DX[2]);
-}
-
-// Test scalar field initial data
-template <typename T>
-constexpr void gaussian(const T t, const T A, const T W,
-                        const T x, const T y, const T z,
-                        T &uu, T &vv) {
-  using std::exp, std::pow, std::sqrt;
-
-  const T r = sqrt(pow(x, 2) + pow(y, 2) + pow(z, 2));
-
-  const auto f = [&](const T v) {
-    return A * exp(-pow(v, 2) / (2 * pow(W, 2)));
-  };
-
-  if (r < sqrt(std::numeric_limits<T>::epsilon())) {
-    // L'Hôpital
-    uu = f(-t) * (1 - pow(t/W, 2));
-    vv = f(-t) * (3 - pow(t/W, 2)) * (-t/pow(W,2));
-  } else {
-    uu = 0.5 * (f(r - t) * (r - t) +
-                f(r + t) * (r + t)) / r;
-    vv = 0.5 * (f(r - t) * (pow((r - t) / W, 2) - 1) -
-                f(r + t) * (pow((r + t) / W, 2) - 1)) / r;
-  }
-}
-
-// Scheduled functions
-extern "C" void NewRadX_Init(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTSX_NewRadX_Init;
-  DECLARE_CCTK_PARAMETERS;
-
-  grid.loop_int_device<0, 0, 0>(
-      grid.nghostzones,
-      [=] CCTK_DEVICE(const Loop::PointDesc &p)
-          CCTK_ATTRIBUTE_ALWAYS_INLINE {
-            gaussian(cctk_time,
-                     gaussian_a0, gaussian_w0,
-                     p.x - gaussian_x0, p.y - gaussian_y0,
-                     p.z - gaussian_z0, uu(p.I), vv(p.I));
-      });
-}
-
-extern "C" void NewRadX_RHS(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTSX_NewRadX_RHS;
-  DECLARE_CCTK_PARAMETERS;
-
-  if (grid.nghostzones[0] != 3 || grid.nghostzones[1] != 3 ||
-      grid.nghostzones[2] != 3) {
-    CCTK_ERROR("Invalid number of ghost zones for 4th order FD");
-  }
-
-  grid.loop_int_device<0, 0, 0>(
-    grid.nghostzones,
-    [=] CCTK_DEVICE(const Loop::PointDesc &p)
-        CCTK_ATTRIBUTE_ALWAYS_INLINE {
-          uu_rhs(p.I) = vv(p.I);
-          vv_rhs(p.I) = Laplacian_4thorder(uu, p);
-        });
-
-  if (test_use_newradx) {
-    NewRadX_Apply(cctkGH, uu, uu_rhs, 0, 1, n_falloff);
-    NewRadX_Apply(cctkGH, vv, vv_rhs, 0, 1, n_falloff + 1);
-  }
-
-  if (test_add_dissipation) {
-    grid.loop_int_device<0, 0, 0>(
-        grid.nghostzones,
-        [=] CCTK_DEVICE(const Loop::PointDesc &p)
-            CCTK_ATTRIBUTE_ALWAYS_INLINE {
-              uu_rhs(p.I) += eps_dissipation * KO_diss_5thorder(uu, p);
-              vv_rhs(p.I) += eps_dissipation * KO_diss_5thorder(vv, p);
-        });
-  }
-}
-
-extern "C" void NewRadX_CompareSolution(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTSX_NewRadX_CompareSolution;
-  DECLARE_CCTK_PARAMETERS;
-
-  grid.loop_int_device<0, 0, 0>(
-      grid.nghostzones,
-      [=] CCTK_DEVICE(const Loop::PointDesc &p)
-          CCTK_ATTRIBUTE_ALWAYS_INLINE {
-            CCTK_REAL u_analytic, v_analytic;
-            gaussian(cctk_time,
-                     gaussian_a0, gaussian_w0,
-                     p.x - gaussian_x0, p.y - gaussian_y0,
-                     p.z - gaussian_z0, u_analytic, v_analytic);
-            uu_err(p.I) = uu(p.I) - u_analytic;
-            vv_err(p.I) = vv(p.I) - v_analytic;
-      });
-}
-
-extern "C" void NewRadX_EstimateError(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_ARGUMENTSX_NewRadX_EstimateError;
-  DECLARE_CCTK_PARAMETERS;
-
-  grid.loop_int_device<1, 1, 1>(
-      grid.nghostzones,
-      [=] CCTK_DEVICE(const Loop::PointDesc &p)
-          CCTK_ATTRIBUTE_ALWAYS_INLINE {
-            using std::abs, std::max;
-            CCTK_REAL maxabs_duu = 0;
-            for (int d = 0; d < Loop::dim; ++d) {
-              const int ni = d == 0 ? 1 : 2;
-              const int nj = d == 1 ? 1 : 2;
-              const int nk = d == 2 ? 1 : 2;
-              for (int dk = 0; dk < nk; ++dk) {
-                for (int dj = 0; dj < nj; ++dj) {
-                  for (int di = 0; di < ni; ++di) {
-                    const auto I = p.I + di * p.DI[0] + dj * p.DI[1] + dk * p.DI[2];
-                    maxabs_duu = max(maxabs_duu, abs(uu(I + p.DI[d]) - uu(I)));
-                  }
-                }
-              }
-            }
-            regrid_error(p.I) = maxabs_duu;
-      });
-}
-
-} // namespace NewRadX
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000060.x.tsv
deleted file mode 100644
index d2c51b5f..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-60	9.9999999999999982e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153064e-04	1.3733079344898912e-04
-60	9.9999999999999982e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153064e-04	1.3733079344898912e-04
-60	9.9999999999999982e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153064e-04	1.3733079344898912e-04
-60	9.9999999999999982e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153064e-04	1.3733079344898912e-04
-60	9.9999999999999982e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3515181213576339e-04	-1.1051017399674825e-03
-60	9.9999999999999982e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8400549142799711e-04	1.3483441119690254e-03
-60	9.9999999999999982e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8819903810528651e-03	6.4218461239321260e-03
-60	9.9999999999999982e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.9140699833029903e-03	-9.1325715144148847e-03
-60	9.9999999999999982e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-7.1818023776154963e-03	-7.2039787013368529e-03
-60	9.9999999999999982e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.9706502185698758e-03	2.3359180571349589e-02
-60	9.9999999999999982e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2838092186782998e-03	-1.9304875409750025e-02
-60	9.9999999999999982e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9620290446611659e-03	8.0796194750677505e-03
-60	9.9999999999999982e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2286570306902613e-03	1.8356183655779932e-04
-60	9.9999999999999982e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.6412554844954219e-04	-4.4346273249546127e-03
-60	9.9999999999999982e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7725039904820313e-04	2.1133793581460773e-03
-60	9.9999999999999982e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2756141785094646e-04	-7.1553159186708566e-04
-60	9.9999999999999982e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8214932847736089e-04	1.2027538347100699e-03
-60	9.9999999999999982e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	3.1857411559761304e-04	1.2867754792626575e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.8210047459307638e-04	5.0299732016050491e-04
-60	9.9999999999999982e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7439157307626712e-04	1.0488488988540800e-04
-60	9.9999999999999982e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.1688180340345824e-04	-3.0668765469570990e-04
-60	9.9999999999999982e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0022260962553181e-04	-1.5866915182835835e-03
-60	9.9999999999999982e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.9951692425452979e-04	-4.8924271497215676e-04
-60	9.9999999999999982e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1037379467670403e-05	9.5839178468328889e-05
-60	9.9999999999999982e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3548616969618105e-04	-2.2827116979306371e-03
-60	9.9999999999999982e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0834070538642696e-03	1.2719102877630380e-03
-60	9.9999999999999982e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7306034983198116e-04	2.8338458727384030e-03
-60	9.9999999999999982e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2465121080422847e-03	-1.8325679214243012e-03
-60	9.9999999999999982e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4810147437916078e-03	-1.6494755053584175e-05
-60	9.9999999999999982e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.8399142374685117e-04	2.0989685917670886e-03
-60	9.9999999999999982e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.6157828674126996e-05	9.9298939563728672e-04
-60	9.9999999999999982e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2670220072566901e-03	2.0067808501631011e-03
-60	9.9999999999999982e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192720996e-03	4.3722872692293613e-04
-60	9.9999999999999982e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192720996e-03	4.3722872692293613e-04
-60	9.9999999999999982e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192720996e-03	4.3722872692293613e-04
-60	9.9999999999999982e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192720996e-03	4.3722872692293613e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000060.y.tsv
deleted file mode 100644
index 8fecac39..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-60	9.9999999999999982e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-1.7452617252194117e-04	3.3858907879288366e-04
-60	9.9999999999999982e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-1.7452617252194117e-04	3.3858907879288366e-04
-60	9.9999999999999982e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-1.7452617252194117e-04	3.3858907879288366e-04
-60	9.9999999999999982e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-1.7452617252194117e-04	3.3858907879288366e-04
-60	9.9999999999999982e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	6.0306979355677374e-05	-6.3655558222756471e-05
-60	9.9999999999999982e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	-2.8071462620499730e-04	-8.9236670827995781e-04
-60	9.9999999999999982e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-6.2380717478930476e-04	1.3484898283104842e-03
-60	9.9999999999999982e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	1.6545116610038975e-03	5.6982213617515860e-03
-60	9.9999999999999982e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	2.4246511010831825e-03	-1.0409370115179489e-02
-60	9.9999999999999982e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-7.5948521192826914e-03	-3.6002061439432140e-03
-60	9.9999999999999982e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	4.9700237621880788e-03	2.1202015247634987e-02
-60	9.9999999999999982e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.7796169142960880e-04	-2.1081925336311872e-02
-60	9.9999999999999982e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-2.2805709658260849e-03	1.0327154393841700e-02
-60	9.9999999999999982e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	2.5236234569970943e-03	-6.4934512277019978e-04
-60	9.9999999999999982e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-9.3359420011235729e-04	-4.8767438906067570e-03
-60	9.9999999999999982e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-7.3625668569414363e-04	4.5435421277465454e-03
-60	9.9999999999999982e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	9.2748702128406843e-04	-3.4325642202256100e-04
-60	9.9999999999999982e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.7282135808393465e-04	-1.5567440659940578e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-2.5070491498855978e-04	-1.3614039542084479e-03
-60	9.9999999999999982e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.5582710681709592e-04	2.5893741974650328e-04
-60	9.9999999999999982e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-5.4800423540807253e-04	6.1426132446021527e-04
-60	9.9999999999999982e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-1.9856560014248686e-06	1.9023211389411756e-03
-60	9.9999999999999982e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-3.5952825812461214e-04	-1.4055117593857577e-03
-60	9.9999999999999982e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-1.3463576378510095e-03	1.9453511685871196e-03
-60	9.9999999999999982e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.0237794622901668e-04	3.7976117586635437e-03
-60	9.9999999999999982e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	9.5636678897222560e-04	-7.7003211034817767e-04
-60	9.9999999999999982e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0457957268359178e-03	-1.4123512823278729e-03
-60	9.9999999999999982e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-7.8328231029190691e-05	3.6220654577253371e-03
-60	9.9999999999999982e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	3.0586432762326585e-04	-3.6740915594392063e-03
-60	9.9999999999999982e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-6.9668020052134733e-04	-9.2861022244080304e-04
-60	9.9999999999999982e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	7.5346990467714146e-05	-2.8511932725167250e-04
-60	9.9999999999999982e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-1.1430626102246749e-04	-1.4840914460348799e-03
-60	9.9999999999999982e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-3.5054877396908197e-04	-1.5845523329127909e-04
-60	9.9999999999999982e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-3.5054877396908197e-04	-1.5845523329127909e-04
-60	9.9999999999999982e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-3.5054877396908197e-04	-1.5845523329127909e-04
-60	9.9999999999999982e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-3.5054877396908197e-04	-1.5845523329127909e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000060.z.tsv
deleted file mode 100644
index a10470b9..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000060.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-60	9.9999999999999982e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	3.7256189808085156e-03	-7.7154280060125454e-03
-60	9.9999999999999982e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	3.7256189808085156e-03	-7.7154280060125454e-03
-60	9.9999999999999982e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	3.7256189808085156e-03	-7.7154280060125454e-03
-60	9.9999999999999982e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	3.7256189808085156e-03	-7.7154280060125454e-03
-60	9.9999999999999982e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-6.2607644285070626e-03	-2.4873443224691958e-02
-60	9.9999999999999982e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-4.1917905248025113e-03	2.5416788951784203e-02
-60	9.9999999999999982e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	2.9779970405723576e-03	-1.2932234888801918e-02
-60	9.9999999999999982e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-1.0075313368087119e-03	1.3447319419866294e-03
-60	9.9999999999999982e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.7781737527919400e-03	1.2857727400140224e-03
-60	9.9999999999999982e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-2.3970872705255983e-04	-4.9536437107926051e-03
-60	9.9999999999999982e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-3.7350728972133916e-06	2.9989412294330717e-03
-60	9.9999999999999982e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9606832062150544e-04	-1.4205763179679564e-03
-60	9.9999999999999982e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-9.3239962406789793e-04	4.5815846992888792e-04
-60	9.9999999999999982e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	4.6109464377761215e-05	1.1649224219431105e-03
-60	9.9999999999999982e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-2.2451286522471217e-04	1.5146235697649694e-04
-60	9.9999999999999982e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	1.8340897089079956e-04	1.4663081688241375e-03
-60	9.9999999999999982e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	4.0218218294957882e-05	-9.9092605980885702e-05
-60	9.9999999999999982e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	2.1011789033084093e-04	1.1572371420991820e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.1011789033084272e-04	1.1572371420991746e-03
-60	9.9999999999999982e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	4.0218218294961988e-05	-9.9092605980904784e-05
-60	9.9999999999999982e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	1.8340897089080157e-04	1.4663081688241310e-03
-60	9.9999999999999982e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-2.2451286522471418e-04	1.5146235697651532e-04
-60	9.9999999999999982e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	4.6109464377763492e-05	1.1649224219431147e-03
-60	9.9999999999999982e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-9.3239962406789446e-04	4.5815846992888965e-04
-60	9.9999999999999982e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9606832062151086e-04	-1.4205763179679478e-03
-60	9.9999999999999982e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-3.7350728972153432e-06	2.9989412294330630e-03
-60	9.9999999999999982e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-2.3970872705256219e-04	-4.9536437107925956e-03
-60	9.9999999999999982e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.7781737527919395e-03	1.2857727400140051e-03
-60	9.9999999999999982e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-1.0075313368087084e-03	1.3447319419866259e-03
-60	9.9999999999999982e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	2.9779970405723593e-03	-1.2932234888801906e-02
-60	9.9999999999999982e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-4.1917905248025121e-03	2.5416788951784199e-02
-60	9.9999999999999982e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-6.2607644285070409e-03	-2.4873443224692121e-02
-60	9.9999999999999982e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	3.7256189808084952e-03	-7.7154280060126035e-03
-60	9.9999999999999982e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	3.7256189808084952e-03	-7.7154280060126035e-03
-60	9.9999999999999982e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	3.7256189808084952e-03	-7.7154280060126035e-03
-60	9.9999999999999982e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	3.7256189808084952e-03	-7.7154280060126035e-03
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000090.x.tsv
deleted file mode 100644
index 2f8d6256..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-90	1.4999999999999980e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978220e-03
-90	1.4999999999999980e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978220e-03
-90	1.4999999999999980e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978220e-03
-90	1.4999999999999980e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978220e-03
-90	1.4999999999999980e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1635336445820143e-03	-7.9905703224006320e-04
-90	1.4999999999999980e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.0458922468916664e-04	-2.4356280960214625e-03
-90	1.4999999999999980e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.9284537102050132e-04	-1.2959626097766982e-03
-90	1.4999999999999980e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0090334742159112e-03	3.1129740401490512e-04
-90	1.4999999999999980e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.5262096109813167e-05	2.9707234614884971e-04
-90	1.4999999999999980e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2739822931241735e-03	1.8738789384587320e-04
-90	1.4999999999999980e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.6574291100380944e-04	-1.9272137881731185e-03
-90	1.4999999999999980e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3426629177313737e-04	-1.5114932718095933e-03
-90	1.4999999999999980e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1397908130373785e-04	9.7101622571276792e-04
-90	1.4999999999999980e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3707970388567812e-04	1.4450028125308871e-03
-90	1.4999999999999980e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0888273108091145e-04	2.0614056468656705e-03
-90	1.4999999999999980e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0062686884717141e-04	2.3520352036398642e-03
-90	1.4999999999999980e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.9990971192384406e-04	1.8083718640725189e-03
-90	1.4999999999999980e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	7.8898706351233591e-04	5.7163633533022869e-04
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.2871458832136155e-03	1.3781091297652148e-03
-90	1.4999999999999980e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7759341646289392e-03	-8.4055165864608920e-04
-90	1.4999999999999980e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0159321308424506e-03	-1.8379861406278607e-03
-90	1.4999999999999980e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.4529136603219285e-04	2.5755361367406300e-04
-90	1.4999999999999980e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.6411678467420524e-03	-7.7244120738224312e-04
-90	1.4999999999999980e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1067305622324340e-03	-2.2579946871202194e-03
-90	1.4999999999999980e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.0710658965401640e-04	-3.1572671015813028e-04
-90	1.4999999999999980e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1516374653693215e-03	1.3677693386089857e-04
-90	1.4999999999999980e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.2574788210921964e-04	1.0360655134332634e-03
-90	1.4999999999999980e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2033938759297544e-03	3.0999493740463731e-03
-90	1.4999999999999980e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2816904846036916e-03	2.8461798786176161e-03
-90	1.4999999999999980e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.8047575067649246e-04	3.1905124793763966e-03
-90	1.4999999999999980e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.5463885314424334e-04	2.5413647317545094e-03
-90	1.4999999999999980e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0665886343549287e-04	1.1392111315681544e-03
-90	1.4999999999999980e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000090.y.tsv
deleted file mode 100644
index 3e226690..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-90	1.4999999999999980e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	4.7240433831597164e-03	-8.2527858355065514e-03
-90	1.4999999999999980e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	4.7240433831597164e-03	-8.2527858355065514e-03
-90	1.4999999999999980e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	4.7240433831597164e-03	-8.2527858355065514e-03
-90	1.4999999999999980e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	4.7240433831597164e-03	-8.2527858355065514e-03
-90	1.4999999999999980e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-5.8348438967072407e-04	1.9884002445548013e-03
-90	1.4999999999999980e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	1.1746040022693627e-03	2.6847597204870143e-03
-90	1.4999999999999980e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	1.4028386808980643e-03	-3.0375509849470544e-03
-90	1.4999999999999980e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-1.2989388062896391e-03	1.7596930890430189e-03
-90	1.4999999999999980e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-3.1643057130853323e-04	2.4677879041519872e-03
-90	1.4999999999999980e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	9.0992456330507934e-04	-2.4568373953485047e-03
-90	1.4999999999999980e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	3.4841364612288339e-04	-1.5495580909976588e-03
-90	1.4999999999999980e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.1258254663963703e-04	-1.6725248208580138e-04
-90	1.4999999999999980e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5350994387019344e-04	-4.5225403749931488e-04
-90	1.4999999999999980e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-4.3195006594861051e-04	1.0196187043576646e-03
-90	1.4999999999999980e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-2.3313267987949877e-05	5.8646491764119965e-04
-90	1.4999999999999980e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-1.9157680200544545e-04	-5.7049495661546095e-04
-90	1.4999999999999980e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	-5.2310875156426199e-04	-3.1689968192758709e-04
-90	1.4999999999999980e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.0952203539576622e-04	1.2722367934875755e-03
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	1.6136176460069049e-04	-1.0872737894926728e-03
-90	1.4999999999999980e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.5787655418999986e-04	9.5942557331976685e-04
-90	1.4999999999999980e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	4.4671146582124445e-04	1.0816615646061323e-03
-90	1.4999999999999980e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	2.3231719668173552e-04	-4.5588869659748623e-04
-90	1.4999999999999980e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-1.2739334220062049e-04	9.7564184044515105e-04
-90	1.4999999999999980e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	4.2694573144098013e-04	1.3211130528519494e-03
-90	1.4999999999999980e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	2.6705265798346832e-04	-6.6041383936006766e-06
-90	1.4999999999999980e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0479211557680459e-04	1.0622654079632686e-03
-90	1.4999999999999980e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	2.7327959860457723e-04	4.1449129067383029e-04
-90	1.4999999999999980e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1789983717376578e-05	5.5081547158617806e-04
-90	1.4999999999999980e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	4.2615898899450098e-05	6.8853830410149197e-04
-90	1.4999999999999980e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	2.2784094241119890e-05	3.8777185452712855e-04
-90	1.4999999999999980e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	3.8942090864686456e-06	1.6487085275903863e-04
-90	1.4999999999999980e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	7.6981992571505307e-05	1.8228837054719759e-04
-90	1.4999999999999980e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000090.z.tsv
deleted file mode 100644
index a8ccd3c5..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000090.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-90	1.4999999999999980e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-8.7392472898679843e-05	-7.2244755777077507e-04
-90	1.4999999999999980e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-8.7392472898679843e-05	-7.2244755777077507e-04
-90	1.4999999999999980e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-8.7392472898679843e-05	-7.2244755777077507e-04
-90	1.4999999999999980e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-8.7392472898679843e-05	-7.2244755777077507e-04
-90	1.4999999999999980e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-3.5190166040544274e-04	-7.8502822303409901e-04
-90	1.4999999999999980e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-8.0632438188990650e-05	-4.7242343667418517e-04
-90	1.4999999999999980e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-3.4400983488675852e-04	-5.1515142741898631e-04
-90	1.4999999999999980e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-8.1493902892018394e-04	-2.5223036523457790e-03
-90	1.4999999999999980e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	-2.1200769642037152e-04	-5.5345943505285210e-04
-90	1.4999999999999980e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-7.8652181612537972e-04	8.1511015414876512e-04
-90	1.4999999999999980e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-7.1194528626192938e-04	-4.0462149423123805e-04
-90	1.4999999999999980e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	2.7325840236242503e-04	4.2196467753189749e-04
-90	1.4999999999999980e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-2.3328366841471413e-04	2.7668441201067298e-03
-90	1.4999999999999980e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	-8.4128995152941478e-04	1.3318448932017372e-03
-90	1.4999999999999980e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-5.3211927089127670e-04	-1.3536148212698110e-05
-90	1.4999999999999980e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-1.0545650243470712e-04	4.1750851037878240e-04
-90	1.4999999999999980e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-3.8711461343876298e-05	5.2485068531573037e-04
-90	1.4999999999999980e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	3.9509249378502875e-04	5.8511386913087096e-04
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	3.9509249378503173e-04	5.8511386913087183e-04
-90	1.4999999999999980e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-3.8711461343874021e-05	5.2485068531573351e-04
-90	1.4999999999999980e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-1.0545650243470407e-04	4.1750851037878874e-04
-90	1.4999999999999980e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-5.3211927089127605e-04	-1.3536148212705645e-05
-90	1.4999999999999980e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	-8.4128995152941413e-04	1.3318448932017337e-03
-90	1.4999999999999980e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-2.3328366841471456e-04	2.7668441201067384e-03
-90	1.4999999999999980e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	2.7325840236242373e-04	4.2196467753189359e-04
-90	1.4999999999999980e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-7.1194528626193144e-04	-4.0462149423123263e-04
-90	1.4999999999999980e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-7.8652181612538080e-04	8.1511015414877032e-04
-90	1.4999999999999980e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	-2.1200769642037314e-04	-5.5345943505285080e-04
-90	1.4999999999999980e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-8.1493902892018210e-04	-2.5223036523457820e-03
-90	1.4999999999999980e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-3.4400983488675765e-04	-5.1515142741898480e-04
-90	1.4999999999999980e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-8.0632438188991775e-05	-4.7242343667418040e-04
-90	1.4999999999999980e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-3.5190166040544350e-04	-7.8502822303410215e-04
-90	1.4999999999999980e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-8.7392472898678895e-05	-7.2244755777077876e-04
-90	1.4999999999999980e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-8.7392472898678895e-05	-7.2244755777077876e-04
-90	1.4999999999999980e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-8.7392472898678895e-05	-7.2244755777077876e-04
-90	1.4999999999999980e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-8.7392472898678895e-05	-7.2244755777077876e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000120.x.tsv
deleted file mode 100644
index 5debc01a..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-120	2.0000000000000004e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6169433783522033e-04	-3.6140532903482741e-04
-120	2.0000000000000004e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5777307788032076e-04	-3.3084375236273184e-04
-120	2.0000000000000004e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8368429065376128e-04	-1.4187792700005217e-03
-120	2.0000000000000004e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.7296273444354099e-04	-1.5645971329622975e-03
-120	2.0000000000000004e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7452475185896539e-04	-6.3497705583598091e-05
-120	2.0000000000000004e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.5709878803284422e-04	1.1012397001594358e-03
-120	2.0000000000000004e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5249200380623053e-04	1.0188251460922732e-03
-120	2.0000000000000004e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.5406377133869893e-04	1.9868639584955305e-03
-120	2.0000000000000004e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0920301597283904e-03	2.4047098465465105e-03
-120	2.0000000000000004e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4843197689881110e-04	-3.5490157474766219e-04
-120	2.0000000000000004e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.1526399608495576e-05	-1.4265453908755429e-03
-120	2.0000000000000004e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.4131601551457433e-04	-3.2975283345919836e-05
-120	2.0000000000000004e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.1788255004949383e-04	-1.3007367631612810e-03
-120	2.0000000000000004e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.1734477505690889e-05	-3.1953365743946274e-03
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.9426676723542610e-04	-1.2764882801002395e-03
-120	2.0000000000000004e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7458346863961743e-04	-6.1365087450749862e-04
-120	2.0000000000000004e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8416233427276767e-04	5.1245652910602104e-05
-120	2.0000000000000004e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8245089234319164e-04	1.1636733721483991e-04
-120	2.0000000000000004e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9080080557889111e-04	2.8653621550918330e-04
-120	2.0000000000000004e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.3690692145663746e-05	-7.5335009956592160e-05
-120	2.0000000000000004e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5149883803638953e-04	-1.1154333279577470e-03
-120	2.0000000000000004e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5433073223384928e-04	-1.8502814233981981e-03
-120	2.0000000000000004e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0543265260501351e-04	-2.6099839910809367e-03
-120	2.0000000000000004e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.0258677227363126e-05	-3.0378789604693212e-03
-120	2.0000000000000004e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.0067938008880467e-05	-3.0506621748818161e-03
-120	2.0000000000000004e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5318464479813741e-04	-2.7809589797541893e-03
-120	2.0000000000000004e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8973090430523321e-04	-1.8967217337607805e-03
-120	2.0000000000000004e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7247438412896913e-04	-1.0166509619451702e-03
-120	2.0000000000000004e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000120.y.tsv
deleted file mode 100644
index df2951d9..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-120	2.0000000000000004e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	2.4320241736832386e-04	-8.1838461196545673e-04
-120	2.0000000000000004e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	2.5267196478927022e-04	-1.2652036596812204e-03
-120	2.0000000000000004e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-1.3287380566343591e-04	-2.3377985010463193e-03
-120	2.0000000000000004e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9848716664614761e-04	-3.0381986191835939e-03
-120	2.0000000000000004e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-1.3129480263500484e-03	-1.3107546716419427e-03
-120	2.0000000000000004e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-1.2064774137996123e-03	1.5346386831359879e-03
-120	2.0000000000000004e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-1.1024379502829070e-04	3.8318519853395945e-03
-120	2.0000000000000004e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	2.7505815154604829e-04	3.6080432773122114e-03
-120	2.0000000000000004e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	5.2717596870479786e-04	1.1838043343739787e-03
-120	2.0000000000000004e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	1.6119745244018973e-03	4.1970325940386666e-04
-120	2.0000000000000004e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	2.0282704449471460e-03	-1.2426828251712718e-05
-120	2.0000000000000004e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	9.6425278995649808e-04	-1.7946410638979837e-03
-120	2.0000000000000004e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.4903265379610634e-04	-3.5510777726745846e-03
-120	2.0000000000000004e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-1.9114283179625323e-04	-4.1187836782112415e-03
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-5.0530253057004147e-04	-1.0625893525147657e-03
-120	2.0000000000000004e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-5.3176321207194766e-04	-1.5174407041809437e-03
-120	2.0000000000000004e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-7.2911186778798747e-04	-1.1527082703394038e-03
-120	2.0000000000000004e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-5.6194443728934805e-04	-9.1538882334193158e-04
-120	2.0000000000000004e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-5.4135460689126377e-04	-1.7203634754345823e-03
-120	2.0000000000000004e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-6.2762875390833276e-04	-1.7825199272129477e-03
-120	2.0000000000000004e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	-6.4811248118126752e-04	-2.3029286747582459e-03
-120	2.0000000000000004e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	-8.8268857290477371e-04	-2.7400085889688840e-03
-120	2.0000000000000004e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0269638957839126e-03	-2.8053315965598027e-03
-120	2.0000000000000004e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1033265589408831e-03	-2.8603109988755305e-03
-120	2.0000000000000004e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.0615311895556857e-03	-2.7462651052107779e-03
-120	2.0000000000000004e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-8.7701861068421232e-04	-2.5425680921371836e-03
-120	2.0000000000000004e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	-5.7905043224457434e-04	-2.2304428367494705e-03
-120	2.0000000000000004e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-4.5188491732982142e-04	-1.4337149991659954e-03
-120	2.0000000000000004e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-error.it000120.z.tsv
deleted file mode 100644
index 3d6a6d74..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000120.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-120	2.0000000000000004e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	3.8238729768340005e-04	3.2649230893172564e-04
-120	2.0000000000000004e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	4.1209281433779292e-04	8.4698820827272569e-04
-120	2.0000000000000004e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	6.6531193191194131e-04	9.4854882468227539e-04
-120	2.0000000000000004e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	7.6573673451536535e-04	7.4544074792168822e-04
-120	2.0000000000000004e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	6.3735940002159592e-04	5.0685324548083600e-04
-120	2.0000000000000004e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	6.3660255434657884e-04	-9.5929489965741478e-05
-120	2.0000000000000004e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	6.2564860255123549e-04	-2.5031287690615732e-04
-120	2.0000000000000004e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9403212987158695e-04	-9.8446716634765087e-04
-120	2.0000000000000004e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	2.9338150103911580e-04	-1.2636417682798146e-03
-120	2.0000000000000004e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4989107016435247e-04	-5.3690099709944564e-04
-120	2.0000000000000004e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	6.6496657012389651e-05	-6.4199054768253273e-04
-120	2.0000000000000004e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	3.6350699596514579e-04	-5.4904555270777832e-05
-120	2.0000000000000004e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	2.7073196385526141e-04	1.3072071159521909e-03
-120	2.0000000000000004e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	-2.6957455056406414e-04	-3.8108143978686732e-04
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.6957455056406246e-04	-3.8108143978686341e-04
-120	2.0000000000000004e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	2.7073196385526364e-04	1.3072071159521861e-03
-120	2.0000000000000004e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	3.6350699596514736e-04	-5.4904555270779702e-05
-120	2.0000000000000004e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	6.6496657012388947e-05	-6.4199054768252894e-04
-120	2.0000000000000004e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	1.4989107016435092e-04	-5.3690099709944672e-04
-120	2.0000000000000004e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	2.9338150103911477e-04	-1.2636417682798219e-03
-120	2.0000000000000004e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9403212987158554e-04	-9.8446716634765217e-04
-120	2.0000000000000004e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	6.2564860255123354e-04	-2.5031287690615374e-04
-120	2.0000000000000004e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	6.3660255434657722e-04	-9.5929489965741776e-05
-120	2.0000000000000004e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	6.3735940002159657e-04	5.0685324548083903e-04
-120	2.0000000000000004e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	7.6573673451536448e-04	7.4544074792169646e-04
-120	2.0000000000000004e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	6.6531193191193805e-04	9.4854882468228070e-04
-120	2.0000000000000004e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	4.1209281433778983e-04	8.4698820827272601e-04
-120	2.0000000000000004e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	3.8238729768339831e-04	3.2649230893172547e-04
-120	2.0000000000000004e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	4.2596553591026250e-04	2.2007661031068801e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000060.x.tsv
deleted file mode 100644
index 468fc4da..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-60	9.9999999999999982e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891653e-04	1.3733080358437305e-04
-60	9.9999999999999982e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891653e-04	1.3733080358437305e-04
-60	9.9999999999999982e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891653e-04	1.3733080358437305e-04
-60	9.9999999999999982e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891653e-04	1.3733080358437305e-04
-60	9.9999999999999982e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3515443271457558e-04	-1.1050715354731272e-03
-60	9.9999999999999982e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8223993353888033e-04	1.3640659846006846e-03
-60	9.9999999999999982e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0998298549070363e-03	7.7794622718399048e-03
-60	9.9999999999999982e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.6342072264663713e-03	6.8996944101631487e-03
-60	9.9999999999999982e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.2247660361007765e-03	-1.1817532795840347e-02
-60	9.9999999999999982e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3597528675843730e-03	-2.0709129312977203e-02
-60	9.9999999999999982e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.1745951207671523e-02	2.8907197523553134e-03
-60	9.9999999999999982e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.9765686070614729e-03	1.7489568298805238e-02
-60	9.9999999999999982e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1628318018438704e-03	6.5980108093309422e-04
-60	9.9999999999999982e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.6469440034201558e-04	-4.4291444250260685e-03
-60	9.9999999999999982e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7725195095462952e-04	2.1133978704292117e-03
-60	9.9999999999999982e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2756141622494643e-04	-7.1553156892506433e-04
-60	9.9999999999999982e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8214932847819448e-04	1.2027538347235468e-03
-60	9.9999999999999982e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	3.1857411559761277e-04	1.2867754792626627e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.8210047459307638e-04	5.0299732016050491e-04
-60	9.9999999999999982e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7439157307626712e-04	1.0488488988540800e-04
-60	9.9999999999999982e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.1688180340345824e-04	-3.0668765469570990e-04
-60	9.9999999999999982e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0022260962553181e-04	-1.5866915182835835e-03
-60	9.9999999999999982e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.9951692425452979e-04	-4.8924271497215676e-04
-60	9.9999999999999982e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1037379467670403e-05	9.5839178468328889e-05
-60	9.9999999999999982e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3548616969618105e-04	-2.2827116979306371e-03
-60	9.9999999999999982e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0834070538642696e-03	1.2719102877630380e-03
-60	9.9999999999999982e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7306034983198116e-04	2.8338458727384030e-03
-60	9.9999999999999982e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2465121080422845e-03	-1.8325679214242960e-03
-60	9.9999999999999982e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4810147437924414e-03	-1.6494755040107403e-05
-60	9.9999999999999982e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.8399142212085116e-04	2.0989686147091097e-03
-60	9.9999999999999982e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.6156276767700607e-05	9.9300790792042088e-04
-60	9.9999999999999982e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2675908591491636e-03	2.0122637500916449e-03
-60	9.9999999999999982e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184896e-03	9.1346797129822572e-04
-60	9.9999999999999982e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184896e-03	9.1346797129822572e-04
-60	9.9999999999999982e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184896e-03	9.1346797129822572e-04
-60	9.9999999999999982e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184896e-03	9.1346797129822572e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000060.y.tsv
deleted file mode 100644
index 7ff27eb0..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-60	9.9999999999999982e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-1.7452617252193152e-04	3.3858907879304818e-04
-60	9.9999999999999982e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-1.7452617252193152e-04	3.3858907879304818e-04
-60	9.9999999999999982e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-1.7452617252193152e-04	3.3858907879304818e-04
-60	9.9999999999999982e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-1.7452617252193152e-04	3.3858907879304818e-04
-60	9.9999999999999982e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	6.0306979637439598e-05	-6.3655554167088126e-05
-60	9.9999999999999982e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	-2.8071318918813589e-04	-8.9234984217805317e-04
-60	9.9999999999999982e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-6.2253284400366066e-04	1.3600291547165109e-03
-60	9.9999999999999982e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	1.8475967596913621e-03	6.9174617911039113e-03
-60	9.9999999999999982e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	7.1447883442465349e-03	5.6228958093984850e-03
-60	9.9999999999999982e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	6.7144572500019177e-03	-1.0896796757255866e-02
-60	9.9999999999999982e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-4.3018884042467283e-03	-1.8730915578886759e-02
-60	9.9999999999999982e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	-1.1260330108285393e-02	3.0365857548082902e-03
-60	9.9999999999999982e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5083643577944381e-03	1.6634537853311395e-02
-60	9.9999999999999982e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	2.5001110050568696e-03	-4.6534822999093600e-04
-60	9.9999999999999982e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-9.3369017309776923e-04	-4.8757471256446142e-03
-60	9.9999999999999982e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-7.3625678071850777e-04	4.5435433500828322e-03
-60	9.9999999999999982e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	9.2748702125778812e-04	-3.4325642162137725e-04
-60	9.9999999999999982e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.7282135808393709e-04	-1.5567440659940150e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-2.5070491498855978e-04	-1.3614039542084479e-03
-60	9.9999999999999982e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.5582710681709592e-04	2.5893741974650328e-04
-60	9.9999999999999982e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-5.4800423540807253e-04	6.1426132446021527e-04
-60	9.9999999999999982e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-1.9856560014248686e-06	1.9023211389411756e-03
-60	9.9999999999999982e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-3.5952825812461214e-04	-1.4055117593857577e-03
-60	9.9999999999999982e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-1.3463576378510095e-03	1.9453511685871196e-03
-60	9.9999999999999982e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.0237794622901668e-04	3.7976117586635437e-03
-60	9.9999999999999982e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	9.5636678897222560e-04	-7.7003211034817767e-04
-60	9.9999999999999982e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0457957268359178e-03	-1.4123512823278729e-03
-60	9.9999999999999982e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-7.8328231029190691e-05	3.6220654577253371e-03
-60	9.9999999999999982e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	3.0586432762326585e-04	-3.6740915594392063e-03
-60	9.9999999999999982e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-6.9668020052134733e-04	-9.2861022244080304e-04
-60	9.9999999999999982e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	7.5346990467711720e-05	-2.8511932725162973e-04
-60	9.9999999999999982e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-1.1430626104874778e-04	-1.4840914456336961e-03
-60	9.9999999999999982e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-3.5054886899344611e-04	-1.5845401095499265e-04
-60	9.9999999999999982e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-3.5054886899344611e-04	-1.5845401095499265e-04
-60	9.9999999999999982e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-3.5054886899344611e-04	-1.5845401095499265e-04
-60	9.9999999999999982e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-3.5054886899344611e-04	-1.5845401095499265e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000060.z.tsv
deleted file mode 100644
index 34c78a46..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000060.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-60	9.9999999999999982e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	6.9795023536404419e-03	4.8905910992455620e-03
-60	9.9999999999999982e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	6.9795023536404419e-03	4.8905910992455620e-03
-60	9.9999999999999982e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	6.9795023536404419e-03	4.8905910992455620e-03
-60	9.9999999999999982e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	6.9795023536404419e-03	4.8905910992455620e-03
-60	9.9999999999999982e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	7.6433006325852112e-03	-1.5793167379682883e-02
-60	9.9999999999999982e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-3.9142611368406331e-03	-2.4546207890767315e-02
-60	9.9999999999999982e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.2828282969812557e-02	-5.0709828800156974e-03
-60	9.9999999999999982e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-6.0621218228058028e-03	1.9580841631919865e-02
-60	9.9999999999999982e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.3915817388446578e-03	3.6310976246275327e-03
-60	9.9999999999999982e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-2.4929853643166798e-04	-4.8740259656855946e-03
-60	9.9999999999999982e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-3.8310458826253200e-06	2.9999379943952144e-03
-60	9.9999999999999982e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9606783399628019e-04	-1.4205703198795164e-03
-60	9.9999999999999982e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-9.3239962569389794e-04	4.5815849287090919e-04
-60	9.9999999999999982e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	4.6109464372885971e-05	1.1649224220197125e-03
-60	9.9999999999999982e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-2.2451286522473090e-04	1.5146235697681708e-04
-60	9.9999999999999982e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	1.8340897089079943e-04	1.4663081688241399e-03
-60	9.9999999999999982e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	4.0218218294957882e-05	-9.9092605980885648e-05
-60	9.9999999999999982e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	2.1011789033084093e-04	1.1572371420991820e-03
-60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017252e-04	-2.3226040281614887e-04
-60	9.9999999999999982e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.1011789033084272e-04	1.1572371420991746e-03
-60	9.9999999999999982e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	4.0218218294961988e-05	-9.9092605980904730e-05
-60	9.9999999999999982e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	1.8340897089080143e-04	1.4663081688241334e-03
-60	9.9999999999999982e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-2.2451286522473291e-04	1.5146235697683546e-04
-60	9.9999999999999982e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	4.6109464372888248e-05	1.1649224220197166e-03
-60	9.9999999999999982e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-9.3239962569389447e-04	4.5815849287091093e-04
-60	9.9999999999999982e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9606783399628561e-04	-1.4205703198795078e-03
-60	9.9999999999999982e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-3.8310458826272716e-06	2.9999379943952058e-03
-60	9.9999999999999982e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-2.4929853643167025e-04	-4.8740259656855850e-03
-60	9.9999999999999982e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.3915817388446574e-03	3.6310976246275153e-03
-60	9.9999999999999982e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-6.0621218228057994e-03	1.9580841631919862e-02
-60	9.9999999999999982e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.2828282969812555e-02	-5.0709828800156852e-03
-60	9.9999999999999982e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-3.9142611368406339e-03	-2.4546207890767318e-02
-60	9.9999999999999982e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	7.6433006325852138e-03	-1.5793167379682886e-02
-60	9.9999999999999982e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	6.9795023536404445e-03	4.8905910992455663e-03
-60	9.9999999999999982e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	6.9795023536404445e-03	4.8905910992455663e-03
-60	9.9999999999999982e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	6.9795023536404445e-03	4.8905910992455663e-03
-60	9.9999999999999982e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	6.9795023536404445e-03	4.8905910992455663e-03
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000090.x.tsv
deleted file mode 100644
index c5cb0eed..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-90	1.4999999999999980e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508313e-03
-90	1.4999999999999980e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508313e-03
-90	1.4999999999999980e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508313e-03
-90	1.4999999999999980e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508313e-03
-90	1.4999999999999980e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1435690380080664e-03	-6.4642069357713581e-04
-90	1.4999999999999980e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.0451724240300599e-04	-2.4348872783263925e-03
-90	1.4999999999999980e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.9284542307937969e-04	-1.2959619393761099e-03
-90	1.4999999999999980e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0090334742078935e-03	3.1129740413856060e-04
-90	1.4999999999999980e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.5262096109813451e-05	2.9707234614885470e-04
-90	1.4999999999999980e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2739822931241735e-03	1.8738789384587320e-04
-90	1.4999999999999980e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.6574291100380944e-04	-1.9272137881731185e-03
-90	1.4999999999999980e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3426629177313737e-04	-1.5114932718095933e-03
-90	1.4999999999999980e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1397908130373785e-04	9.7101622571276792e-04
-90	1.4999999999999980e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3707970388567812e-04	1.4450028125308871e-03
-90	1.4999999999999980e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0888273108091145e-04	2.0614056468656705e-03
-90	1.4999999999999980e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0062686884717141e-04	2.3520352036398642e-03
-90	1.4999999999999980e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.9990971192384406e-04	1.8083718640725189e-03
-90	1.4999999999999980e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	7.8898706351233591e-04	5.7163633533022869e-04
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.2871458832136155e-03	1.3781091297652148e-03
-90	1.4999999999999980e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7759341646289392e-03	-8.4055165864608920e-04
-90	1.4999999999999980e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0159321308424506e-03	-1.8379861406278607e-03
-90	1.4999999999999980e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.4529136603219285e-04	2.5755361367406300e-04
-90	1.4999999999999980e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.6411678467420524e-03	-7.7244120738224312e-04
-90	1.4999999999999980e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1067305622324340e-03	-2.2579946871202194e-03
-90	1.4999999999999980e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.0710658965401640e-04	-3.1572671015813028e-04
-90	1.4999999999999980e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1516374653693215e-03	1.3677693386089857e-04
-90	1.4999999999999980e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.2574788210921964e-04	1.0360655134332634e-03
-90	1.4999999999999980e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2033938759297544e-03	3.0999493740463731e-03
-90	1.4999999999999980e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2816904846036916e-03	2.8461798786176161e-03
-90	1.4999999999999980e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.8047575067649246e-04	3.1905124793763966e-03
-90	1.4999999999999980e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.5463885314424334e-04	2.5413647317545094e-03
-90	1.4999999999999980e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0665886343549287e-04	1.1392111315681544e-03
-90	1.4999999999999980e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
-90	1.4999999999999980e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651846e-04	7.6583567999287633e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000090.y.tsv
deleted file mode 100644
index f41fcb75..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-90	1.4999999999999980e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-4.6683826228188958e-03	3.6082016588811637e-03
-90	1.4999999999999980e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-4.6683826228188958e-03	3.6082016588811637e-03
-90	1.4999999999999980e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-4.6683826228188958e-03	3.6082016588811637e-03
-90	1.4999999999999980e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-4.6683826228188958e-03	3.6082016588811637e-03
-90	1.4999999999999980e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.9769234523318389e-03	8.3749959484181232e-03
-90	1.4999999999999980e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	1.1453285716006686e-03	2.9021989223600394e-03
-90	1.4999999999999980e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	1.4027350167983119e-03	-3.0364995611284265e-03
-90	1.4999999999999980e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-1.2989388725979183e-03	1.7596939377955817e-03
-90	1.4999999999999980e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-3.1643057131655090e-04	2.4677879042756426e-03
-90	1.4999999999999980e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	9.0992456330507912e-04	-2.4568373953485012e-03
-90	1.4999999999999980e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	3.4841364612288339e-04	-1.5495580909976588e-03
-90	1.4999999999999980e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.1258254663963703e-04	-1.6725248208580138e-04
-90	1.4999999999999980e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5350994387019344e-04	-4.5225403749931488e-04
-90	1.4999999999999980e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-4.3195006594861051e-04	1.0196187043576646e-03
-90	1.4999999999999980e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-2.3313267987949877e-05	5.8646491764119965e-04
-90	1.4999999999999980e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-1.9157680200544545e-04	-5.7049495661546095e-04
-90	1.4999999999999980e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	-5.2310875156426199e-04	-3.1689968192758709e-04
-90	1.4999999999999980e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.0952203539576622e-04	1.2722367934875755e-03
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	1.6136176460069049e-04	-1.0872737894926728e-03
-90	1.4999999999999980e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.5787655418999986e-04	9.5942557331976685e-04
-90	1.4999999999999980e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	4.4671146582124445e-04	1.0816615646061323e-03
-90	1.4999999999999980e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	2.3231719668173552e-04	-4.5588869659748623e-04
-90	1.4999999999999980e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-1.2739334220062049e-04	9.7564184044515105e-04
-90	1.4999999999999980e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	4.2694573144098013e-04	1.3211130528519494e-03
-90	1.4999999999999980e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	2.6705265798346832e-04	-6.6041383936006766e-06
-90	1.4999999999999980e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0479211557680459e-04	1.0622654079632686e-03
-90	1.4999999999999980e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	2.7327959860457723e-04	4.1449129067383029e-04
-90	1.4999999999999980e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1789983717376578e-05	5.5081547158617806e-04
-90	1.4999999999999980e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	4.2615898899450098e-05	6.8853830410149197e-04
-90	1.4999999999999980e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	2.2784094241119890e-05	3.8777185452712855e-04
-90	1.4999999999999980e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	3.8942090864686456e-06	1.6487085275903863e-04
-90	1.4999999999999980e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	7.6981992571505307e-05	1.8228837054719759e-04
-90	1.4999999999999980e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
-90	1.4999999999999980e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	6.0184155082565217e-05	2.8350962670533209e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000090.z.tsv
deleted file mode 100644
index 7bfba563..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000090.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-90	1.4999999999999980e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-8.7392472934987443e-05	-7.2244755722554975e-04
-90	1.4999999999999980e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-8.7392472934987443e-05	-7.2244755722554975e-04
-90	1.4999999999999980e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-8.7392472934987443e-05	-7.2244755722554975e-04
-90	1.4999999999999980e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-8.7392472934987443e-05	-7.2244755722554975e-04
-90	1.4999999999999980e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-3.5190166040544534e-04	-7.8502822303405391e-04
-90	1.4999999999999980e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-8.0632438188990650e-05	-4.7242343667418517e-04
-90	1.4999999999999980e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-3.4400983488675852e-04	-5.1515142741898631e-04
-90	1.4999999999999980e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-8.1493902892018394e-04	-2.5223036523457790e-03
-90	1.4999999999999980e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	-2.1200769642037152e-04	-5.5345943505285210e-04
-90	1.4999999999999980e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-7.8652181612537972e-04	8.1511015414876512e-04
-90	1.4999999999999980e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-7.1194528626192938e-04	-4.0462149423123805e-04
-90	1.4999999999999980e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	2.7325840236242503e-04	4.2196467753189749e-04
-90	1.4999999999999980e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-2.3328366841471413e-04	2.7668441201067298e-03
-90	1.4999999999999980e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	-8.4128995152941478e-04	1.3318448932017372e-03
-90	1.4999999999999980e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-5.3211927089127670e-04	-1.3536148212698110e-05
-90	1.4999999999999980e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-1.0545650243470712e-04	4.1750851037878240e-04
-90	1.4999999999999980e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-3.8711461343876298e-05	5.2485068531573037e-04
-90	1.4999999999999980e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	3.9509249378502875e-04	5.8511386913087096e-04
-90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945257e-04	6.7785909823431169e-04
-90	1.4999999999999980e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	3.9509249378503173e-04	5.8511386913087183e-04
-90	1.4999999999999980e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-3.8711461343874021e-05	5.2485068531573351e-04
-90	1.4999999999999980e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-1.0545650243470407e-04	4.1750851037878874e-04
-90	1.4999999999999980e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-5.3211927089127605e-04	-1.3536148212705645e-05
-90	1.4999999999999980e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	-8.4128995152941413e-04	1.3318448932017337e-03
-90	1.4999999999999980e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-2.3328366841471456e-04	2.7668441201067384e-03
-90	1.4999999999999980e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	2.7325840236242373e-04	4.2196467753189359e-04
-90	1.4999999999999980e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-7.1194528626193144e-04	-4.0462149423123263e-04
-90	1.4999999999999980e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-7.8652181612538080e-04	8.1511015414877032e-04
-90	1.4999999999999980e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	-2.1200769642037314e-04	-5.5345943505285080e-04
-90	1.4999999999999980e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-8.1493902892018210e-04	-2.5223036523457820e-03
-90	1.4999999999999980e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-3.4400983488675765e-04	-5.1515142741898480e-04
-90	1.4999999999999980e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-8.0632438188991775e-05	-4.7242343667418040e-04
-90	1.4999999999999980e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-3.5190166040544610e-04	-7.8502822303405705e-04
-90	1.4999999999999980e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-8.7392472934986494e-05	-7.2244755722555344e-04
-90	1.4999999999999980e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-8.7392472934986494e-05	-7.2244755722555344e-04
-90	1.4999999999999980e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-8.7392472934986494e-05	-7.2244755722555344e-04
-90	1.4999999999999980e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-8.7392472934986494e-05	-7.2244755722555344e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.x.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000120.x.tsv
deleted file mode 100644
index bf071bde..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.x.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-120	2.0000000000000004e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559209e-05	-1.0015482496217927e-03
-120	2.0000000000000004e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6169433783522033e-04	-3.6140532903482741e-04
-120	2.0000000000000004e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5777307788032076e-04	-3.3084375236273184e-04
-120	2.0000000000000004e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8368429065376128e-04	-1.4187792700005217e-03
-120	2.0000000000000004e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.7296273444354099e-04	-1.5645971329622975e-03
-120	2.0000000000000004e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7452475185896539e-04	-6.3497705583598091e-05
-120	2.0000000000000004e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.5709878803284422e-04	1.1012397001594358e-03
-120	2.0000000000000004e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5249200380623053e-04	1.0188251460922732e-03
-120	2.0000000000000004e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.5406377133869893e-04	1.9868639584955305e-03
-120	2.0000000000000004e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0920301597283904e-03	2.4047098465465105e-03
-120	2.0000000000000004e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4843197689881110e-04	-3.5490157474766219e-04
-120	2.0000000000000004e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.1526399608495576e-05	-1.4265453908755429e-03
-120	2.0000000000000004e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.4131601551457433e-04	-3.2975283345919836e-05
-120	2.0000000000000004e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.1788255004949383e-04	-1.3007367631612810e-03
-120	2.0000000000000004e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.1734477505690889e-05	-3.1953365743946274e-03
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.9426676723542610e-04	-1.2764882801002395e-03
-120	2.0000000000000004e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7458346863961743e-04	-6.1365087450749862e-04
-120	2.0000000000000004e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8416233427276767e-04	5.1245652910602104e-05
-120	2.0000000000000004e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8245089234319164e-04	1.1636733721483991e-04
-120	2.0000000000000004e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9080080557889111e-04	2.8653621550918330e-04
-120	2.0000000000000004e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.3690692145663746e-05	-7.5335009956592160e-05
-120	2.0000000000000004e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5149883803638953e-04	-1.1154333279577470e-03
-120	2.0000000000000004e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5433073223384928e-04	-1.8502814233981981e-03
-120	2.0000000000000004e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0543265260501351e-04	-2.6099839910809367e-03
-120	2.0000000000000004e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.0258677227363126e-05	-3.0378789604693212e-03
-120	2.0000000000000004e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.0067938008880467e-05	-3.0506621748818161e-03
-120	2.0000000000000004e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5318464479813741e-04	-2.7809589797541893e-03
-120	2.0000000000000004e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8973090430523321e-04	-1.8967217337607805e-03
-120	2.0000000000000004e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7247438412896913e-04	-1.0166509619451702e-03
-120	2.0000000000000004e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
-120	2.0000000000000004e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718219012e-06	-7.8512720855023800e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.y.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000120.y.tsv
deleted file mode 100644
index ca68fb03..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.y.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-120	2.0000000000000004e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-7.9799343865636025e-05	-1.2415053991501573e-04
-120	2.0000000000000004e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	2.4320241736832386e-04	-8.1838461196545673e-04
-120	2.0000000000000004e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	2.5267196478927022e-04	-1.2652036596812204e-03
-120	2.0000000000000004e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-1.3287380566343591e-04	-2.3377985010463193e-03
-120	2.0000000000000004e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9848716664614761e-04	-3.0381986191835939e-03
-120	2.0000000000000004e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-1.3129480263500484e-03	-1.3107546716419427e-03
-120	2.0000000000000004e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-1.2064774137996123e-03	1.5346386831359879e-03
-120	2.0000000000000004e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-1.1024379502829070e-04	3.8318519853395945e-03
-120	2.0000000000000004e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	2.7505815154604829e-04	3.6080432773122114e-03
-120	2.0000000000000004e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	5.2717596870479786e-04	1.1838043343739787e-03
-120	2.0000000000000004e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	1.6119745244018973e-03	4.1970325940386666e-04
-120	2.0000000000000004e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	2.0282704449471460e-03	-1.2426828251712718e-05
-120	2.0000000000000004e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	9.6425278995649808e-04	-1.7946410638979837e-03
-120	2.0000000000000004e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.4903265379610634e-04	-3.5510777726745846e-03
-120	2.0000000000000004e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-1.9114283179625323e-04	-4.1187836782112415e-03
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-5.0530253057004147e-04	-1.0625893525147657e-03
-120	2.0000000000000004e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-5.3176321207194766e-04	-1.5174407041809437e-03
-120	2.0000000000000004e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-7.2911186778798747e-04	-1.1527082703394038e-03
-120	2.0000000000000004e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-5.6194443728934805e-04	-9.1538882334193158e-04
-120	2.0000000000000004e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-5.4135460689126377e-04	-1.7203634754345823e-03
-120	2.0000000000000004e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-6.2762875390833276e-04	-1.7825199272129477e-03
-120	2.0000000000000004e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	-6.4811248118126752e-04	-2.3029286747582459e-03
-120	2.0000000000000004e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	-8.8268857290477371e-04	-2.7400085889688840e-03
-120	2.0000000000000004e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0269638957839126e-03	-2.8053315965598027e-03
-120	2.0000000000000004e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1033265589408831e-03	-2.8603109988755305e-03
-120	2.0000000000000004e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.0615311895556857e-03	-2.7462651052107779e-03
-120	2.0000000000000004e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-8.7701861068421232e-04	-2.5425680921371836e-03
-120	2.0000000000000004e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	-5.7905043224457434e-04	-2.2304428367494705e-03
-120	2.0000000000000004e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-4.5188491732982142e-04	-1.4337149991659954e-03
-120	2.0000000000000004e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
-120	2.0000000000000004e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-4.8032339747404489e-04	-7.7132540272952530e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.z.tsv b/NewRadX/test/scalarwave_newradx/newradx-state.it000120.z.tsv
deleted file mode 100644
index e5b87572..00000000
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000120.z.tsv
+++ /dev/null
@@ -1,38 +0,0 @@
-# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-120	2.0000000000000004e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	4.2596553591026402e-04	2.2007661031068663e-04
-120	2.0000000000000004e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	3.8238729768340005e-04	3.2649230893172564e-04
-120	2.0000000000000004e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	4.1209281433779292e-04	8.4698820827272569e-04
-120	2.0000000000000004e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	6.6531193191194131e-04	9.4854882468227539e-04
-120	2.0000000000000004e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	7.6573673451536535e-04	7.4544074792168822e-04
-120	2.0000000000000004e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	6.3735940002159592e-04	5.0685324548083600e-04
-120	2.0000000000000004e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	6.3660255434657884e-04	-9.5929489965741478e-05
-120	2.0000000000000004e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	6.2564860255123549e-04	-2.5031287690615732e-04
-120	2.0000000000000004e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9403212987158695e-04	-9.8446716634765087e-04
-120	2.0000000000000004e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	2.9338150103911580e-04	-1.2636417682798146e-03
-120	2.0000000000000004e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4989107016435247e-04	-5.3690099709944564e-04
-120	2.0000000000000004e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	6.6496657012389651e-05	-6.4199054768253273e-04
-120	2.0000000000000004e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	3.6350699596514579e-04	-5.4904555270777832e-05
-120	2.0000000000000004e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	2.7073196385526141e-04	1.3072071159521909e-03
-120	2.0000000000000004e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	-2.6957455056406414e-04	-3.8108143978686732e-04
-120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631536e-04	-2.3833099690205965e-03
-120	2.0000000000000004e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.6957455056406246e-04	-3.8108143978686341e-04
-120	2.0000000000000004e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	2.7073196385526364e-04	1.3072071159521861e-03
-120	2.0000000000000004e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	3.6350699596514736e-04	-5.4904555270779702e-05
-120	2.0000000000000004e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	6.6496657012388947e-05	-6.4199054768252894e-04
-120	2.0000000000000004e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	1.4989107016435092e-04	-5.3690099709944672e-04
-120	2.0000000000000004e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	2.9338150103911477e-04	-1.2636417682798219e-03
-120	2.0000000000000004e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9403212987158554e-04	-9.8446716634765217e-04
-120	2.0000000000000004e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	6.2564860255123354e-04	-2.5031287690615374e-04
-120	2.0000000000000004e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	6.3660255434657722e-04	-9.5929489965741776e-05
-120	2.0000000000000004e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	6.3735940002159657e-04	5.0685324548083903e-04
-120	2.0000000000000004e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	7.6573673451536448e-04	7.4544074792169646e-04
-120	2.0000000000000004e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	6.6531193191193805e-04	9.4854882468228070e-04
-120	2.0000000000000004e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	4.1209281433778983e-04	8.4698820827272601e-04
-120	2.0000000000000004e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	3.8238729768339831e-04	3.2649230893172547e-04
-120	2.0000000000000004e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	4.2596553591026250e-04	2.2007661031068801e-04
-120	2.0000000000000004e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	4.2596553591026250e-04	2.2007661031068801e-04
diff --git a/TestNewRadX/configuration.ccl b/TestNewRadX/configuration.ccl
new file mode 100644
index 00000000..27ccb733
--- /dev/null
+++ b/TestNewRadX/configuration.ccl
@@ -0,0 +1,3 @@
+# Configuration definition for thorn TestNewRadX
+
+REQUIRES Loop
diff --git a/TestNewRadX/doc/documentation.tex b/TestNewRadX/doc/documentation.tex
new file mode 100644
index 00000000..338f4c52
--- /dev/null
+++ b/TestNewRadX/doc/documentation.tex
@@ -0,0 +1,369 @@
+% *======================================================================*
+%  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{Cheng-Hsin Cheng,
+  Jake Doherty,
+  Michail Chabanov,
+	Alexandru Dima
+	}
+
+% The title of the document (not necessarily the name of the Thorn)
+\title{NewRadX}
+
+% the date your document was last changed, if your document is in CVS,
+% please use:
+%    \date{$ $Date$ $}
+\date{July 27 2023}
+
+\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}
+This thorn implements the radiative boundary condition originally introduced
+in the Carpet-based NewRad thorn.
+\end{abstract}
+
+% The following sections are suggestive only.
+% Remove them or add your own.
+
+\section{Introduction}
+This thorn provides routines to implement radiative boundary conditions as
+described in section VI of~\cite{EinsteinEvolve_NewRad_Alcubierre:2002kk}:
+\begin{equation}
+f = f_0 + u(r - v t)/r\mbox{,}
+\label{eqn:EinsteinEvolve_NewRad_bc}
+\end{equation}
+in its differential form
+\begin{equation}
+\partial_t f + v \partial_r f - v\,(f - f_0) = 0\mbox{,}
+\label{eqn:EinsteinEvolve_NewRad_diff_bc}
+\end{equation}
+where $v$ is the asymptotic propagation speed of the field $f$ and $f_0$
+is its asymptotic value.
+
+\section{Physical System}
+% RH: this is copied verbatim from Alcubierre:2002kk
+Quoting~\cite{EinsteinEvolve_NewRad_Alcubierre:2002kk}:
+
+At the outer boundary we use a radiation (Sommerfeld) boundary
+condition.  We start from the assumption that near the boundary all
+fields behave as spherical waves, namely we impose the condition
+\begin{equation}
+f = f_0 + u(r-vt)/r .
+\label{eq:radiation}
+\end{equation}
+Where $f_0$ is the asymptotic value of a given dynamical variable
+(typically 1 for the lapse and diagonal metric components, and zero
+for everything else), and $v$ is some wave speed.  If our
+boundary is sufficiently far away one can safely assume that the speed
+of light is 1, so $v=1$ for most fields.  However, the gauge variables
+can easily propagate with a different speed implying a different value
+of $v$.
+
+In practice, we do not use the boundary condition~(\ref{eq:radiation})
+as it stands, but rather we use it in differential form:
+\begin{equation}
+\partial_t f + v \partial_r f - v \, (f - f_0)/r = 0 .
+\end{equation}
+Since our code is written in Cartesian coordinates, we transform the
+last condition to
+\begin{equation}
+\frac{x_i}{r} \, \partial_t f + v \partial_i f + \frac{v x_i}{r^2} \,
+\left( f - f_0 \right) = 0 .
+\end{equation}
+We finite difference this condition consistently to second order in
+both space and time and apply it to all dynamic variables (with
+possible different values of $f_0$ and $v$) at all boundaries.
+
+There is a final subtlety in our boundary treatment.  Wave propagation
+is not the only reason why fields evolve near a boundary.  Simple
+infall of the coordinate observers will cause some small evolution as
+well, and such evolution is poorly modeled by a propagating wave. This
+is particularly important at early times, when the radiative boundary
+condition introduces a bad transient effect. In order to minimize the
+error at our boundaries introduced by such non-wavelike evolution, we
+allow for boundary behavior of the form:
+\begin{equation}
+f = f_0 + u(r-vt)/r + h(t)/r^n ,
+\label{eq:radpower}
+\end{equation}
+with $h$ a function of $t$ alone and $n$ some unknown power. This
+leads to the differential equation
+\begin{eqnarray}
+\partial_t f + v \partial_r f
+- \frac{v}{r} \, (f - f_0) &=&
+\frac{v h(t)}{r^{n+1}} \left( 1 - n v \right)
++ \frac{h'(t)}{r^n} \nonumber \\
+&\simeq& \frac{h'(t)}{r^n} \qquad \mathrm{for\ large\ } r ,
+\end{eqnarray}
+or in Cartesian coordinates
+\begin{equation}
+\frac{x_i}{r} \, \partial_t f + v \partial_i f + \frac{v x_i}{r^2} \,
+\left( f - f_0 \right) \simeq \frac{x_i h'(t)}{r^{n+1}} .
+\label{eqn:EinsteinEvolve_NewRad_num_bc}
+\end{equation}
+
+This expression still contains the unknown function $h'(t)$. Having
+chosen a value of $n$, one can evaluate the above expression one point
+away from the boundary to solve for $h'(t)$, and then use this value
+at the boundary itself.  Empirically, we have found that taking $n=3$
+almost completely eliminates the bad transient caused by the radiative
+boundary condition on its own.
+
+\section{Numerical Implementation}
+The thorn implements to ingredients for the evolution.
+\begin{enumerate}
+\item the boundary condition~\eqref{eqn:EinsteinEvolve_NewRad_num_bc},
+\item a routine to extrapolate the contracted Christoffel symbols
+$g^{jk} \Gamma^i_{jk}$ (\code{Xt1}\ldots\code{Xt3} in the code) into the
+outer boundaries at $t=0$.
+\end{enumerate}
+
+\subsection{Extrapolation}
+At outer boundary points, as determined by \code{GenericFD}'s routine
+\code{GenericFD\_GetBoundaryInfo} we use cubic polynomials along the
+normal of the boundary to extrapolate data from the interior into the
+boundary region. Due to the use of cubic polynomial we require at least
+four (4) points of valid data to be available for the extrapolation.
+This \emph{includes} ghost zones, which are assumed to contain valid
+data in the interior of the domain.
+
+\subsection{Radiative boundary condition}
+The derivatives $\partial_i f$ appearing in
+\eqref{eqn:EinsteinEvolve_NewRad_num_bc} are approximated as
+2\textsuperscript{nd} order accurate finite difference expressions using
+centred expressions
+\begin{equation}
+f'(x) \approx \frac{f(x-\Delta x) - f(x+\Delta x)}{2\Delta x}
+\end{equation}
+and one sided expressions
+\begin{equation}
+f'(x) \approx \pm\frac{3 f(x) - 4 f(x\mp\Delta x) + f(x\mp2\Delta
+x)}{2\Delta x}\mbox{,}
+\end{equation}
+for boundaries around the $\pm$ coordinate direction.
+
+% copied from newrad.cc so likely originally written by Miguel
+% Alcubierre.
+Finally we try to extrapolate for the part of the boundary
+that does not behave as a pure wave (i.e.\ Coulomb type
+terms caused by infall of the coordinate lines).
+
+This we do by comparing the source term one grid point
+away from the boundary (which we already have), to what
+we would have obtained if we had used the boundary
+condition there.  The difference gives us an idea of the
+missing part and we extrapolate that to the boundary
+assuming a power-law decay.
+
+\section{Using This Thorn}
+The thorn exports two aliased functions \code{ExtrapolateGammas} and
+\code{NewRad\_Apply} that should be used in \code{INITIAL} and
+\code{MoL\_CalcRHS} respectively to extrapolate the contracted
+Christoffel symbols and apply radiative boundary conditions to evolved
+variables respectively.
+
+There call signatures are:
+\begin{verbatim}
+CCTK_INT FUNCTION                         \
+    ExtrapolateGammas                     \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY INOUT var)
+
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+\end{verbatim}
+where \code{var0} corresponds to $f_0$, \code{v0} is $v$ and
+\code{radpower} is the assumed decay exponent $n$.
+
+\subsection{Obtaining This Thorn}
+The thorn is part of the EinsteinEvolve arrangement available on
+bitbucket.
+\begin{verbatim}
+git clone git@bitbucket.org:einsteintoolkit/einsteinevolve.git
+\end{verbatim}
+
+\subsection{Basic Usage}
+
+\subsection{Special Behaviour}
+If the parameter \code{z\_is\_radial} is set it assumes that the $z$
+direction is a radial direction and uses this to evaluate the radial
+derivative in \eqref{eqn:EinsteinEvolve_NewRad_num_bc}. This is the case
+for the multi-patch coordinate systems provided by the
+\code{Llama}~\cite{EinsteinEvolve_NewRad_llamacode} infrastructure.
+
+\subsection{Interaction With Other Thorns}
+This thorn requires thorn \code{GenericFD} which is part of
+\code{Kranc}~\cite{EinsteinEvolve_NewRad_kranccode}.
+
+\subsection{Examples}
+The best example is likely to inspect the source code \code{ML\_BSSN}
+and \code{ML\_BSSN\_Helper}, namely:
+
+\begin{verbatim}
+<interface.ccl>
+CCTK_INT FUNCTION                         \
+    NewRad_Apply                          \
+        (CCTK_POINTER_TO_CONST IN cctkGH, \
+         CCTK_REAL ARRAY IN var,          \
+         CCTK_REAL ARRAY INOUT rhs,       \
+         CCTK_REAL IN var0,               \
+         CCTK_REAL IN v0,                 \
+         CCTK_INT IN radpower)
+USES FUNCTION NewRad_Apply
+\end{verbatim}
+
+\begin{verbatim}
+<schedule.ccl>
+SCHEDULE ML_BSSN_NewRad IN MoL_CalcRHS AFTER ML_BSSN_EvolutionInterior
+{
+  LANG: C
+  # No need to sync here -- the RHS variables are never synced
+} "Apply NewRad boundary conditions to RHS"
+\end{verbatim}
+
+\begin{verbatim}
+<NewRad.cc>
+#include "cctk_Arguments.h"
+#include "cctk_Functions.h"
+
+void ML_BSSN_NewRad(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+
+  const int radpower = 2; // for example
+
+  NewRad_Apply(cctkGH, gt12, gt12rhs, 0.0, 1.0, radpower);
+}
+\end{verbatim}
+
+\subsection{Support and Feedback}
+Please use the Einstein Toolkit mailing list
+\url{users@einsteintoolkit.org} to report issues and ask for help.
+
+\section{History}
+
+\subsection{Thorn Source Code}
+\begin{itemize}
+\item Initial version of method likely by Miguel Alcubierre;
+\item Carpet version of code by Erik Schnetter;
+\item CarpetX version of code by Cheng-Hsin Cheng, Jake Doherty, Michail Chabanov, Alexandru Dima.
+\end{itemize}
+
+\subsection{Thorn Documentation}
+\begin{itemize}
+\item Initial version by Roland Haas using text by Miguel, Erik.
+\item Current version by Alexandru Dima.
+\end{itemize}
+
+\subsection{Acknowledgements}
+This documentation copies text from comments in the source code as well
+as the paper~\cite{EinsteinEvolve_NewRad_Alcubierre:2002kk}.
+
+\begin{thebibliography}{9}
+\bibitem{EinsteinEvolve_NewRad_Alcubierre:2002kk}
+  M.~Alcubierre, B.~Bruegmann, P.~Diener, M.~Koppitz, D.~Pollney, E.~Seidel and R.~Takahashi,
+  ``Gauge conditions for long term numerical black hole evolutions without excision,''
+  Phys.\ Rev.\ D {\bf 67}, 084023 (2003)
+  doi:10.1103/PhysRevD.67.084023
+  [gr-qc/0206072].
+\bibitem{EinsteinEvolve_NewRad_kranccode} ``Kranc: Kranc assembles
+numerical code``, \url{http://kranccode.org/}.
+\bibitem{EinsteinEvolve_NewRad_llamacode} ``The Llama code``, \url{https://llamacode.bitbucket.io/}.
+
+\end{thebibliography}
+
+% Do not delete next line
+% END CACTUS THORNGUIDE
+
+\end{document}
diff --git a/TestNewRadX/interface.ccl b/TestNewRadX/interface.ccl
new file mode 100644
index 00000000..16e338e2
--- /dev/null
+++ b/TestNewRadX/interface.ccl
@@ -0,0 +1,27 @@
+# Interface definition for thorn TestNewRadX
+
+IMPLEMENTS: TestNewRadX
+
+INHERITS: CarpetX
+
+USES INCLUDE HEADER: loop_device.hxx
+USES INCLUDE HEADER: newradx.hxx
+
+# Scalar field grid functions for the unit test
+CCTK_REAL state TYPE=gf CENTERING={VVV} TAGS='rhs="rhs"'
+{
+  uu
+  vv
+} "Scalar wave state vector: scalar field and its time derivative"
+
+CCTK_REAL rhs TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
+{
+  uu_rhs
+  vv_rhs
+} "RHS of scalar wave state vector"
+
+CCTK_REAL error TYPE=gf CENTERING={VVV} TAGS='checkpoint="no"'
+{
+  uu_err
+  vv_err
+} "Error in scalar wave state vector"
diff --git a/TestNewRadX/param.ccl b/TestNewRadX/param.ccl
new file mode 100644
index 00000000..28284ebb
--- /dev/null
+++ b/TestNewRadX/param.ccl
@@ -0,0 +1,46 @@
+# Parameter definitions for thorn TestNewRadX
+#
+BOOLEAN test_use_newradx "Use radiative boundary conditions for scalar field"
+{
+} "yes"
+
+BOOLEAN test_add_dissipation "Add Kreiss-Oliger dissipation to scalar field RHS"
+{
+} "yes"
+
+CCTK_REAL eps_dissipation "Coefficient for Kreiss-Oliger dissipation"
+{
+  0.0:1.0 :: ""
+} 0.15
+
+CCTK_REAL n_falloff "Exponent of the falloff term r^(-n_falloff) in the scalar field potential"
+{
+  0.0:* :: ""
+} 2.0
+
+
+# Parameters scalar field test initial data
+CCTK_REAL gaussian_a0 "Scalar field initial Gaussian amplitude"
+{
+  *:* :: ""
+} 1.0
+
+CCTK_REAL gaussian_w0 "Scalar field initial Gaussian profile width"
+{
+  0.0:* :: ""
+} 1.0
+
+CCTK_REAL gaussian_x0 "Scalar field initial Gaussian profile center"
+{
+  *:* :: ""
+} 0.0
+
+CCTK_REAL gaussian_y0 "Scalar field initial Gaussian profile center"
+{
+  *:* :: ""
+} 0.0
+
+CCTK_REAL gaussian_z0 "Scalar field initial Gaussian profile center"
+{
+  *:* :: ""
+} 0.0
diff --git a/TestNewRadX/schedule.ccl b/TestNewRadX/schedule.ccl
new file mode 100644
index 00000000..86e3ec07
--- /dev/null
+++ b/TestNewRadX/schedule.ccl
@@ -0,0 +1,40 @@
+# Schedule definitions for thorn TestNewRadX 
+
+STORAGE: state
+
+SCHEDULE TestNewRadX_Init AT initial
+{
+  LANG: C
+  WRITES: state(interior)
+  SYNC: state
+} "Initialize scalar wave state"
+
+SCHEDULE TestNewRadX_EstimateError AT postinitial
+{
+  LANG: C
+  READS: state(everywhere)
+  WRITES: CarpetX::regrid_error(interior)
+} "Estimate error for regridding"
+
+SCHEDULE TestNewRadX_EstimateError AT poststep
+{
+  LANG: C
+  READS: state(everywhere)
+  WRITES: CarpetX::regrid_error(interior)
+} "Estimate error for regridding"
+
+SCHEDULE TestNewRadX_RHS IN ODESolvers_RHS
+{
+  LANG: C
+  READS: state(everywhere)
+  WRITES: rhs(interior)
+  SYNC: rhs
+} "Calculate scalar wave RHS"
+
+SCHEDULE TestNewRadX_CompareSolution IN ODESolvers_PostStep
+{
+  LANG: C
+  READS: state(interior)
+  WRITES: error(interior)
+  SYNC: error
+} "Calculate error between numerical and analytic solutions"
diff --git a/TestNewRadX/src/make.code.defn b/TestNewRadX/src/make.code.defn
new file mode 100644
index 00000000..38b9b874
--- /dev/null
+++ b/TestNewRadX/src/make.code.defn
@@ -0,0 +1,7 @@
+# Main make.code.defn file for thorn TestNewRadX
+
+# Source files in this directory
+SRCS = test_newradx.cxx
+
+# Subdirectories containing source files
+SUBDIRS =
diff --git a/TestNewRadX/src/test_newradx.cxx b/TestNewRadX/src/test_newradx.cxx
new file mode 100644
index 00000000..f87e0e43
--- /dev/null
+++ b/TestNewRadX/src/test_newradx.cxx
@@ -0,0 +1,173 @@
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
+#include <loop_device.hxx>
+#include <newradx.hxx>
+
+namespace TestNewRadX {
+
+#define ijk p.I
+#define im3jk p.I - 3 * p.DI[0]
+#define im2jk p.I - 2 * p.DI[0]
+#define im1jk p.I - 1 * p.DI[0]
+#define ip3jk p.I + 3 * p.DI[0]
+#define ip2jk p.I + 2 * p.DI[0]
+#define ip1jk p.I + 1 * p.DI[0]
+
+#define ijm3k p.I - 3 * p.DI[1]
+#define ijm2k p.I - 2 * p.DI[1]
+#define ijm1k p.I - 1 * p.DI[1]
+#define ijp3k p.I + 3 * p.DI[1]
+#define ijp2k p.I + 2 * p.DI[1]
+#define ijp1k p.I + 1 * p.DI[1]
+
+#define ijkm3 p.I - 3 * p.DI[2]
+#define ijkm2 p.I - 2 * p.DI[2]
+#define ijkm1 p.I - 1 * p.DI[2]
+#define ijkp3 p.I + 3 * p.DI[2]
+#define ijkp2 p.I + 2 * p.DI[2]
+#define ijkp1 p.I + 1 * p.DI[2]
+
+// Flat Laplacian operator at 4th order accuracy
+template <typename T>
+constexpr T Laplacian_4thorder(const Loop::GF3D2<T> gf,
+                               const Loop::PointDesc &p) {
+  return 1.0 / 12.0 *
+         ((-gf(ip2jk) + 16 * gf(ip1jk) - 30 * gf(ijk) - gf(im2jk) +
+           16 * gf(im1jk)) /
+              (p.DX[0] * p.DX[0]) +
+          (-gf(ijp2k) + 16 * gf(ijp1k) - 30 * gf(ijk) - gf(ijm2k) +
+           16 * gf(ijm1k)) /
+              (p.DX[1] * p.DX[1]) +
+          (-gf(ijkp2) + 16 * gf(ijkp1) - 30 * gf(ijk) - gf(ijkm2) +
+           16 * gf(ijkm1)) /
+              (p.DX[2] * p.DX[2]));
+}
+
+// 5th order Kreiss-Oliger dissipation
+template <typename T>
+constexpr T KO_diss_5thorder(const Loop::GF3D2<T> gf,
+                             const Loop::PointDesc &p) {
+  return 1.0 / 64.0 *
+         ((gf(im3jk) - 6.0 * gf(im2jk) + 15.0 * gf(im1jk) - 20.0 * gf(ijk) +
+           gf(ip3jk) - 6.0 * gf(ip2jk) + 15.0 * gf(ip1jk)) /
+              p.DX[0] +
+          (gf(ijm3k) - 6.0 * gf(ijm2k) + 15.0 * gf(ijm1k) - 20.0 * gf(ijk) +
+           gf(ijp3k) - 6.0 * gf(ijp2k) + 15.0 * gf(ijp1k)) /
+              p.DX[1] +
+          (gf(ijkm3) - 6.0 * gf(ijkm2) + 15.0 * gf(ijkm1) - 20.0 * gf(ijk) +
+           gf(ijkp3) - 6.0 * gf(ijkp2) + 15.0 * gf(ijkp1)) /
+              p.DX[2]);
+}
+
+// Test scalar field initial data
+template <typename T>
+constexpr void gaussian(const T t, const T A, const T W, const T x, const T y,
+                        const T z, T &uu, T &vv) {
+  using std::exp, std::pow, std::sqrt;
+
+  const T r = sqrt(pow(x, 2) + pow(y, 2) + pow(z, 2));
+
+  const auto f = [&](const T v) {
+    return A * exp(-pow(v, 2) / (2 * pow(W, 2)));
+  };
+
+  if (r < sqrt(std::numeric_limits<T>::epsilon())) {
+    // L'Hôpital
+    uu = f(-t) * (1 - pow(t / W, 2));
+    vv = f(-t) * (3 - pow(t / W, 2)) * (-t / pow(W, 2));
+  } else {
+    uu = 0.5 * (f(r - t) * (r - t) + f(r + t) * (r + t)) / r;
+    vv = 0.5 *
+         (f(r - t) * (pow((r - t) / W, 2) - 1) -
+          f(r + t) * (pow((r + t) / W, 2) - 1)) /
+         r;
+  }
+}
+
+// Scheduled functions
+extern "C" void TestNewRadX_Init(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_TestNewRadX_Init;
+  DECLARE_CCTK_PARAMETERS;
+
+  grid.loop_int_device<0, 0, 0>(
+      grid.nghostzones,
+      [=] CCTK_DEVICE(const Loop::PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+        gaussian(cctk_time, gaussian_a0, gaussian_w0, p.x - gaussian_x0,
+                 p.y - gaussian_y0, p.z - gaussian_z0, uu(p.I), vv(p.I));
+      });
+}
+
+extern "C" void TestNewRadX_RHS(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_TestNewRadX_RHS;
+  DECLARE_CCTK_PARAMETERS;
+
+  if (grid.nghostzones[0] != 3 || grid.nghostzones[1] != 3 ||
+      grid.nghostzones[2] != 3) {
+    CCTK_ERROR("Invalid number of ghost zones for 4th order FD");
+  }
+
+  grid.loop_int_device<0, 0, 0>(grid.nghostzones,
+                                [=] CCTK_DEVICE(const Loop::PointDesc &p)
+                                    CCTK_ATTRIBUTE_ALWAYS_INLINE {
+                                      uu_rhs(p.I) = vv(p.I);
+                                      vv_rhs(p.I) = Laplacian_4thorder(uu, p);
+                                    });
+
+  if (test_use_newradx) {
+    NewRadX::NewRadX_Apply(cctkGH, uu, uu_rhs, 0, 1, n_falloff);
+    NewRadX::NewRadX_Apply(cctkGH, vv, vv_rhs, 0, 1, n_falloff + 1);
+  }
+
+  if (test_add_dissipation) {
+    grid.loop_int_device<0, 0, 0>(
+        grid.nghostzones,
+        [=] CCTK_DEVICE(const Loop::PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+          uu_rhs(p.I) += eps_dissipation * KO_diss_5thorder(uu, p);
+          vv_rhs(p.I) += eps_dissipation * KO_diss_5thorder(vv, p);
+        });
+  }
+}
+
+extern "C" void TestNewRadX_CompareSolution(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_TestNewRadX_CompareSolution;
+  DECLARE_CCTK_PARAMETERS;
+
+  grid.loop_int_device<0, 0, 0>(
+      grid.nghostzones,
+      [=] CCTK_DEVICE(const Loop::PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+        CCTK_REAL u_analytic, v_analytic;
+        gaussian(cctk_time, gaussian_a0, gaussian_w0, p.x - gaussian_x0,
+                 p.y - gaussian_y0, p.z - gaussian_z0, u_analytic, v_analytic);
+        uu_err(p.I) = uu(p.I) - u_analytic;
+        vv_err(p.I) = vv(p.I) - v_analytic;
+      });
+}
+
+extern "C" void TestNewRadX_EstimateError(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTSX_TestNewRadX_EstimateError;
+  DECLARE_CCTK_PARAMETERS;
+
+  grid.loop_int_device<1, 1, 1>(
+      grid.nghostzones,
+      [=] CCTK_DEVICE(const Loop::PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {
+        using std::abs, std::max;
+        CCTK_REAL maxabs_duu = 0;
+        for (int d = 0; d < Loop::dim; ++d) {
+          const int ni = d == 0 ? 1 : 2;
+          const int nj = d == 1 ? 1 : 2;
+          const int nk = d == 2 ? 1 : 2;
+          for (int dk = 0; dk < nk; ++dk) {
+            for (int dj = 0; dj < nj; ++dj) {
+              for (int di = 0; di < ni; ++di) {
+                const auto I = p.I + di * p.DI[0] + dj * p.DI[1] + dk * p.DI[2];
+                maxabs_duu = max(maxabs_duu, abs(uu(I + p.DI[d]) - uu(I)));
+              }
+            }
+          }
+        }
+        regrid_error(p.I) = maxabs_duu;
+      });
+}
+
+} // namespace TestNewRadX
diff --git a/NewRadX/test/scalarwave_newradx.par b/TestNewRadX/test/scalarwave_newradx.par
similarity index 76%
rename from NewRadX/test/scalarwave_newradx.par
rename to TestNewRadX/test/scalarwave_newradx.par
index 15791533..929691b4 100644
--- a/NewRadX/test/scalarwave_newradx.par
+++ b/TestNewRadX/test/scalarwave_newradx.par
@@ -2,6 +2,7 @@ ActiveThorns = "
     CarpetX
     ODESolvers
     NewRadX
+    TestNewRadX
 "
 
 $nlevels = 1
@@ -58,22 +59,21 @@ IO::out_every = 1
 CarpetX::out_metadata = no
 CarpetX::out_tsv_every = 30
 CarpetX::out_tsv_vars = "
-  NewRadX::uu
-  NewRadX::vv
-  NewRadX::uu_err
-  NewRadX::vv_err
+  TestNewRadX::uu
+  TestNewRadX::vv
+  TestNewRadX::uu_err
+  TestNewRadX::vv_err
 "
 # CarpetX::out_norm_omit_unstable = yes
 # CarpetX::out_norm_vars          = "all"
 # CarpetX::out_silo_vars          = "all"
 
-NewRadX::run_test             = yes
-NewRadX::test_use_newradx     = yes
-NewRadX::test_add_dissipation = yes
-NewRadX::eps_dissipation      = 0.2
-NewRadX::n_falloff            = 2.0
-NewRadX::gaussian_a0          = 1.0
-NewRadX::gaussian_w0          = 0.5
-NewRadX::gaussian_x0          = 3.0
-NewRadX::gaussian_y0          = 4.0
-NewRadX::gaussian_z0          = 0.0
+TestNewRadX::test_use_newradx     = yes
+TestNewRadX::test_add_dissipation = yes
+TestNewRadX::eps_dissipation      = 0.2
+TestNewRadX::n_falloff            = 2.0
+TestNewRadX::gaussian_a0          = 1.0
+TestNewRadX::gaussian_w0          = 0.5
+TestNewRadX::gaussian_x0          = 3.0
+TestNewRadX::gaussian_y0          = 4.0
+TestNewRadX::gaussian_z0          = 0.0
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000000.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.x.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000000.x.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.x.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000000.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.y.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000000.y.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.y.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000000.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.z.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000000.z.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000000.z.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.x.tsv
similarity index 54%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000030.x.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.x.tsv
index bc07b7ce..d868ce81 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.x.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.x.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-30	5.0000000000000000e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2703567582752418e-08	3.9608555326535775e-07
-30	5.0000000000000000e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8683912344732047e-07	3.4739389657126288e-07
-30	5.0000000000000000e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8580533705609808e-08	3.2035707227623289e-08
-30	5.0000000000000000e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0720935510172503e-08	6.5449842264043254e-07
-30	5.0000000000000000e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.4266770070035039e-07	6.7676345397295394e-07
-30	5.0000000000000000e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4439484317380070e-06	-1.2451704346012980e-05
-30	5.0000000000000000e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7798836439723011e-06	4.3835513714219136e-06
-30	5.0000000000000000e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.0857268952990819e-05	1.7737460683392312e-04
-30	5.0000000000000000e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0748345440318220e-04	-1.4327971294922828e-04
-30	5.0000000000000000e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8804944814930826e-04	-1.9469306410071271e-03
-30	5.0000000000000000e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.1768090233605687e-03	1.0565171255289727e-03
-30	5.0000000000000000e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9358905329609818e-03	1.0388738863157056e-02
-30	5.0000000000000000e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4377482017082951e-03	-1.1805873234573619e-02
-30	5.0000000000000000e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.8869933762948278e-03	-1.0063538799154250e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	2.7997952434548223e-02
-30	5.0000000000000000e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	6.7278858542025970e-03	8.2654196587976514e-04
-30	5.0000000000000000e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3104673481453001e-03	-3.5558764069803087e-02
-30	5.0000000000000000e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.1978976815042947e-03	-3.9917137131927169e-02
-30	5.0000000000000000e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8651518995048238e-03	-2.9863603330464086e-02
-30	5.0000000000000000e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8656083389207608e-03	-2.9866077137408686e-02
-30	5.0000000000000000e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.1994221982082653e-03	-3.9915244689696483e-02
-30	5.0000000000000000e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3170102088836296e-03	-3.5526795738071631e-02
-30	5.0000000000000000e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7434205216840050e-03	7.7830205431205640e-04
-30	5.0000000000000000e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3670360291675988e-03	2.7635106348443503e-02
-30	5.0000000000000000e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1003873005207936e-03	-9.7958556863585421e-03
-30	5.0000000000000000e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.9504225432771180e-03	-9.2459077268397319e-03
+30	5.0000000000000000e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2703567582752432e-08	3.9608555326535770e-07
+30	5.0000000000000000e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8683912344732053e-07	3.4739389657126283e-07
+30	5.0000000000000000e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8580533705609805e-08	3.2035707227623295e-08
+30	5.0000000000000000e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0720935510172517e-08	6.5449842264043244e-07
+30	5.0000000000000000e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.4266770070035050e-07	6.7676345397295394e-07
+30	5.0000000000000000e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4439484317380074e-06	-1.2451704346012982e-05
+30	5.0000000000000000e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7798836439723011e-06	4.3835513714219187e-06
+30	5.0000000000000000e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.0857268952990839e-05	1.7737460683392314e-04
+30	5.0000000000000000e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0748345440318217e-04	-1.4327971294922858e-04
+30	5.0000000000000000e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8804944814930831e-04	-1.9469306410071266e-03
+30	5.0000000000000000e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.1768090233605685e-03	1.0565171255289740e-03
+30	5.0000000000000000e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9358905329609826e-03	1.0388738863157049e-02
+30	5.0000000000000000e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4377482017082916e-03	-1.1805873234573622e-02
+30	5.0000000000000000e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.8869933762948382e-03	-1.0063538799154247e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	2.7997952434548223e-02
+30	5.0000000000000000e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	6.7278858542026004e-03	8.2654196587972351e-04
+30	5.0000000000000000e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3104673481452931e-03	-3.5558764069803087e-02
+30	5.0000000000000000e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.1978976815042947e-03	-3.9917137131927155e-02
+30	5.0000000000000000e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8651518995048307e-03	-2.9863603330464106e-02
+30	5.0000000000000000e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8656083389207678e-03	-2.9866077137408676e-02
+30	5.0000000000000000e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.1994221982082583e-03	-3.9915244689696525e-02
+30	5.0000000000000000e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.3170102088836296e-03	-3.5526795738071618e-02
+30	5.0000000000000000e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7434205216840015e-03	7.7830205431207028e-04
+30	5.0000000000000000e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3670360291676040e-03	2.7635106348443475e-02
+30	5.0000000000000000e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1003873005207936e-03	-9.7958556863585733e-03
+30	5.0000000000000000e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.9504225432771215e-03	-9.2459077268397319e-03
 30	5.0000000000000000e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.8813576979358300e-03	1.1869820817723772e-02
-30	5.0000000000000000e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3767506782164000e-04	-1.4301902179536079e-03
-30	5.0000000000000000e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.1509051852345134e-03	-1.0989677731619665e-03
-30	5.0000000000000000e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402805e-03
-30	5.0000000000000000e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402805e-03
-30	5.0000000000000000e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402805e-03
-30	5.0000000000000000e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402805e-03
+30	5.0000000000000000e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3767506782163956e-04	-1.4301902179536187e-03
+30	5.0000000000000000e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.1509051852345142e-03	-1.0989677731619708e-03
+30	5.0000000000000000e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402796e-03
+30	5.0000000000000000e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402796e-03
+30	5.0000000000000000e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402796e-03
+30	5.0000000000000000e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146325240126356e-03	5.6552235794402796e-03
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.y.tsv
similarity index 54%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000030.y.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.y.tsv
index 31063bec..fc3e344b 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.y.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.y.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-30	5.0000000000000000e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.3842045616905259e-08	1.3095552664557879e-07
-30	5.0000000000000000e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	6.6072895228672441e-08	2.8308060450851209e-07
-30	5.0000000000000000e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-2.0781162836984226e-08	-5.2455401014287627e-08
-30	5.0000000000000000e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9809450932767611e-08	1.4896035061044267e-07
-30	5.0000000000000000e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	3.3859499318856983e-07	1.1620022122036073e-06
-30	5.0000000000000000e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	1.9111249487609408e-07	-4.7032873701046959e-06
-30	5.0000000000000000e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-6.1902884601021258e-06	-1.3376103865633122e-05
-30	5.0000000000000000e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	3.3806618204578616e-06	8.6049558993607413e-05
-30	5.0000000000000000e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	9.1729768603698552e-05	1.3214254221112940e-04
-30	5.0000000000000000e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-6.9470814801203719e-05	-1.0958856802476583e-03
-30	5.0000000000000000e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-1.0553429190456817e-03	-1.3130948270966703e-03
-30	5.0000000000000000e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	3.4920227729048599e-04	8.7675342916597575e-03
-30	5.0000000000000000e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	5.1961893917809535e-03	-1.4741262489050451e-03
-30	5.0000000000000000e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-4.8952564480779746e-03	-2.3358055125182964e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	2.7997952434548223e-02
-30	5.0000000000000000e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	4.7533138351517346e-04	-2.0963579457311903e-02
-30	5.0000000000000000e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.0085531426432147e-03	1.2660940967375363e-02
-30	5.0000000000000000e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	2.7192586575455540e-03	1.1818380838180084e-02
-30	5.0000000000000000e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	8.6897451008245696e-04	7.6205798498191436e-03
-30	5.0000000000000000e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	4.3526188328402281e-03	5.7095544604962674e-03
-30	5.0000000000000000e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	2.4906195748945013e-03	9.1967372582264870e-04
-30	5.0000000000000000e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.1362819423660649e-03	5.4324022080419416e-03
-30	5.0000000000000000e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	8.2711848616129043e-04	8.8014475076079145e-03
-30	5.0000000000000000e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	3.7506601318124493e-03	1.3246204801717038e-02
-30	5.0000000000000000e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-3.2329614957135530e-03	8.5788948948234689e-03
-30	5.0000000000000000e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.5005974910201891e-03	-2.4474202271633567e-02
-30	5.0000000000000000e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-2.9378408758477066e-03	3.3714430763159040e-02
+30	5.0000000000000000e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.3842045616905256e-08	1.3095552664557876e-07
+30	5.0000000000000000e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	6.6072895228672414e-08	2.8308060450851209e-07
+30	5.0000000000000000e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-2.0781162836984223e-08	-5.2455401014287607e-08
+30	5.0000000000000000e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9809450932767598e-08	1.4896035061044259e-07
+30	5.0000000000000000e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	3.3859499318856973e-07	1.1620022122036073e-06
+30	5.0000000000000000e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	1.9111249487609398e-07	-4.7032873701046959e-06
+30	5.0000000000000000e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-6.1902884601021258e-06	-1.3376103865633124e-05
+30	5.0000000000000000e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	3.3806618204578599e-06	8.6049558993607386e-05
+30	5.0000000000000000e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	9.1729768603698538e-05	1.3214254221112948e-04
+30	5.0000000000000000e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-6.9470814801203692e-05	-1.0958856802476581e-03
+30	5.0000000000000000e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-1.0553429190456815e-03	-1.3130948270966701e-03
+30	5.0000000000000000e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	3.4920227729048599e-04	8.7675342916597558e-03
+30	5.0000000000000000e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	5.1961893917809518e-03	-1.4741262489050416e-03
+30	5.0000000000000000e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-4.8952564480779746e-03	-2.3358055125182943e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	2.7997952434548223e-02
+30	5.0000000000000000e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	4.7533138351517346e-04	-2.0963579457311917e-02
+30	5.0000000000000000e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.0085531426431974e-03	1.2660940967375377e-02
+30	5.0000000000000000e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	2.7192586575455480e-03	1.1818380838180084e-02
+30	5.0000000000000000e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	8.6897451008246130e-04	7.6205798498191540e-03
+30	5.0000000000000000e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	4.3526188328402186e-03	5.7095544604962934e-03
+30	5.0000000000000000e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	2.4906195748944844e-03	9.1967372582258105e-04
+30	5.0000000000000000e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.1362819423660839e-03	5.4324022080419207e-03
+30	5.0000000000000000e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	8.2711848616129737e-04	8.8014475076079249e-03
+30	5.0000000000000000e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	3.7506601318124614e-03	1.3246204801717038e-02
+30	5.0000000000000000e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-3.2329614957135495e-03	8.5788948948234342e-03
+30	5.0000000000000000e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.5005974910201891e-03	-2.4474202271633553e-02
+30	5.0000000000000000e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-2.9378408758477031e-03	3.3714430763159053e-02
 30	5.0000000000000000e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	-5.6405255843289641e-03	-2.7827605351541336e-02
-30	5.0000000000000000e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	1.0420052319284993e-03	7.2637177805181738e-03
-30	5.0000000000000000e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-8.4569710875320048e-03	1.3090350983083757e-02
-30	5.0000000000000000e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-8.4569710875320048e-03	1.3090350983083757e-02
-30	5.0000000000000000e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-8.4569710875320048e-03	1.3090350983083757e-02
-30	5.0000000000000000e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-8.4569710875320048e-03	1.3090350983083757e-02
+30	5.0000000000000000e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	1.0420052319285063e-03	7.2637177805181738e-03
+30	5.0000000000000000e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-8.4569710875319979e-03	1.3090350983083775e-02
+30	5.0000000000000000e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-8.4569710875319979e-03	1.3090350983083775e-02
+30	5.0000000000000000e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-8.4569710875319979e-03	1.3090350983083775e-02
+30	5.0000000000000000e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-8.4569710875319979e-03	1.3090350983083775e-02
diff --git a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.z.tsv
similarity index 56%
rename from NewRadX/test/scalarwave_newradx/newradx-error.it000030.z.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.z.tsv
index c02294a0..ec3d2630 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-error.it000030.z.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000030.z.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
-30	5.0000000000000000e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-5.5702336115142004e-06	-1.1485905809191786e-06
-30	5.0000000000000000e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	7.8293430016506858e-07	3.2267126158465478e-05
-30	5.0000000000000000e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.8886307735842763e-06	-1.3592358036960060e-05
-30	5.0000000000000000e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-9.3505708037414486e-06	-2.2067613278239817e-05
-30	5.0000000000000000e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.0758862762057881e-05	1.6964416779760580e-04
-30	5.0000000000000000e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	1.1867472239512576e-04	1.3757199764269747e-04
-30	5.0000000000000000e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-1.6572354372146377e-04	-1.9071965667995206e-03
-30	5.0000000000000000e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	-1.3109213786008528e-03	-1.9717850009085386e-03
-30	5.0000000000000000e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-4.4534821586217940e-04	8.2135492683918458e-03
-30	5.0000000000000000e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	3.8445751953897194e-03	8.4998713916352234e-03
-30	5.0000000000000000e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	3.6914056679434384e-03	-1.3444818085887565e-02
-30	5.0000000000000000e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-3.1049509611165219e-03	-1.5926445507223923e-02
-30	5.0000000000000000e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-5.4746126618502554e-03	1.2046425668117394e-02
+30	5.0000000000000000e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-5.5702336115141978e-06	-1.1485905809191718e-06
+30	5.0000000000000000e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	7.8293430016506900e-07	3.2267126158465478e-05
+30	5.0000000000000000e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.8886307735842763e-06	-1.3592358036960053e-05
+30	5.0000000000000000e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-9.3505708037414452e-06	-2.2067613278239797e-05
+30	5.0000000000000000e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.0758862762057883e-05	1.6964416779760574e-04
+30	5.0000000000000000e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	1.1867472239512573e-04	1.3757199764269736e-04
+30	5.0000000000000000e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-1.6572354372146371e-04	-1.9071965667995198e-03
+30	5.0000000000000000e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	-1.3109213786008528e-03	-1.9717850009085391e-03
+30	5.0000000000000000e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-4.4534821586218092e-04	8.2135492683918388e-03
+30	5.0000000000000000e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	3.8445751953897159e-03	8.4998713916352234e-03
+30	5.0000000000000000e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	3.6914056679434384e-03	-1.3444818085887562e-02
+30	5.0000000000000000e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-3.1049509611165219e-03	-1.5926445507223889e-02
+30	5.0000000000000000e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-5.4746126618502589e-03	1.2046425668117394e-02
 30	5.0000000000000000e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	-2.3083836025153646e-03	2.5809785714037928e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	2.7997952434548223e-02
-30	5.0000000000000000e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.3083836025153577e-03	2.5809785714037928e-02
-30	5.0000000000000000e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-5.4746126618502589e-03	1.2046425668117394e-02
-30	5.0000000000000000e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-3.1049509611165219e-03	-1.5926445507223917e-02
-30	5.0000000000000000e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	3.6914056679434384e-03	-1.3444818085887558e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	2.7997952434548223e-02
+30	5.0000000000000000e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.3083836025153664e-03	2.5809785714037942e-02
+30	5.0000000000000000e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-5.4746126618502589e-03	1.2046425668117366e-02
+30	5.0000000000000000e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-3.1049509611165219e-03	-1.5926445507223910e-02
+30	5.0000000000000000e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	3.6914056679434384e-03	-1.3444818085887569e-02
 30	5.0000000000000000e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	3.8445751953897194e-03	8.4998713916352234e-03
-30	5.0000000000000000e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-4.4534821586217962e-04	8.2135492683918458e-03
-30	5.0000000000000000e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	-1.3109213786008530e-03	-1.9717850009085378e-03
-30	5.0000000000000000e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-1.6572354372146385e-04	-1.9071965667995206e-03
-30	5.0000000000000000e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	1.1867472239512577e-04	1.3757199764269736e-04
-30	5.0000000000000000e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.0758862762057883e-05	1.6964416779760580e-04
-30	5.0000000000000000e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-9.3505708037414486e-06	-2.2067613278239821e-05
-30	5.0000000000000000e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.8886307735842763e-06	-1.3592358036960060e-05
-30	5.0000000000000000e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	7.8293430016506858e-07	3.2267126158465491e-05
-30	5.0000000000000000e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-5.5702336115142012e-06	-1.1485905809191786e-06
-30	5.0000000000000000e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
+30	5.0000000000000000e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-4.4534821586217983e-04	8.2135492683918458e-03
+30	5.0000000000000000e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	-1.3109213786008528e-03	-1.9717850009085391e-03
+30	5.0000000000000000e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-1.6572354372146374e-04	-1.9071965667995200e-03
+30	5.0000000000000000e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	1.1867472239512574e-04	1.3757199764269731e-04
+30	5.0000000000000000e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.0758862762057888e-05	1.6964416779760574e-04
+30	5.0000000000000000e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-9.3505708037414452e-06	-2.2067613278239804e-05
+30	5.0000000000000000e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.8886307735842763e-06	-1.3592358036960056e-05
+30	5.0000000000000000e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	7.8293430016506816e-07	3.2267126158465478e-05
+30	5.0000000000000000e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-5.5702336115141978e-06	-1.1485905809191752e-06
+30	5.0000000000000000e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.x.tsv
new file mode 100644
index 00000000..19fa1d6b
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+60	9.9999999999999982e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153053e-04	1.3733079344899009e-04
+60	9.9999999999999982e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153053e-04	1.3733079344899009e-04
+60	9.9999999999999982e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153053e-04	1.3733079344899009e-04
+60	9.9999999999999982e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908921153053e-04	1.3733079344899009e-04
+60	9.9999999999999982e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3515181213576320e-04	-1.1051017399674814e-03
+60	9.9999999999999982e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8400549142799592e-04	1.3483441119690250e-03
+60	9.9999999999999982e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8819903810528655e-03	6.4218461239321277e-03
+60	9.9999999999999982e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.9140699833029894e-03	-9.1325715144148865e-03
+60	9.9999999999999982e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-7.1818023776154954e-03	-7.2039787013368529e-03
+60	9.9999999999999982e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.9706502185698732e-03	2.3359180571349589e-02
+60	9.9999999999999982e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2838092186782980e-03	-1.9304875409750014e-02
+60	9.9999999999999982e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9620290446611685e-03	8.0796194750677435e-03
+60	9.9999999999999982e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2286570306902609e-03	1.8356183655779152e-04
+60	9.9999999999999982e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.6412554844954652e-04	-4.4346273249546223e-03
+60	9.9999999999999982e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7725039904820790e-04	2.1133793581460704e-03
+60	9.9999999999999982e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2756141785093801e-04	-7.1553159186707720e-04
+60	9.9999999999999982e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8214932847735965e-04	1.2027538347100868e-03
+60	9.9999999999999982e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	3.1857411559761841e-04	1.2867754792626465e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.8210047459307438e-04	5.0299732016049407e-04
+60	9.9999999999999982e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7439157307626999e-04	1.0488488988540020e-04
+60	9.9999999999999982e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.1688180340345705e-04	-3.0668765469569689e-04
+60	9.9999999999999982e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0022260962553105e-04	-1.5866915182835911e-03
+60	9.9999999999999982e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.9951692425452718e-04	-4.8924271497215828e-04
+60	9.9999999999999982e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1037379467671081e-05	9.5839178468319240e-05
+60	9.9999999999999982e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3548616969618469e-04	-2.2827116979306557e-03
+60	9.9999999999999982e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0834070538642668e-03	1.2719102877630506e-03
+60	9.9999999999999982e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7306034983198473e-04	2.8338458727384056e-03
+60	9.9999999999999982e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2465121080422797e-03	-1.8325679214243025e-03
+60	9.9999999999999982e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4810147437916100e-03	-1.6494755053597186e-05
+60	9.9999999999999982e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.8399142374685366e-04	2.0989685917670695e-03
+60	9.9999999999999982e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.6157828674130154e-05	9.9298939563728368e-04
+60	9.9999999999999982e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2670220072566901e-03	2.0067808501631041e-03
+60	9.9999999999999982e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192721026e-03	4.3722872692293212e-04
+60	9.9999999999999982e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192721026e-03	4.3722872692293212e-04
+60	9.9999999999999982e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192721026e-03	4.3722872692293212e-04
+60	9.9999999999999982e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.1354244192721026e-03	4.3722872692293212e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.y.tsv
new file mode 100644
index 00000000..63f01c5c
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+60	9.9999999999999982e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-1.7452617252194138e-04	3.3858907879288376e-04
+60	9.9999999999999982e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-1.7452617252194138e-04	3.3858907879288376e-04
+60	9.9999999999999982e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-1.7452617252194138e-04	3.3858907879288376e-04
+60	9.9999999999999982e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-1.7452617252194138e-04	3.3858907879288376e-04
+60	9.9999999999999982e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	6.0306979355677103e-05	-6.3655558222755604e-05
+60	9.9999999999999982e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	-2.8071462620499774e-04	-8.9236670827995748e-04
+60	9.9999999999999982e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-6.2380717478930465e-04	1.3484898283104842e-03
+60	9.9999999999999982e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	1.6545116610038977e-03	5.6982213617515869e-03
+60	9.9999999999999982e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	2.4246511010831842e-03	-1.0409370115179489e-02
+60	9.9999999999999982e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-7.5948521192826905e-03	-3.6002061439432210e-03
+60	9.9999999999999982e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	4.9700237621880788e-03	2.1202015247634990e-02
+60	9.9999999999999982e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.7796169142961574e-04	-2.1081925336311858e-02
+60	9.9999999999999982e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-2.2805709658260780e-03	1.0327154393841690e-02
+60	9.9999999999999982e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	2.5236234569970956e-03	-6.4934512277019371e-04
+60	9.9999999999999982e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-9.3359420011235902e-04	-4.8767438906067500e-03
+60	9.9999999999999982e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-7.3625668569415003e-04	4.5435421277465323e-03
+60	9.9999999999999982e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	9.2748702128406279e-04	-3.4325642202254691e-04
+60	9.9999999999999982e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.7282135808393205e-04	-1.5567440659940476e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-2.5070491498856303e-04	-1.3614039542084451e-03
+60	9.9999999999999982e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.5582710681709538e-04	2.5893741974650968e-04
+60	9.9999999999999982e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-5.4800423540806982e-04	6.1426132446021592e-04
+60	9.9999999999999982e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-1.9856560014241097e-06	1.9023211389411817e-03
+60	9.9999999999999982e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-3.5952825812461122e-04	-1.4055117593857528e-03
+60	9.9999999999999982e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-1.3463576378510112e-03	1.9453511685871268e-03
+60	9.9999999999999982e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.0237794622901234e-04	3.7976117586635471e-03
+60	9.9999999999999982e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	9.5636678897221444e-04	-7.7003211034819166e-04
+60	9.9999999999999982e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0457957268359261e-03	-1.4123512823278742e-03
+60	9.9999999999999982e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-7.8328231029200991e-05	3.6220654577253522e-03
+60	9.9999999999999982e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	3.0586432762325804e-04	-3.6740915594392137e-03
+60	9.9999999999999982e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-6.9668020052135091e-04	-9.2861022244080434e-04
+60	9.9999999999999982e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	7.5346990467708711e-05	-2.8511932725165819e-04
+60	9.9999999999999982e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-1.1430626102247649e-04	-1.4840914460348758e-03
+60	9.9999999999999982e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-3.5054877396908739e-04	-1.5845523329128901e-04
+60	9.9999999999999982e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-3.5054877396908739e-04	-1.5845523329128901e-04
+60	9.9999999999999982e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-3.5054877396908739e-04	-1.5845523329128901e-04
+60	9.9999999999999982e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-3.5054877396908739e-04	-1.5845523329128901e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.z.tsv
new file mode 100644
index 00000000..7d6ea0ad
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000060.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+60	9.9999999999999982e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	3.7256189808085173e-03	-7.7154280060125358e-03
+60	9.9999999999999982e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	3.7256189808085173e-03	-7.7154280060125358e-03
+60	9.9999999999999982e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	3.7256189808085173e-03	-7.7154280060125358e-03
+60	9.9999999999999982e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	3.7256189808085173e-03	-7.7154280060125358e-03
+60	9.9999999999999982e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-6.2607644285070617e-03	-2.4873443224691968e-02
+60	9.9999999999999982e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-4.1917905248025165e-03	2.5416788951784210e-02
+60	9.9999999999999982e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	2.9779970405723558e-03	-1.2932234888801892e-02
+60	9.9999999999999982e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-1.0075313368087067e-03	1.3447319419866259e-03
+60	9.9999999999999982e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.7781737527919356e-03	1.2857727400140163e-03
+60	9.9999999999999982e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-2.3970872705256341e-04	-4.9536437107925886e-03
+60	9.9999999999999982e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-3.7350728972119821e-06	2.9989412294330582e-03
+60	9.9999999999999982e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9606832062151124e-04	-1.4205763179679645e-03
+60	9.9999999999999982e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-9.3239962406790270e-04	4.5815846992888315e-04
+60	9.9999999999999982e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	4.6109464377760673e-05	1.1649224219431181e-03
+60	9.9999999999999982e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-2.2451286522471502e-04	1.5146235697650269e-04
+60	9.9999999999999982e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	1.8340897089079772e-04	1.4663081688241306e-03
+60	9.9999999999999982e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	4.0218218294959427e-05	-9.9092605980903131e-05
+60	9.9999999999999982e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	2.1011789033083893e-04	1.1572371420991729e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.1011789033084121e-04	1.1572371420991677e-03
+60	9.9999999999999982e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	4.0218218294955727e-05	-9.9092605980901938e-05
+60	9.9999999999999982e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	1.8340897089080038e-04	1.4663081688241406e-03
+60	9.9999999999999982e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-2.2451286522471231e-04	1.5146235697649336e-04
+60	9.9999999999999982e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	4.6109464377768425e-05	1.1649224219431025e-03
+60	9.9999999999999982e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-9.3239962406788633e-04	4.5815846992887621e-04
+60	9.9999999999999982e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9606832062151595e-04	-1.4205763179679361e-03
+60	9.9999999999999982e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-3.7350728972140421e-06	2.9989412294330752e-03
+60	9.9999999999999982e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-2.3970872705255763e-04	-4.9536437107926060e-03
+60	9.9999999999999982e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.7781737527919413e-03	1.2857727400140285e-03
+60	9.9999999999999982e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-1.0075313368087093e-03	1.3447319419866328e-03
+60	9.9999999999999982e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	2.9779970405723576e-03	-1.2932234888801910e-02
+60	9.9999999999999982e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-4.1917905248025104e-03	2.5416788951784206e-02
+60	9.9999999999999982e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-6.2607644285070391e-03	-2.4873443224692114e-02
+60	9.9999999999999982e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	3.7256189808084952e-03	-7.7154280060126000e-03
+60	9.9999999999999982e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	3.7256189808084952e-03	-7.7154280060126000e-03
+60	9.9999999999999982e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	3.7256189808084952e-03	-7.7154280060126000e-03
+60	9.9999999999999982e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	3.7256189808084952e-03	-7.7154280060126000e-03
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.x.tsv
new file mode 100644
index 00000000..8b28e934
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+90	1.4999999999999980e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978211e-03
+90	1.4999999999999980e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978211e-03
+90	1.4999999999999980e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978211e-03
+90	1.4999999999999980e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	1.7953227813482446e-04	-1.0409470109978211e-03
+90	1.4999999999999980e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1635336445820143e-03	-7.9905703224006559e-04
+90	1.4999999999999980e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.0458922468916533e-04	-2.4356280960214664e-03
+90	1.4999999999999980e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.9284537102050306e-04	-1.2959626097766971e-03
+90	1.4999999999999980e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0090334742159114e-03	3.1129740401490490e-04
+90	1.4999999999999980e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.5262096109812747e-05	2.9707234614884299e-04
+90	1.4999999999999980e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2739822931241750e-03	1.8738789384586680e-04
+90	1.4999999999999980e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.6574291100381095e-04	-1.9272137881731174e-03
+90	1.4999999999999980e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3426629177313867e-04	-1.5114932718095981e-03
+90	1.4999999999999980e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1397908130374013e-04	9.7101622571277725e-04
+90	1.4999999999999980e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3707970388567972e-04	1.4450028125308910e-03
+90	1.4999999999999980e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0888273108090863e-04	2.0614056468656727e-03
+90	1.4999999999999980e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0062686884716718e-04	2.3520352036398690e-03
+90	1.4999999999999980e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.9990971192384482e-04	1.8083718640725215e-03
+90	1.4999999999999980e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	7.8898706351233905e-04	5.7163633533023205e-04
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.2871458832136120e-03	1.3781091297652166e-03
+90	1.4999999999999980e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7759341646289349e-03	-8.4055165864608638e-04
+90	1.4999999999999980e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0159321308424493e-03	-1.8379861406278507e-03
+90	1.4999999999999980e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.4529136603219263e-04	2.5755361367405449e-04
+90	1.4999999999999980e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.6411678467420513e-03	-7.7244120738223640e-04
+90	1.4999999999999980e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1067305622324333e-03	-2.2579946871202107e-03
+90	1.4999999999999980e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.0710658965401684e-04	-3.1572671015813760e-04
+90	1.4999999999999980e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1516374653693204e-03	1.3677693386089900e-04
+90	1.4999999999999980e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.2574788210922018e-04	1.0360655134332667e-03
+90	1.4999999999999980e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2033938759297529e-03	3.0999493740463701e-03
+90	1.4999999999999980e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2816904846036888e-03	2.8461798786176104e-03
+90	1.4999999999999980e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.8047575067649137e-04	3.1905124793763923e-03
+90	1.4999999999999980e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.5463885314424291e-04	2.5413647317545063e-03
+90	1.4999999999999980e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0665886343549244e-04	1.1392111315681524e-03
+90	1.4999999999999980e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.y.tsv
new file mode 100644
index 00000000..1e0bb217
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+90	1.4999999999999980e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	4.7240433831597173e-03	-8.2527858355065549e-03
+90	1.4999999999999980e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	4.7240433831597173e-03	-8.2527858355065549e-03
+90	1.4999999999999980e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	4.7240433831597173e-03	-8.2527858355065549e-03
+90	1.4999999999999980e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	4.7240433831597173e-03	-8.2527858355065549e-03
+90	1.4999999999999980e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-5.8348438967072494e-04	1.9884002445547961e-03
+90	1.4999999999999980e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	1.1746040022693623e-03	2.6847597204870139e-03
+90	1.4999999999999980e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	1.4028386808980643e-03	-3.0375509849470566e-03
+90	1.4999999999999980e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-1.2989388062896391e-03	1.7596930890430085e-03
+90	1.4999999999999980e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-3.1643057130853420e-04	2.4677879041519828e-03
+90	1.4999999999999980e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	9.0992456330507836e-04	-2.4568373953485012e-03
+90	1.4999999999999980e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	3.4841364612288642e-04	-1.5495580909976523e-03
+90	1.4999999999999980e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.1258254663963688e-04	-1.6725248208579585e-04
+90	1.4999999999999980e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5350994387019609e-04	-4.5225403749932008e-04
+90	1.4999999999999980e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-4.3195006594860905e-04	1.0196187043576689e-03
+90	1.4999999999999980e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-2.3313267987947546e-05	5.8646491764120800e-04
+90	1.4999999999999980e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-1.9157680200544515e-04	-5.7049495661545889e-04
+90	1.4999999999999980e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	-5.2310875156426340e-04	-3.1689968192759202e-04
+90	1.4999999999999980e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.0952203539576590e-04	1.2722367934875772e-03
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	1.6136176460068851e-04	-1.0872737894926676e-03
+90	1.4999999999999980e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.5787655419000116e-04	9.5942557331976706e-04
+90	1.4999999999999980e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	4.4671146582124163e-04	1.0816615646061340e-03
+90	1.4999999999999980e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	2.3231719668173639e-04	-4.5588869659748303e-04
+90	1.4999999999999980e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-1.2739334220061919e-04	9.7564184044515538e-04
+90	1.4999999999999980e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	4.2694573144098002e-04	1.3211130528519575e-03
+90	1.4999999999999980e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	2.6705265798346805e-04	-6.6041383935970717e-06
+90	1.4999999999999980e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0479211557680245e-04	1.0622654079632751e-03
+90	1.4999999999999980e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	2.7327959860457733e-04	4.1449129067382975e-04
+90	1.4999999999999980e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1789983717374918e-05	5.5081547158617231e-04
+90	1.4999999999999980e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	4.2615898899451508e-05	6.8853830410149739e-04
+90	1.4999999999999980e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	2.2784094241121570e-05	3.8777185452712595e-04
+90	1.4999999999999980e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	3.8942090864700110e-06	1.6487085275903755e-04
+90	1.4999999999999980e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	7.6981992571507001e-05	1.8228837054719987e-04
+90	1.4999999999999980e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.z.tsv
new file mode 100644
index 00000000..3e4eb7eb
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000090.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+90	1.4999999999999980e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-8.7392472898677567e-05	-7.2244755777078114e-04
+90	1.4999999999999980e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-8.7392472898677567e-05	-7.2244755777078114e-04
+90	1.4999999999999980e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-8.7392472898677567e-05	-7.2244755777078114e-04
+90	1.4999999999999980e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-8.7392472898677567e-05	-7.2244755777078114e-04
+90	1.4999999999999980e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-3.5190166040544209e-04	-7.8502822303410248e-04
+90	1.4999999999999980e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-8.0632438188989593e-05	-4.7242343667418263e-04
+90	1.4999999999999980e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-3.4400983488675678e-04	-5.1515142741899271e-04
+90	1.4999999999999980e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-8.1493902892018513e-04	-2.5223036523457903e-03
+90	1.4999999999999980e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	-2.1200769642037553e-04	-5.5345943505285340e-04
+90	1.4999999999999980e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-7.8652181612538091e-04	8.1511015414877726e-04
+90	1.4999999999999980e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-7.1194528626192938e-04	-4.0462149423123209e-04
+90	1.4999999999999980e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	2.7325840236242416e-04	4.2196467753189033e-04
+90	1.4999999999999980e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-2.3328366841471348e-04	2.7668441201067324e-03
+90	1.4999999999999980e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	-8.4128995152941196e-04	1.3318448932017361e-03
+90	1.4999999999999980e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-5.3211927089127670e-04	-1.3536148212692906e-05
+90	1.4999999999999980e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-1.0545650243470772e-04	4.1750851037878982e-04
+90	1.4999999999999980e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-3.8711461343875485e-05	5.2485068531573438e-04
+90	1.4999999999999980e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	3.9509249378503098e-04	5.8511386913087595e-04
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	3.9509249378503244e-04	5.8511386913087768e-04
+90	1.4999999999999980e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-3.8711461343874238e-05	5.2485068531573807e-04
+90	1.4999999999999980e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-1.0545650243470764e-04	4.1750851037878657e-04
+90	1.4999999999999980e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-5.3211927089127779e-04	-1.3536148212700577e-05
+90	1.4999999999999980e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	-8.4128995152941478e-04	1.3318448932017322e-03
+90	1.4999999999999980e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-2.3328366841471364e-04	2.7668441201067280e-03
+90	1.4999999999999980e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	2.7325840236242492e-04	4.2196467753188545e-04
+90	1.4999999999999980e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-7.1194528626193090e-04	-4.0462149423123165e-04
+90	1.4999999999999980e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-7.8652181612538221e-04	8.1511015414876707e-04
+90	1.4999999999999980e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	-2.1200769642037336e-04	-5.5345943505284766e-04
+90	1.4999999999999980e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-8.1493902892018437e-04	-2.5223036523457747e-03
+90	1.4999999999999980e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-3.4400983488676014e-04	-5.1515142741898057e-04
+90	1.4999999999999980e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-8.0632438188993550e-05	-4.7242343667418029e-04
+90	1.4999999999999980e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-3.5190166040544420e-04	-7.8502822303410063e-04
+90	1.4999999999999980e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-8.7392472898679599e-05	-7.2244755777077627e-04
+90	1.4999999999999980e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-8.7392472898679599e-05	-7.2244755777077627e-04
+90	1.4999999999999980e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-8.7392472898679599e-05	-7.2244755777077627e-04
+90	1.4999999999999980e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-8.7392472898679599e-05	-7.2244755777077627e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.x.tsv
new file mode 100644
index 00000000..d1b92435
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+120	2.0000000000000004e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6169433783522039e-04	-3.6140532903482779e-04
+120	2.0000000000000004e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5777307788032125e-04	-3.3084375236273444e-04
+120	2.0000000000000004e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8368429065376236e-04	-1.4187792700005256e-03
+120	2.0000000000000004e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.7296273444354207e-04	-1.5645971329622977e-03
+120	2.0000000000000004e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7452475185896637e-04	-6.3497705583598525e-05
+120	2.0000000000000004e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.5709878803284325e-04	1.1012397001594349e-03
+120	2.0000000000000004e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5249200380623116e-04	1.0188251460922766e-03
+120	2.0000000000000004e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.5406377133869773e-04	1.9868639584955314e-03
+120	2.0000000000000004e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0920301597283899e-03	2.4047098465465096e-03
+120	2.0000000000000004e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4843197689880953e-04	-3.5490157474766344e-04
+120	2.0000000000000004e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.1526399608493300e-05	-1.4265453908755455e-03
+120	2.0000000000000004e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.4131601551457465e-04	-3.2975283345917667e-05
+120	2.0000000000000004e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.1788255004949459e-04	-1.3007367631612788e-03
+120	2.0000000000000004e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.1734477505692190e-05	-3.1953365743946248e-03
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.9426676723542567e-04	-1.2764882801002430e-03
+120	2.0000000000000004e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7458346863961862e-04	-6.1365087450749613e-04
+120	2.0000000000000004e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8416233427276979e-04	5.1245652910609368e-05
+120	2.0000000000000004e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8245089234319311e-04	1.1636733721483991e-04
+120	2.0000000000000004e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9080080557889214e-04	2.8653621550917951e-04
+120	2.0000000000000004e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.3690692145663787e-05	-7.5335009956593949e-05
+120	2.0000000000000004e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5149883803639078e-04	-1.1154333279577461e-03
+120	2.0000000000000004e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5433073223385004e-04	-1.8502814233981929e-03
+120	2.0000000000000004e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0543265260501400e-04	-2.6099839910809345e-03
+120	2.0000000000000004e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.0258677227362475e-05	-3.0378789604693208e-03
+120	2.0000000000000004e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.0067938008878841e-05	-3.0506621748818121e-03
+120	2.0000000000000004e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5318464479813638e-04	-2.7809589797541906e-03
+120	2.0000000000000004e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8973090430523267e-04	-1.8967217337607814e-03
+120	2.0000000000000004e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7247438412896891e-04	-1.0166509619451681e-03
+120	2.0000000000000004e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.y.tsv
new file mode 100644
index 00000000..526fe060
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+120	2.0000000000000004e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	2.4320241736832345e-04	-8.1838461196545522e-04
+120	2.0000000000000004e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	2.5267196478927082e-04	-1.2652036596812251e-03
+120	2.0000000000000004e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-1.3287380566343743e-04	-2.3377985010463284e-03
+120	2.0000000000000004e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9848716664614973e-04	-3.0381986191835983e-03
+120	2.0000000000000004e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-1.3129480263500510e-03	-1.3107546716419431e-03
+120	2.0000000000000004e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-1.2064774137996151e-03	1.5346386831359897e-03
+120	2.0000000000000004e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-1.1024379502829330e-04	3.8318519853396010e-03
+120	2.0000000000000004e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	2.7505815154604883e-04	3.6080432773122140e-03
+120	2.0000000000000004e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	5.2717596870479884e-04	1.1838043343739763e-03
+120	2.0000000000000004e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	1.6119745244018958e-03	4.1970325940386753e-04
+120	2.0000000000000004e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	2.0282704449471438e-03	-1.2426828251714019e-05
+120	2.0000000000000004e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	9.6425278995649461e-04	-1.7946410638979924e-03
+120	2.0000000000000004e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.4903265379610428e-04	-3.5510777726745881e-03
+120	2.0000000000000004e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-1.9114283179625432e-04	-4.1187836782112398e-03
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-5.0530253057004201e-04	-1.0625893525147657e-03
+120	2.0000000000000004e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-5.3176321207194788e-04	-1.5174407041809398e-03
+120	2.0000000000000004e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-7.2911186778798725e-04	-1.1527082703394005e-03
+120	2.0000000000000004e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-5.6194443728934740e-04	-9.1538882334192984e-04
+120	2.0000000000000004e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-5.4135460689126182e-04	-1.7203634754345779e-03
+120	2.0000000000000004e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-6.2762875390833146e-04	-1.7825199272129436e-03
+120	2.0000000000000004e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	-6.4811248118126579e-04	-2.3029286747582450e-03
+120	2.0000000000000004e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	-8.8268857290477317e-04	-2.7400085889688853e-03
+120	2.0000000000000004e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0269638957839118e-03	-2.8053315965598014e-03
+120	2.0000000000000004e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1033265589408818e-03	-2.8603109988755327e-03
+120	2.0000000000000004e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.0615311895556846e-03	-2.7462651052107779e-03
+120	2.0000000000000004e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-8.7701861068421004e-04	-2.5425680921371810e-03
+120	2.0000000000000004e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	-5.7905043224457326e-04	-2.2304428367494683e-03
+120	2.0000000000000004e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-4.5188491732982131e-04	-1.4337149991659936e-03
+120	2.0000000000000004e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.z.tsv
new file mode 100644
index 00000000..d935411c
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-error.it000120.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu_err	12:vv_err
+120	2.0000000000000004e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	3.8238729768339907e-04	3.2649230893172585e-04
+120	2.0000000000000004e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	4.1209281433779113e-04	8.4698820827272656e-04
+120	2.0000000000000004e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	6.6531193191193881e-04	9.4854882468228146e-04
+120	2.0000000000000004e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	7.6573673451536383e-04	7.4544074792169462e-04
+120	2.0000000000000004e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	6.3735940002159603e-04	5.0685324548084077e-04
+120	2.0000000000000004e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	6.3660255434657689e-04	-9.5929489965740095e-05
+120	2.0000000000000004e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	6.2564860255123441e-04	-2.5031287690615347e-04
+120	2.0000000000000004e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9403212987158787e-04	-9.8446716634764957e-04
+120	2.0000000000000004e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	2.9338150103911471e-04	-1.2636417682798226e-03
+120	2.0000000000000004e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4989107016435098e-04	-5.3690099709944553e-04
+120	2.0000000000000004e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	6.6496657012390166e-05	-6.4199054768252634e-04
+120	2.0000000000000004e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	3.6350699596514715e-04	-5.4904555270777426e-05
+120	2.0000000000000004e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	2.7073196385526174e-04	1.3072071159521870e-03
+120	2.0000000000000004e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	-2.6957455056406430e-04	-3.8108143978686753e-04
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.6957455056406338e-04	-3.8108143978686477e-04
+120	2.0000000000000004e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	2.7073196385526315e-04	1.3072071159521874e-03
+120	2.0000000000000004e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	3.6350699596514612e-04	-5.4904555270781356e-05
+120	2.0000000000000004e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	6.6496657012388052e-05	-6.4199054768252981e-04
+120	2.0000000000000004e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	1.4989107016435014e-04	-5.3690099709944282e-04
+120	2.0000000000000004e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	2.9338150103911368e-04	-1.2636417682798246e-03
+120	2.0000000000000004e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9403212987158592e-04	-9.8446716634765152e-04
+120	2.0000000000000004e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	6.2564860255123365e-04	-2.5031287690615114e-04
+120	2.0000000000000004e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	6.3660255434657678e-04	-9.5929489965743592e-05
+120	2.0000000000000004e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	6.3735940002159570e-04	5.0685324548083708e-04
+120	2.0000000000000004e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	7.6573673451536405e-04	7.4544074792169364e-04
+120	2.0000000000000004e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	6.6531193191193892e-04	9.4854882468227973e-04
+120	2.0000000000000004e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	4.1209281433779010e-04	8.4698820827272731e-04
+120	2.0000000000000004e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	3.8238729768339777e-04	3.2649230893172602e-04
+120	2.0000000000000004e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	4.2596553591026218e-04	2.2007661031068712e-04
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000000.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.x.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000000.x.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.x.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000000.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.y.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000000.y.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.y.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000000.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.z.tsv
similarity index 100%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000000.z.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000000.z.tsv
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.x.tsv
similarity index 53%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000030.x.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.x.tsv
index a357a7dd..7efddf64 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.x.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.x.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-30	5.0000000000000000e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060783e-08	1.1715425070830426e-07
-30	5.0000000000000000e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2703567582752418e-08	3.9608555326535775e-07
-30	5.0000000000000000e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8683912344732047e-07	3.4739389657126288e-07
-30	5.0000000000000000e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8580533705609808e-08	3.2035707227623289e-08
-30	5.0000000000000000e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0720935510172503e-08	6.5449842264043254e-07
-30	5.0000000000000000e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.4266770070035039e-07	6.7676345397295394e-07
-30	5.0000000000000000e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4439484317380061e-06	-1.2451704346012961e-05
-30	5.0000000000000000e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7798836439199325e-06	4.3835513722985012e-06
-30	5.0000000000000000e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.0857269540047941e-05	1.7737461523793422e-04
-30	5.0000000000000000e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0748481406017608e-04	-1.4326350247332272e-04
-30	5.0000000000000000e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8736984588288819e-04	-1.9404326564482241e-03
-30	5.0000000000000000e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0994491814728920e-03	1.6157048869231364e-03
-30	5.0000000000000000e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0720469816791002e-03	2.0855481829778665e-02
-30	5.0000000000000000e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8641416222692702e-02	2.5816839297982508e-02
-30	5.0000000000000000e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2423286432344161e-02	-2.7564441752054025e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	-7.2002047565451782e-02
-30	5.0000000000000000e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.3622923168990773e-02	-3.6563386835375043e-02
-30	5.0000000000000000e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6313554998561420e-02	1.3359286680214785e-03
-30	5.0000000000000000e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.5043193073097308e-02	1.4162001544793197e-02
-30	5.0000000000000000e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3431176414140650e-02	2.1613293625535806e-02
-30	5.0000000000000000e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3431632853556587e-02	2.1610819818591205e-02
-30	5.0000000000000000e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.5044717589801278e-02	1.4163893987023883e-02
-30	5.0000000000000000e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6307012137823091e-02	1.3678969997529371e-03
-30	5.0000000000000000e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3607388501509365e-02	-3.6611626746942752e-02
-30	5.0000000000000000e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3670360291676877e-03	-7.2364893651556517e-02
-30	5.0000000000000000e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2209892508118195e-02	-2.7296758639258317e-02
-30	5.0000000000000000e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9154090564261525e-02	2.8376804805716395e-02
+30	5.0000000000000000e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.8952024923060776e-08	1.1715425070830422e-07
+30	5.0000000000000000e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.2703567582752432e-08	3.9608555326535770e-07
+30	5.0000000000000000e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8683912344732053e-07	3.4739389657126283e-07
+30	5.0000000000000000e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8580533705609805e-08	3.2035707227623295e-08
+30	5.0000000000000000e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0720935510172517e-08	6.5449842264043244e-07
+30	5.0000000000000000e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.4266770070035050e-07	6.7676345397295394e-07
+30	5.0000000000000000e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4439484317380066e-06	-1.2451704346012963e-05
+30	5.0000000000000000e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7798836439199325e-06	4.3835513722985063e-06
+30	5.0000000000000000e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.0857269540047962e-05	1.7737461523793425e-04
+30	5.0000000000000000e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0748481406017606e-04	-1.4326350247332301e-04
+30	5.0000000000000000e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8736984588288824e-04	-1.9404326564482237e-03
+30	5.0000000000000000e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0994491814728918e-03	1.6157048869231377e-03
+30	5.0000000000000000e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0720469816791010e-03	2.0855481829778658e-02
+30	5.0000000000000000e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.8641416222692699e-02	2.5816839297982504e-02
+30	5.0000000000000000e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	2.2423286432344151e-02	-2.7564441752054022e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	-7.2002047565451782e-02
+30	5.0000000000000000e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-2.3622923168990770e-02	-3.6563386835375085e-02
+30	5.0000000000000000e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6313554998561427e-02	1.3359286680214820e-03
+30	5.0000000000000000e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.5043193073097308e-02	1.4162001544793211e-02
+30	5.0000000000000000e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3431176414140657e-02	2.1613293625535785e-02
+30	5.0000000000000000e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3431632853556594e-02	2.1610819818591216e-02
+30	5.0000000000000000e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.5044717589801271e-02	1.4163893987023838e-02
+30	5.0000000000000000e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6307012137823091e-02	1.3678969997529510e-03
+30	5.0000000000000000e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.3607388501509369e-02	-3.6611626746942738e-02
+30	5.0000000000000000e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3670360291676929e-03	-7.2364893651556544e-02
+30	5.0000000000000000e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.2209892508118195e-02	-2.7296758639258348e-02
+30	5.0000000000000000e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.9154090564261528e-02	2.8376804805716395e-02
 30	5.0000000000000000e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.0175141466539579e-03	2.2336563784345419e-02
-30	5.0000000000000000e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.1503490970931669e-04	-8.7100245655944417e-04
-30	5.0000000000000000e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.1515847875009332e-03	-1.0924697886030635e-03
-30	5.0000000000000000e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161857e-03
-30	5.0000000000000000e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161857e-03
-30	5.0000000000000000e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161857e-03
-30	5.0000000000000000e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161857e-03
+30	5.0000000000000000e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.1503490970931626e-04	-8.7100245655945502e-04
+30	5.0000000000000000e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.1515847875009341e-03	-1.0924697886030678e-03
+30	5.0000000000000000e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161848e-03
+30	5.0000000000000000e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161848e-03
+30	5.0000000000000000e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161848e-03
+30	5.0000000000000000e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	4.2146338836696294e-03	5.6552397899161848e-03
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.y.tsv
similarity index 53%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000030.y.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.y.tsv
index ff023909..96c5ce3c 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.y.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.y.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-30	5.0000000000000000e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-2.5517858169769776e-08	-9.7002038084172506e-09
-30	5.0000000000000000e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.3842045616905259e-08	1.3095552664557879e-07
-30	5.0000000000000000e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	6.6072895228672441e-08	2.8308060450851209e-07
-30	5.0000000000000000e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-2.0781162836984226e-08	-5.2455401014287627e-08
-30	5.0000000000000000e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9809450932767611e-08	1.4896035061044267e-07
-30	5.0000000000000000e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	3.3859499318856983e-07	1.1620022122036073e-06
-30	5.0000000000000000e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	1.9111249487609408e-07	-4.7032873701046959e-06
-30	5.0000000000000000e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-6.1902884601021233e-06	-1.3376103865633080e-05
-30	5.0000000000000000e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	3.3806618206333406e-06	8.6049558996493180e-05
-30	5.0000000000000000e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	9.1729771158504352e-05	1.3214257770721339e-04
-30	5.0000000000000000e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-6.9463839930756737e-05	-1.0958065092905144e-03
-30	5.0000000000000000e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-1.0516989905021649e-03	-1.2809936771078728e-03
-30	5.0000000000000000e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	7.2107560120322788e-04	1.1090777753185848e-02
-30	5.0000000000000000e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.2664164264667517e-02	2.5285422047215681e-02
-30	5.0000000000000000e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	2.2195892026490416e-02	-1.3455879413056905e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	-7.2002047565451782e-02
-30	5.0000000000000000e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-3.3304990477635348e-02	-1.6848636896666928e-02
-30	5.0000000000000000e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.1574577657279041e-02	6.4137837923375254e-02
-30	5.0000000000000000e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-1.2384217049704847e-03	3.1055341731746192e-02
-30	5.0000000000000000e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	1.5007411129050810e-04	1.2139440017471647e-02
-30	5.0000000000000000e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	4.1657772571898006e-03	7.0526247353807827e-03
-30	5.0000000000000000e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	2.3787986989269971e-03	1.7583302955789283e-03
-30	5.0000000000000000e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	3.9494403667156373e-03	6.7754724829264569e-03
-30	5.0000000000000000e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0821808736934157e-04	1.3320307675260419e-02
-30	5.0000000000000000e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-2.0702023070357477e-04	3.2483165695283089e-02
-30	5.0000000000000000e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-2.0798986010349380e-02	6.0055791850823360e-02
-30	5.0000000000000000e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-3.5280919352170710e-02	-2.0359259710988592e-02
-30	5.0000000000000000e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-2.9378408758478844e-03	-6.6285569236840994e-02
-30	5.0000000000000000e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	2.1450622890239426e-02	-1.7925429639415277e-02
-30	5.0000000000000000e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	8.5099801048150632e-03	3.4023266076638900e-02
-30	5.0000000000000000e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-8.0850977636192593e-03	1.5413594444609872e-02
-30	5.0000000000000000e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-8.0850977636192593e-03	1.5413594444609872e-02
-30	5.0000000000000000e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-8.0850977636192593e-03	1.5413594444609872e-02
-30	5.0000000000000000e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-8.0850977636192593e-03	1.5413594444609872e-02
+30	5.0000000000000000e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-2.5517858169769780e-08	-9.7002038084172506e-09
+30	5.0000000000000000e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.3842045616905256e-08	1.3095552664557876e-07
+30	5.0000000000000000e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	6.6072895228672414e-08	2.8308060450851209e-07
+30	5.0000000000000000e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-2.0781162836984223e-08	-5.2455401014287607e-08
+30	5.0000000000000000e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9809450932767598e-08	1.4896035061044259e-07
+30	5.0000000000000000e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	3.3859499318856973e-07	1.1620022122036073e-06
+30	5.0000000000000000e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	1.9111249487609398e-07	-4.7032873701046959e-06
+30	5.0000000000000000e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-6.1902884601021233e-06	-1.3376103865633081e-05
+30	5.0000000000000000e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	3.3806618206333389e-06	8.6049558996493153e-05
+30	5.0000000000000000e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	9.1729771158504338e-05	1.3214257770721347e-04
+30	5.0000000000000000e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-6.9463839930756710e-05	-1.0958065092905142e-03
+30	5.0000000000000000e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-1.0516989905021647e-03	-1.2809936771078726e-03
+30	5.0000000000000000e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	7.2107560120322788e-04	1.1090777753185847e-02
+30	5.0000000000000000e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.2664164264667516e-02	2.5285422047215685e-02
+30	5.0000000000000000e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	2.2195892026490416e-02	-1.3455879413056888e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	-7.2002047565451782e-02
+30	5.0000000000000000e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-3.3304990477635348e-02	-1.6848636896666942e-02
+30	5.0000000000000000e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.1574577657279024e-02	6.4137837923375268e-02
+30	5.0000000000000000e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-1.2384217049704908e-03	3.1055341731746192e-02
+30	5.0000000000000000e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	1.5007411129051244e-04	1.2139440017471657e-02
+30	5.0000000000000000e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	4.1657772571897910e-03	7.0526247353808087e-03
+30	5.0000000000000000e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	2.3787986989269802e-03	1.7583302955788607e-03
+30	5.0000000000000000e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	3.9494403667156563e-03	6.7754724829264361e-03
+30	5.0000000000000000e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0821808736934850e-04	1.3320307675260429e-02
+30	5.0000000000000000e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-2.0702023070356262e-04	3.2483165695283089e-02
+30	5.0000000000000000e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-2.0798986010349376e-02	6.0055791850823326e-02
+30	5.0000000000000000e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-3.5280919352170710e-02	-2.0359259710988578e-02
+30	5.0000000000000000e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-2.9378408758478809e-03	-6.6285569236840980e-02
+30	5.0000000000000000e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	2.1450622890239426e-02	-1.7925429639415281e-02
+30	5.0000000000000000e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	8.5099801048150701e-03	3.4023266076638900e-02
+30	5.0000000000000000e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-8.0850977636192523e-03	1.5413594444609890e-02
+30	5.0000000000000000e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-8.0850977636192523e-03	1.5413594444609890e-02
+30	5.0000000000000000e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-8.0850977636192523e-03	1.5413594444609890e-02
+30	5.0000000000000000e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-8.0850977636192523e-03	1.5413594444609890e-02
diff --git a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.z.tsv
similarity index 56%
rename from NewRadX/test/scalarwave_newradx/newradx-state.it000030.z.tsv
rename to TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.z.tsv
index 2b1b4548..69f69aae 100644
--- a/NewRadX/test/scalarwave_newradx/newradx-state.it000030.z.tsv
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000030.z.tsv
@@ -1,38 +1,38 @@
 # 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
-30	5.0000000000000000e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-3.1269932602201811e-06	-1.0578272757637669e-05
-30	5.0000000000000000e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-5.5702336115142004e-06	-1.1485905809191786e-06
-30	5.0000000000000000e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	7.8293430016506858e-07	3.2267126158465478e-05
-30	5.0000000000000000e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.8886307735823063e-06	-1.3592358036925565e-05
-30	5.0000000000000000e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-9.3505707841484313e-06	-2.2067612979549759e-05
-30	5.0000000000000000e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.0758907434686606e-05	1.6964475003086683e-04
-30	5.0000000000000000e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	1.1869957465215308e-04	1.3784251839790349e-04
-30	5.0000000000000000e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-1.6207961517794708e-04	-1.8750954168107233e-03
-30	5.0000000000000000e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	-1.1561232351670935e-03	-9.1698031339677638e-04
-30	5.0000000000000000e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	1.6908082328559390e-03	1.8680292235013454e-02
-30	5.0000000000000000e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4794555703813987e-02	4.1855437155790307e-02
-30	5.0000000000000000e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	2.7874481580130957e-02	1.4768770478331111e-02
-30	5.0000000000000000e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	2.3475402741902476e-02	-4.3985516736308204e-02
-30	5.0000000000000000e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	1.0407949543919787e-02	-6.7753652424709321e-02
+30	5.0000000000000000e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-3.1269932602201794e-06	-1.0578272757637663e-05
+30	5.0000000000000000e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-5.5702336115141978e-06	-1.1485905809191718e-06
+30	5.0000000000000000e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	7.8293430016506900e-07	3.2267126158465478e-05
+30	5.0000000000000000e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.8886307735823063e-06	-1.3592358036925558e-05
+30	5.0000000000000000e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-9.3505707841484279e-06	-2.2067612979549739e-05
+30	5.0000000000000000e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.0758907434686608e-05	1.6964475003086678e-04
+30	5.0000000000000000e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	1.1869957465215305e-04	1.3784251839790338e-04
+30	5.0000000000000000e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-1.6207961517794703e-04	-1.8750954168107225e-03
+30	5.0000000000000000e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	-1.1561232351670935e-03	-9.1698031339677703e-04
+30	5.0000000000000000e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	1.6908082328559375e-03	1.8680292235013447e-02
+30	5.0000000000000000e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4794555703813984e-02	4.1855437155790307e-02
+30	5.0000000000000000e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	2.7874481580130957e-02	1.4768770478331115e-02
+30	5.0000000000000000e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	2.3475402741902476e-02	-4.3985516736308169e-02
+30	5.0000000000000000e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	1.0407949543919784e-02	-6.7753652424709321e-02
 30	5.0000000000000000e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	2.0605243697193118e-03	-7.2152336670612716e-02
-30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294896e-03	-7.2002047565451782e-02
-30	5.0000000000000000e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.0605243697193187e-03	-7.2152336670612716e-02
-30	5.0000000000000000e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	1.0407949543919784e-02	-6.7753652424709321e-02
-30	5.0000000000000000e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	2.3475402741902476e-02	-4.3985516736308197e-02
-30	5.0000000000000000e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	2.7874481580130957e-02	1.4768770478331118e-02
+30	5.0000000000000000e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2777698604294948e-03	-7.2002047565451782e-02
+30	5.0000000000000000e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.0605243697193101e-03	-7.2152336670612702e-02
+30	5.0000000000000000e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	1.0407949543919784e-02	-6.7753652424709349e-02
+30	5.0000000000000000e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	2.3475402741902476e-02	-4.3985516736308190e-02
+30	5.0000000000000000e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	2.7874481580130957e-02	1.4768770478331108e-02
 30	5.0000000000000000e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	1.4794555703813987e-02	4.1855437155790307e-02
-30	5.0000000000000000e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	1.6908082328559388e-03	1.8680292235013454e-02
-30	5.0000000000000000e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	-1.1561232351670937e-03	-9.1698031339677551e-04
-30	5.0000000000000000e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-1.6207961517794716e-04	-1.8750954168107233e-03
-30	5.0000000000000000e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	1.1869957465215309e-04	1.3784251839790338e-04
-30	5.0000000000000000e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.0758907434686608e-05	1.6964475003086683e-04
-30	5.0000000000000000e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-9.3505707841484313e-06	-2.2067612979549763e-05
-30	5.0000000000000000e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.8886307735823063e-06	-1.3592358036925565e-05
-30	5.0000000000000000e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	7.8293430016506858e-07	3.2267126158465491e-05
-30	5.0000000000000000e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-5.5702336115142012e-06	-1.1485905809191786e-06
-30	5.0000000000000000e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
-30	5.0000000000000000e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-3.1269932602201807e-06	-1.0578272757637671e-05
+30	5.0000000000000000e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	1.6908082328559385e-03	1.8680292235013454e-02
+30	5.0000000000000000e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	-1.1561232351670935e-03	-9.1698031339677703e-04
+30	5.0000000000000000e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-1.6207961517794705e-04	-1.8750954168107227e-03
+30	5.0000000000000000e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	1.1869957465215306e-04	1.3784251839790333e-04
+30	5.0000000000000000e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.0758907434686613e-05	1.6964475003086678e-04
+30	5.0000000000000000e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-9.3505707841484279e-06	-2.2067612979549746e-05
+30	5.0000000000000000e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.8886307735823063e-06	-1.3592358036925562e-05
+30	5.0000000000000000e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	7.8293430016506816e-07	3.2267126158465478e-05
+30	5.0000000000000000e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-5.5702336115141978e-06	-1.1485905809191752e-06
+30	5.0000000000000000e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
+30	5.0000000000000000e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-3.1269932602201799e-06	-1.0578272757637664e-05
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.x.tsv
new file mode 100644
index 00000000..2b90c516
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+60	9.9999999999999982e+00	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891642e-04	1.3733080358437403e-04
+60	9.9999999999999982e+00	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891642e-04	1.3733080358437403e-04
+60	9.9999999999999982e+00	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891642e-04	1.3733080358437403e-04
+60	9.9999999999999982e+00	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.9074908992891642e-04	1.3733080358437403e-04
+60	9.9999999999999982e+00	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.3515443271457539e-04	-1.1050715354731261e-03
+60	9.9999999999999982e+00	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.8223993353887914e-04	1.3640659846006842e-03
+60	9.9999999999999982e+00	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0998298549070368e-03	7.7794622718399065e-03
+60	9.9999999999999982e+00	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.6342072264663705e-03	6.8996944101631461e-03
+60	9.9999999999999982e+00	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.2247660361007774e-03	-1.1817532795840347e-02
+60	9.9999999999999982e+00	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3597528675843756e-03	-2.0709129312977203e-02
+60	9.9999999999999982e+00	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.1745951207671525e-02	2.8907197523553238e-03
+60	9.9999999999999982e+00	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.9765686070614755e-03	1.7489568298805231e-02
+60	9.9999999999999982e+00	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.1628318018438700e-03	6.5980108093308641e-04
+60	9.9999999999999982e+00	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.6469440034201991e-04	-4.4291444250260780e-03
+60	9.9999999999999982e+00	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7725195095463429e-04	2.1133978704292048e-03
+60	9.9999999999999982e+00	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2756141622493797e-04	-7.1553156892505587e-04
+60	9.9999999999999982e+00	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8214932847819323e-04	1.2027538347235637e-03
+60	9.9999999999999982e+00	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	3.1857411559761814e-04	1.2867754792626517e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.8210047459307438e-04	5.0299732016049407e-04
+60	9.9999999999999982e+00	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.7439157307626999e-04	1.0488488988540020e-04
+60	9.9999999999999982e+00	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.1688180340345705e-04	-3.0668765469569689e-04
+60	9.9999999999999982e+00	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0022260962553105e-04	-1.5866915182835911e-03
+60	9.9999999999999982e+00	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.9951692425452718e-04	-4.8924271497215828e-04
+60	9.9999999999999982e+00	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1037379467671081e-05	9.5839178468319240e-05
+60	9.9999999999999982e+00	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.3548616969618469e-04	-2.2827116979306557e-03
+60	9.9999999999999982e+00	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.0834070538642668e-03	1.2719102877630506e-03
+60	9.9999999999999982e+00	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.7306034983198473e-04	2.8338458727384056e-03
+60	9.9999999999999982e+00	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2465121080422795e-03	-1.8325679214242973e-03
+60	9.9999999999999982e+00	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.4810147437924435e-03	-1.6494755040120414e-05
+60	9.9999999999999982e+00	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.8399142212085366e-04	2.0989686147090906e-03
+60	9.9999999999999982e+00	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.6156276767703765e-05	9.9300790792041784e-04
+60	9.9999999999999982e+00	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2675908591491636e-03	2.0122637500916479e-03
+60	9.9999999999999982e+00	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184926e-03	9.1346797129822170e-04
+60	9.9999999999999982e+00	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184926e-03	9.1346797129822170e-04
+60	9.9999999999999982e+00	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184926e-03	9.1346797129822170e-04
+60	9.9999999999999982e+00	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-1.2012496481184926e-03	9.1346797129822170e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.y.tsv
new file mode 100644
index 00000000..459f6d7d
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+60	9.9999999999999982e+00	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-1.7452617252193173e-04	3.3858907879304829e-04
+60	9.9999999999999982e+00	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-1.7452617252193173e-04	3.3858907879304829e-04
+60	9.9999999999999982e+00	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-1.7452617252193173e-04	3.3858907879304829e-04
+60	9.9999999999999982e+00	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-1.7452617252193173e-04	3.3858907879304829e-04
+60	9.9999999999999982e+00	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	6.0306979637439327e-05	-6.3655554167087259e-05
+60	9.9999999999999982e+00	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	-2.8071318918813633e-04	-8.9234984217805284e-04
+60	9.9999999999999982e+00	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-6.2253284400366055e-04	1.3600291547165109e-03
+60	9.9999999999999982e+00	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	1.8475967596913623e-03	6.9174617911039122e-03
+60	9.9999999999999982e+00	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	7.1447883442465367e-03	5.6228958093984842e-03
+60	9.9999999999999982e+00	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	6.7144572500019185e-03	-1.0896796757255873e-02
+60	9.9999999999999982e+00	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-4.3018884042467283e-03	-1.8730915578886755e-02
+60	9.9999999999999982e+00	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	-1.1260330108285387e-02	3.0365857548083032e-03
+60	9.9999999999999982e+00	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5083643577944312e-03	1.6634537853311385e-02
+60	9.9999999999999982e+00	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	2.5001110050568709e-03	-4.6534822999092992e-04
+60	9.9999999999999982e+00	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-9.3369017309777097e-04	-4.8757471256446073e-03
+60	9.9999999999999982e+00	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-7.3625678071851416e-04	4.5435433500828192e-03
+60	9.9999999999999982e+00	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	9.2748702125778249e-04	-3.4325642162136316e-04
+60	9.9999999999999982e+00	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.7282135808393449e-04	-1.5567440659940048e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-2.5070491498856303e-04	-1.3614039542084451e-03
+60	9.9999999999999982e+00	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-4.5582710681709538e-04	2.5893741974650968e-04
+60	9.9999999999999982e+00	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-5.4800423540806982e-04	6.1426132446021592e-04
+60	9.9999999999999982e+00	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-1.9856560014241097e-06	1.9023211389411817e-03
+60	9.9999999999999982e+00	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-3.5952825812461122e-04	-1.4055117593857528e-03
+60	9.9999999999999982e+00	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-1.3463576378510112e-03	1.9453511685871268e-03
+60	9.9999999999999982e+00	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	4.0237794622901234e-04	3.7976117586635471e-03
+60	9.9999999999999982e+00	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	9.5636678897221444e-04	-7.7003211034819166e-04
+60	9.9999999999999982e+00	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0457957268359261e-03	-1.4123512823278742e-03
+60	9.9999999999999982e+00	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-7.8328231029200991e-05	3.6220654577253522e-03
+60	9.9999999999999982e+00	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	3.0586432762325804e-04	-3.6740915594392137e-03
+60	9.9999999999999982e+00	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-6.9668020052135091e-04	-9.2861022244080434e-04
+60	9.9999999999999982e+00	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	7.5346990467706286e-05	-2.8511932725161542e-04
+60	9.9999999999999982e+00	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-1.1430626104875678e-04	-1.4840914456336919e-03
+60	9.9999999999999982e+00	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-3.5054886899345153e-04	-1.5845401095500257e-04
+60	9.9999999999999982e+00	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-3.5054886899345153e-04	-1.5845401095500257e-04
+60	9.9999999999999982e+00	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-3.5054886899345153e-04	-1.5845401095500257e-04
+60	9.9999999999999982e+00	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-3.5054886899345153e-04	-1.5845401095500257e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.z.tsv
new file mode 100644
index 00000000..1ba3c08b
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000060.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+60	9.9999999999999982e+00	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	6.9795023536404436e-03	4.8905910992455715e-03
+60	9.9999999999999982e+00	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	6.9795023536404436e-03	4.8905910992455715e-03
+60	9.9999999999999982e+00	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	6.9795023536404436e-03	4.8905910992455715e-03
+60	9.9999999999999982e+00	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	6.9795023536404436e-03	4.8905910992455715e-03
+60	9.9999999999999982e+00	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	7.6433006325852121e-03	-1.5793167379682893e-02
+60	9.9999999999999982e+00	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-3.9142611368406383e-03	-2.4546207890767308e-02
+60	9.9999999999999982e+00	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-1.2828282969812558e-02	-5.0709828800156714e-03
+60	9.9999999999999982e+00	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-6.0621218228057976e-03	1.9580841631919862e-02
+60	9.9999999999999982e+00	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	1.3915817388446537e-03	3.6310976246275266e-03
+60	9.9999999999999982e+00	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-2.4929853643167155e-04	-4.8740259656855781e-03
+60	9.9999999999999982e+00	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-3.8310458826239105e-06	2.9999379943952010e-03
+60	9.9999999999999982e+00	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9606783399628599e-04	-1.4205703198795245e-03
+60	9.9999999999999982e+00	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-9.3239962569390271e-04	4.5815849287090442e-04
+60	9.9999999999999982e+00	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	4.6109464372885429e-05	1.1649224220197200e-03
+60	9.9999999999999982e+00	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-2.2451286522473375e-04	1.5146235697682282e-04
+60	9.9999999999999982e+00	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	1.8340897089079758e-04	1.4663081688241330e-03
+60	9.9999999999999982e+00	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	4.0218218294959427e-05	-9.9092605980903077e-05
+60	9.9999999999999982e+00	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	2.1011789033083893e-04	1.1572371420991729e-03
+60	9.9999999999999982e+00	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0950126829017074e-04	-2.3226040281617148e-04
+60	9.9999999999999982e+00	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	2.1011789033084121e-04	1.1572371420991677e-03
+60	9.9999999999999982e+00	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	4.0218218294955727e-05	-9.9092605980901884e-05
+60	9.9999999999999982e+00	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	1.8340897089080024e-04	1.4663081688241430e-03
+60	9.9999999999999982e+00	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-2.2451286522473104e-04	1.5146235697681350e-04
+60	9.9999999999999982e+00	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	4.6109464372893181e-05	1.1649224220197044e-03
+60	9.9999999999999982e+00	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-9.3239962569388634e-04	4.5815849287089748e-04
+60	9.9999999999999982e+00	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9606783399629070e-04	-1.4205703198794961e-03
+60	9.9999999999999982e+00	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-3.8310458826259705e-06	2.9999379943952179e-03
+60	9.9999999999999982e+00	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-2.4929853643166570e-04	-4.8740259656855954e-03
+60	9.9999999999999982e+00	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	1.3915817388446593e-03	3.6310976246275387e-03
+60	9.9999999999999982e+00	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-6.0621218228058002e-03	1.9580841631919869e-02
+60	9.9999999999999982e+00	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-1.2828282969812557e-02	-5.0709828800156887e-03
+60	9.9999999999999982e+00	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-3.9142611368406322e-03	-2.4546207890767311e-02
+60	9.9999999999999982e+00	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	7.6433006325852156e-03	-1.5793167379682879e-02
+60	9.9999999999999982e+00	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	6.9795023536404445e-03	4.8905910992455698e-03
+60	9.9999999999999982e+00	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	6.9795023536404445e-03	4.8905910992455698e-03
+60	9.9999999999999982e+00	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	6.9795023536404445e-03	4.8905910992455698e-03
+60	9.9999999999999982e+00	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	6.9795023536404445e-03	4.8905910992455698e-03
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.x.tsv
new file mode 100644
index 00000000..d72a54df
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+90	1.4999999999999980e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508321e-03
+90	1.4999999999999980e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508321e-03
+90	1.4999999999999980e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508321e-03
+90	1.4999999999999980e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-8.4894777031000726e-04	3.9770906603508321e-03
+90	1.4999999999999980e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1435690380080664e-03	-6.4642069357713819e-04
+90	1.4999999999999980e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	5.0451724240300469e-04	-2.4348872783263964e-03
+90	1.4999999999999980e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.9284542307938143e-04	-1.2959619393761088e-03
+90	1.4999999999999980e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0090334742078938e-03	3.1129740413856038e-04
+90	1.4999999999999980e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.5262096109813031e-05	2.9707234614884798e-04
+90	1.4999999999999980e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.2739822931241750e-03	1.8738789384586680e-04
+90	1.4999999999999980e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.6574291100381095e-04	-1.9272137881731174e-03
+90	1.4999999999999980e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.3426629177313867e-04	-1.5114932718095981e-03
+90	1.4999999999999980e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.1397908130374013e-04	9.7101622571277725e-04
+90	1.4999999999999980e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.3707970388567972e-04	1.4450028125308910e-03
+90	1.4999999999999980e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0888273108090863e-04	2.0614056468656727e-03
+90	1.4999999999999980e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0062686884716718e-04	2.3520352036398690e-03
+90	1.4999999999999980e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.9990971192384482e-04	1.8083718640725215e-03
+90	1.4999999999999980e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	7.8898706351233905e-04	5.7163633533023205e-04
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	1.2871458832136120e-03	1.3781091297652166e-03
+90	1.4999999999999980e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7759341646289349e-03	-8.4055165864608638e-04
+90	1.4999999999999980e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0159321308424493e-03	-1.8379861406278507e-03
+90	1.4999999999999980e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.4529136603219263e-04	2.5755361367405449e-04
+90	1.4999999999999980e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.6411678467420513e-03	-7.7244120738223640e-04
+90	1.4999999999999980e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1067305622324333e-03	-2.2579946871202107e-03
+90	1.4999999999999980e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.0710658965401684e-04	-3.1572671015813760e-04
+90	1.4999999999999980e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.1516374653693204e-03	1.3677693386089900e-04
+90	1.4999999999999980e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.2574788210922018e-04	1.0360655134332667e-03
+90	1.4999999999999980e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2033938759297529e-03	3.0999493740463701e-03
+90	1.4999999999999980e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.2816904846036888e-03	2.8461798786176104e-03
+90	1.4999999999999980e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.8047575067649137e-04	3.1905124793763923e-03
+90	1.4999999999999980e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.5463885314424291e-04	2.5413647317545063e-03
+90	1.4999999999999980e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	4.0665886343549244e-04	1.1392111315681524e-03
+90	1.4999999999999980e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
+90	1.4999999999999980e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	5.7031101045651868e-04	7.6583567999287394e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.y.tsv
new file mode 100644
index 00000000..66bda9a9
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+90	1.4999999999999980e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-4.6683826228188950e-03	3.6082016588811590e-03
+90	1.4999999999999980e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-4.6683826228188950e-03	3.6082016588811590e-03
+90	1.4999999999999980e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-4.6683826228188950e-03	3.6082016588811590e-03
+90	1.4999999999999980e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-4.6683826228188950e-03	3.6082016588811590e-03
+90	1.4999999999999980e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	-1.9769234523318397e-03	8.3749959484181180e-03
+90	1.4999999999999980e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	1.1453285716006682e-03	2.9021989223600390e-03
+90	1.4999999999999980e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	1.4027350167983119e-03	-3.0364995611284287e-03
+90	1.4999999999999980e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-1.2989388725979183e-03	1.7596939377955713e-03
+90	1.4999999999999980e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-3.1643057131655188e-04	2.4677879042756382e-03
+90	1.4999999999999980e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	9.0992456330507814e-04	-2.4568373953484978e-03
+90	1.4999999999999980e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	3.4841364612288642e-04	-1.5495580909976523e-03
+90	1.4999999999999980e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	1.1258254663963688e-04	-1.6725248208579585e-04
+90	1.4999999999999980e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	-3.5350994387019609e-04	-4.5225403749932008e-04
+90	1.4999999999999980e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	-4.3195006594860905e-04	1.0196187043576689e-03
+90	1.4999999999999980e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	-2.3313267987947546e-05	5.8646491764120800e-04
+90	1.4999999999999980e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	-1.9157680200544515e-04	-5.7049495661545889e-04
+90	1.4999999999999980e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	-5.2310875156426340e-04	-3.1689968192759202e-04
+90	1.4999999999999980e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-2.0952203539576590e-04	1.2722367934875772e-03
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	1.6136176460068851e-04	-1.0872737894926676e-03
+90	1.4999999999999980e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-2.5787655419000116e-04	9.5942557331976706e-04
+90	1.4999999999999980e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	4.4671146582124163e-04	1.0816615646061340e-03
+90	1.4999999999999980e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	2.3231719668173639e-04	-4.5588869659748303e-04
+90	1.4999999999999980e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-1.2739334220061919e-04	9.7564184044515538e-04
+90	1.4999999999999980e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	4.2694573144098002e-04	1.3211130528519575e-03
+90	1.4999999999999980e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	2.6705265798346805e-04	-6.6041383935970717e-06
+90	1.4999999999999980e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	1.0479211557680245e-04	1.0622654079632751e-03
+90	1.4999999999999980e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	2.7327959860457733e-04	4.1449129067382975e-04
+90	1.4999999999999980e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1789983717374918e-05	5.5081547158617231e-04
+90	1.4999999999999980e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	4.2615898899451508e-05	6.8853830410149739e-04
+90	1.4999999999999980e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	2.2784094241121570e-05	3.8777185452712595e-04
+90	1.4999999999999980e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	3.8942090864700110e-06	1.6487085275903755e-04
+90	1.4999999999999980e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	7.6981992571507001e-05	1.8228837054719987e-04
+90	1.4999999999999980e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
+90	1.4999999999999980e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	6.0184155082566558e-05	2.8350962670533139e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.z.tsv
new file mode 100644
index 00000000..2f1a7745
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000090.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+90	1.4999999999999980e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	-8.7392472934985166e-05	-7.2244755722555582e-04
+90	1.4999999999999980e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	-8.7392472934985166e-05	-7.2244755722555582e-04
+90	1.4999999999999980e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	-8.7392472934985166e-05	-7.2244755722555582e-04
+90	1.4999999999999980e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	-8.7392472934985166e-05	-7.2244755722555582e-04
+90	1.4999999999999980e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	-3.5190166040544469e-04	-7.8502822303405737e-04
+90	1.4999999999999980e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	-8.0632438188989593e-05	-4.7242343667418263e-04
+90	1.4999999999999980e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	-3.4400983488675678e-04	-5.1515142741899271e-04
+90	1.4999999999999980e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	-8.1493902892018513e-04	-2.5223036523457903e-03
+90	1.4999999999999980e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	-2.1200769642037553e-04	-5.5345943505285340e-04
+90	1.4999999999999980e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	-7.8652181612538091e-04	8.1511015414877726e-04
+90	1.4999999999999980e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	-7.1194528626192938e-04	-4.0462149423123209e-04
+90	1.4999999999999980e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	2.7325840236242416e-04	4.2196467753189033e-04
+90	1.4999999999999980e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	-2.3328366841471348e-04	2.7668441201067324e-03
+90	1.4999999999999980e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	-8.4128995152941196e-04	1.3318448932017361e-03
+90	1.4999999999999980e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	-5.3211927089127670e-04	-1.3536148212692906e-05
+90	1.4999999999999980e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	-1.0545650243470772e-04	4.1750851037878982e-04
+90	1.4999999999999980e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	-3.8711461343875485e-05	5.2485068531573438e-04
+90	1.4999999999999980e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	3.9509249378503098e-04	5.8511386913087595e-04
+90	1.4999999999999980e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	6.3565171847945225e-04	6.7785909823431679e-04
+90	1.4999999999999980e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	3.9509249378503244e-04	5.8511386913087768e-04
+90	1.4999999999999980e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	-3.8711461343874238e-05	5.2485068531573807e-04
+90	1.4999999999999980e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	-1.0545650243470764e-04	4.1750851037878657e-04
+90	1.4999999999999980e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	-5.3211927089127779e-04	-1.3536148212700577e-05
+90	1.4999999999999980e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	-8.4128995152941478e-04	1.3318448932017322e-03
+90	1.4999999999999980e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	-2.3328366841471364e-04	2.7668441201067280e-03
+90	1.4999999999999980e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	2.7325840236242492e-04	4.2196467753188545e-04
+90	1.4999999999999980e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	-7.1194528626193090e-04	-4.0462149423123165e-04
+90	1.4999999999999980e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	-7.8652181612538221e-04	8.1511015414876707e-04
+90	1.4999999999999980e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	-2.1200769642037336e-04	-5.5345943505284766e-04
+90	1.4999999999999980e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	-8.1493902892018437e-04	-2.5223036523457747e-03
+90	1.4999999999999980e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	-3.4400983488676014e-04	-5.1515142741898057e-04
+90	1.4999999999999980e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	-8.0632438188993550e-05	-4.7242343667418029e-04
+90	1.4999999999999980e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	-3.5190166040544680e-04	-7.8502822303405553e-04
+90	1.4999999999999980e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	-8.7392472934987199e-05	-7.2244755722555094e-04
+90	1.4999999999999980e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	-8.7392472934987199e-05	-7.2244755722555094e-04
+90	1.4999999999999980e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	-8.7392472934987199e-05	-7.2244755722555094e-04
+90	1.4999999999999980e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	-8.7392472934987199e-05	-7.2244755722555094e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.x.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.x.tsv
new file mode 100644
index 00000000..60a70d92
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.x.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+120	2.0000000000000004e+01	0	0	-3	15	15	-1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	-2	15	15	-1.1333333333333334e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	-1	15	15	-1.0666666666666666e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	0	15	15	-1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-2.6863808560559886e-05	-1.0015482496217923e-03
+120	2.0000000000000004e+01	0	0	1	15	15	-9.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.6169433783522039e-04	-3.6140532903482779e-04
+120	2.0000000000000004e+01	0	0	2	15	15	-8.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5777307788032125e-04	-3.3084375236273444e-04
+120	2.0000000000000004e+01	0	0	3	15	15	-8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-3.8368429065376236e-04	-1.4187792700005256e-03
+120	2.0000000000000004e+01	0	0	4	15	15	-7.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-9.7296273444354207e-04	-1.5645971329622977e-03
+120	2.0000000000000004e+01	0	0	5	15	15	-6.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	-8.7452475185896637e-04	-6.3497705583598525e-05
+120	2.0000000000000004e+01	0	0	6	15	15	-6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.5709878803284325e-04	1.1012397001594349e-03
+120	2.0000000000000004e+01	0	0	7	15	15	-5.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.5249200380623116e-04	1.0188251460922766e-03
+120	2.0000000000000004e+01	0	0	8	15	15	-4.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.5406377133869773e-04	1.9868639584955314e-03
+120	2.0000000000000004e+01	0	0	9	15	15	-4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.0920301597283899e-03	2.4047098465465096e-03
+120	2.0000000000000004e+01	0	0	10	15	15	-3.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	3.4843197689880953e-04	-3.5490157474766344e-04
+120	2.0000000000000004e+01	0	0	11	15	15	-2.6666666666666670e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.1526399608493300e-05	-1.4265453908755455e-03
+120	2.0000000000000004e+01	0	0	12	15	15	-2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.4131601551457465e-04	-3.2975283345917667e-05
+120	2.0000000000000004e+01	0	0	13	15	15	-1.3333333333333339e+00	0.0000000000000000e+00	0.0000000000000000e+00	8.1788255004949459e-04	-1.3007367631612788e-03
+120	2.0000000000000004e+01	0	0	14	15	15	-6.6666666666666785e-01	0.0000000000000000e+00	0.0000000000000000e+00	-4.1734477505692190e-05	-3.1953365743946248e-03
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	16	15	15	6.6666666666666607e-01	0.0000000000000000e+00	0.0000000000000000e+00	-5.9426676723542567e-04	-1.2764882801002430e-03
+120	2.0000000000000004e+01	0	0	17	15	15	1.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-6.7458346863961862e-04	-6.1365087450749613e-04
+120	2.0000000000000004e+01	0	0	18	15	15	2.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-4.8416233427276979e-04	5.1245652910609368e-05
+120	2.0000000000000004e+01	0	0	19	15	15	2.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	-2.8245089234319311e-04	1.1636733721483991e-04
+120	2.0000000000000004e+01	0	0	20	15	15	3.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	-1.9080080557889214e-04	2.8653621550917951e-04
+120	2.0000000000000004e+01	0	0	21	15	15	4.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.3690692145663787e-05	-7.5335009956593949e-05
+120	2.0000000000000004e+01	0	0	22	15	15	4.6666666666666661e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5149883803639078e-04	-1.1154333279577461e-03
+120	2.0000000000000004e+01	0	0	23	15	15	5.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.5433073223385004e-04	-1.8502814233981929e-03
+120	2.0000000000000004e+01	0	0	24	15	15	6.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.0543265260501400e-04	-2.6099839910809345e-03
+120	2.0000000000000004e+01	0	0	25	15	15	6.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	9.0258677227362475e-05	-3.0378789604693208e-03
+120	2.0000000000000004e+01	0	0	26	15	15	7.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	7.0067938008878841e-05	-3.0506621748818121e-03
+120	2.0000000000000004e+01	0	0	27	15	15	8.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.5318464479813638e-04	-2.7809589797541906e-03
+120	2.0000000000000004e+01	0	0	28	15	15	8.6666666666666643e+00	0.0000000000000000e+00	0.0000000000000000e+00	2.8973090430523267e-04	-1.8967217337607814e-03
+120	2.0000000000000004e+01	0	0	29	15	15	9.3333333333333321e+00	0.0000000000000000e+00	0.0000000000000000e+00	1.7247438412896891e-04	-1.0166509619451681e-03
+120	2.0000000000000004e+01	0	0	30	15	15	1.0000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	31	15	15	1.0666666666666664e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	32	15	15	1.1333333333333332e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
+120	2.0000000000000004e+01	0	0	33	15	15	1.2000000000000000e+01	0.0000000000000000e+00	0.0000000000000000e+00	-5.5200318718226873e-06	-7.8512720855023681e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.y.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.y.tsv
new file mode 100644
index 00000000..609475a7
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.y.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+120	2.0000000000000004e+01	0	0	15	-3	15	0.0000000000000000e+00	-1.2000000000000000e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	-2	15	0.0000000000000000e+00	-1.1333333333333334e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	-1	15	0.0000000000000000e+00	-1.0666666666666666e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	0	15	0.0000000000000000e+00	-1.0000000000000000e+01	0.0000000000000000e+00	-7.9799343865638071e-05	-1.2415053991501603e-04
+120	2.0000000000000004e+01	0	0	15	1	15	0.0000000000000000e+00	-9.3333333333333339e+00	0.0000000000000000e+00	2.4320241736832345e-04	-8.1838461196545522e-04
+120	2.0000000000000004e+01	0	0	15	2	15	0.0000000000000000e+00	-8.6666666666666661e+00	0.0000000000000000e+00	2.5267196478927082e-04	-1.2652036596812251e-03
+120	2.0000000000000004e+01	0	0	15	3	15	0.0000000000000000e+00	-8.0000000000000000e+00	0.0000000000000000e+00	-1.3287380566343743e-04	-2.3377985010463284e-03
+120	2.0000000000000004e+01	0	0	15	4	15	0.0000000000000000e+00	-7.3333333333333339e+00	0.0000000000000000e+00	-3.9848716664614973e-04	-3.0381986191835983e-03
+120	2.0000000000000004e+01	0	0	15	5	15	0.0000000000000000e+00	-6.6666666666666670e+00	0.0000000000000000e+00	-1.3129480263500510e-03	-1.3107546716419431e-03
+120	2.0000000000000004e+01	0	0	15	6	15	0.0000000000000000e+00	-6.0000000000000000e+00	0.0000000000000000e+00	-1.2064774137996151e-03	1.5346386831359897e-03
+120	2.0000000000000004e+01	0	0	15	7	15	0.0000000000000000e+00	-5.3333333333333339e+00	0.0000000000000000e+00	-1.1024379502829330e-04	3.8318519853396010e-03
+120	2.0000000000000004e+01	0	0	15	8	15	0.0000000000000000e+00	-4.6666666666666670e+00	0.0000000000000000e+00	2.7505815154604883e-04	3.6080432773122140e-03
+120	2.0000000000000004e+01	0	0	15	9	15	0.0000000000000000e+00	-4.0000000000000000e+00	0.0000000000000000e+00	5.2717596870479884e-04	1.1838043343739763e-03
+120	2.0000000000000004e+01	0	0	15	10	15	0.0000000000000000e+00	-3.3333333333333339e+00	0.0000000000000000e+00	1.6119745244018958e-03	4.1970325940386753e-04
+120	2.0000000000000004e+01	0	0	15	11	15	0.0000000000000000e+00	-2.6666666666666670e+00	0.0000000000000000e+00	2.0282704449471438e-03	-1.2426828251714019e-05
+120	2.0000000000000004e+01	0	0	15	12	15	0.0000000000000000e+00	-2.0000000000000000e+00	0.0000000000000000e+00	9.6425278995649461e-04	-1.7946410638979924e-03
+120	2.0000000000000004e+01	0	0	15	13	15	0.0000000000000000e+00	-1.3333333333333339e+00	0.0000000000000000e+00	1.4903265379610428e-04	-3.5510777726745881e-03
+120	2.0000000000000004e+01	0	0	15	14	15	0.0000000000000000e+00	-6.6666666666666785e-01	0.0000000000000000e+00	-1.9114283179625432e-04	-4.1187836782112398e-03
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	15	16	15	0.0000000000000000e+00	6.6666666666666607e-01	0.0000000000000000e+00	-5.0530253057004201e-04	-1.0625893525147657e-03
+120	2.0000000000000004e+01	0	0	15	17	15	0.0000000000000000e+00	1.3333333333333321e+00	0.0000000000000000e+00	-5.3176321207194788e-04	-1.5174407041809398e-03
+120	2.0000000000000004e+01	0	0	15	18	15	0.0000000000000000e+00	2.0000000000000000e+00	0.0000000000000000e+00	-7.2911186778798725e-04	-1.1527082703394005e-03
+120	2.0000000000000004e+01	0	0	15	19	15	0.0000000000000000e+00	2.6666666666666661e+00	0.0000000000000000e+00	-5.6194443728934740e-04	-9.1538882334192984e-04
+120	2.0000000000000004e+01	0	0	15	20	15	0.0000000000000000e+00	3.3333333333333321e+00	0.0000000000000000e+00	-5.4135460689126182e-04	-1.7203634754345779e-03
+120	2.0000000000000004e+01	0	0	15	21	15	0.0000000000000000e+00	4.0000000000000000e+00	0.0000000000000000e+00	-6.2762875390833146e-04	-1.7825199272129436e-03
+120	2.0000000000000004e+01	0	0	15	22	15	0.0000000000000000e+00	4.6666666666666661e+00	0.0000000000000000e+00	-6.4811248118126579e-04	-2.3029286747582450e-03
+120	2.0000000000000004e+01	0	0	15	23	15	0.0000000000000000e+00	5.3333333333333321e+00	0.0000000000000000e+00	-8.8268857290477317e-04	-2.7400085889688853e-03
+120	2.0000000000000004e+01	0	0	15	24	15	0.0000000000000000e+00	6.0000000000000000e+00	0.0000000000000000e+00	-1.0269638957839118e-03	-2.8053315965598014e-03
+120	2.0000000000000004e+01	0	0	15	25	15	0.0000000000000000e+00	6.6666666666666643e+00	0.0000000000000000e+00	-1.1033265589408818e-03	-2.8603109988755327e-03
+120	2.0000000000000004e+01	0	0	15	26	15	0.0000000000000000e+00	7.3333333333333321e+00	0.0000000000000000e+00	-1.0615311895556846e-03	-2.7462651052107779e-03
+120	2.0000000000000004e+01	0	0	15	27	15	0.0000000000000000e+00	8.0000000000000000e+00	0.0000000000000000e+00	-8.7701861068421004e-04	-2.5425680921371810e-03
+120	2.0000000000000004e+01	0	0	15	28	15	0.0000000000000000e+00	8.6666666666666643e+00	0.0000000000000000e+00	-5.7905043224457326e-04	-2.2304428367494683e-03
+120	2.0000000000000004e+01	0	0	15	29	15	0.0000000000000000e+00	9.3333333333333321e+00	0.0000000000000000e+00	-4.5188491732982131e-04	-1.4337149991659936e-03
+120	2.0000000000000004e+01	0	0	15	30	15	0.0000000000000000e+00	1.0000000000000000e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	31	15	0.0000000000000000e+00	1.0666666666666664e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	32	15	0.0000000000000000e+00	1.1333333333333332e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
+120	2.0000000000000004e+01	0	0	15	33	15	0.0000000000000000e+00	1.2000000000000000e+01	0.0000000000000000e+00	-4.8032339747404484e-04	-7.7132540272952476e-04
diff --git a/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.z.tsv b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.z.tsv
new file mode 100644
index 00000000..0657d560
--- /dev/null
+++ b/TestNewRadX/test/scalarwave_newradx/testnewradx-state.it000120.z.tsv
@@ -0,0 +1,38 @@
+# 1:iteration	2:time	3:patch	4:level	5:i	6:j	7:k	8:x	9:y	10:z	11:uu	12:vv
+120	2.0000000000000004e+01	0	0	15	15	-3	0.0000000000000000e+00	0.0000000000000000e+00	-1.2000000000000000e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	-2	0.0000000000000000e+00	0.0000000000000000e+00	-1.1333333333333334e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	-1	0.0000000000000000e+00	0.0000000000000000e+00	-1.0666666666666666e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	0	0.0000000000000000e+00	0.0000000000000000e+00	-1.0000000000000000e+01	4.2596553591026359e-04	2.2007661031068858e-04
+120	2.0000000000000004e+01	0	0	15	15	1	0.0000000000000000e+00	0.0000000000000000e+00	-9.3333333333333339e+00	3.8238729768339907e-04	3.2649230893172585e-04
+120	2.0000000000000004e+01	0	0	15	15	2	0.0000000000000000e+00	0.0000000000000000e+00	-8.6666666666666661e+00	4.1209281433779113e-04	8.4698820827272656e-04
+120	2.0000000000000004e+01	0	0	15	15	3	0.0000000000000000e+00	0.0000000000000000e+00	-8.0000000000000000e+00	6.6531193191193881e-04	9.4854882468228146e-04
+120	2.0000000000000004e+01	0	0	15	15	4	0.0000000000000000e+00	0.0000000000000000e+00	-7.3333333333333339e+00	7.6573673451536383e-04	7.4544074792169462e-04
+120	2.0000000000000004e+01	0	0	15	15	5	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666670e+00	6.3735940002159603e-04	5.0685324548084077e-04
+120	2.0000000000000004e+01	0	0	15	15	6	0.0000000000000000e+00	0.0000000000000000e+00	-6.0000000000000000e+00	6.3660255434657689e-04	-9.5929489965740095e-05
+120	2.0000000000000004e+01	0	0	15	15	7	0.0000000000000000e+00	0.0000000000000000e+00	-5.3333333333333339e+00	6.2564860255123441e-04	-2.5031287690615347e-04
+120	2.0000000000000004e+01	0	0	15	15	8	0.0000000000000000e+00	0.0000000000000000e+00	-4.6666666666666670e+00	3.9403212987158787e-04	-9.8446716634764957e-04
+120	2.0000000000000004e+01	0	0	15	15	9	0.0000000000000000e+00	0.0000000000000000e+00	-4.0000000000000000e+00	2.9338150103911471e-04	-1.2636417682798226e-03
+120	2.0000000000000004e+01	0	0	15	15	10	0.0000000000000000e+00	0.0000000000000000e+00	-3.3333333333333339e+00	1.4989107016435098e-04	-5.3690099709944553e-04
+120	2.0000000000000004e+01	0	0	15	15	11	0.0000000000000000e+00	0.0000000000000000e+00	-2.6666666666666670e+00	6.6496657012390166e-05	-6.4199054768252634e-04
+120	2.0000000000000004e+01	0	0	15	15	12	0.0000000000000000e+00	0.0000000000000000e+00	-2.0000000000000000e+00	3.6350699596514715e-04	-5.4904555270777426e-05
+120	2.0000000000000004e+01	0	0	15	15	13	0.0000000000000000e+00	0.0000000000000000e+00	-1.3333333333333339e+00	2.7073196385526174e-04	1.3072071159521870e-03
+120	2.0000000000000004e+01	0	0	15	15	14	0.0000000000000000e+00	0.0000000000000000e+00	-6.6666666666666785e-01	-2.6957455056406430e-04	-3.8108143978686753e-04
+120	2.0000000000000004e+01	0	0	15	15	15	0.0000000000000000e+00	0.0000000000000000e+00	0.0000000000000000e+00	-5.5138718543631634e-04	-2.3833099690205991e-03
+120	2.0000000000000004e+01	0	0	15	15	16	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666607e-01	-2.6957455056406338e-04	-3.8108143978686477e-04
+120	2.0000000000000004e+01	0	0	15	15	17	0.0000000000000000e+00	0.0000000000000000e+00	1.3333333333333321e+00	2.7073196385526315e-04	1.3072071159521874e-03
+120	2.0000000000000004e+01	0	0	15	15	18	0.0000000000000000e+00	0.0000000000000000e+00	2.0000000000000000e+00	3.6350699596514612e-04	-5.4904555270781356e-05
+120	2.0000000000000004e+01	0	0	15	15	19	0.0000000000000000e+00	0.0000000000000000e+00	2.6666666666666661e+00	6.6496657012388052e-05	-6.4199054768252981e-04
+120	2.0000000000000004e+01	0	0	15	15	20	0.0000000000000000e+00	0.0000000000000000e+00	3.3333333333333321e+00	1.4989107016435014e-04	-5.3690099709944282e-04
+120	2.0000000000000004e+01	0	0	15	15	21	0.0000000000000000e+00	0.0000000000000000e+00	4.0000000000000000e+00	2.9338150103911368e-04	-1.2636417682798246e-03
+120	2.0000000000000004e+01	0	0	15	15	22	0.0000000000000000e+00	0.0000000000000000e+00	4.6666666666666661e+00	3.9403212987158592e-04	-9.8446716634765152e-04
+120	2.0000000000000004e+01	0	0	15	15	23	0.0000000000000000e+00	0.0000000000000000e+00	5.3333333333333321e+00	6.2564860255123365e-04	-2.5031287690615114e-04
+120	2.0000000000000004e+01	0	0	15	15	24	0.0000000000000000e+00	0.0000000000000000e+00	6.0000000000000000e+00	6.3660255434657678e-04	-9.5929489965743592e-05
+120	2.0000000000000004e+01	0	0	15	15	25	0.0000000000000000e+00	0.0000000000000000e+00	6.6666666666666643e+00	6.3735940002159570e-04	5.0685324548083708e-04
+120	2.0000000000000004e+01	0	0	15	15	26	0.0000000000000000e+00	0.0000000000000000e+00	7.3333333333333321e+00	7.6573673451536405e-04	7.4544074792169364e-04
+120	2.0000000000000004e+01	0	0	15	15	27	0.0000000000000000e+00	0.0000000000000000e+00	8.0000000000000000e+00	6.6531193191193892e-04	9.4854882468227973e-04
+120	2.0000000000000004e+01	0	0	15	15	28	0.0000000000000000e+00	0.0000000000000000e+00	8.6666666666666643e+00	4.1209281433779010e-04	8.4698820827272731e-04
+120	2.0000000000000004e+01	0	0	15	15	29	0.0000000000000000e+00	0.0000000000000000e+00	9.3333333333333321e+00	3.8238729768339777e-04	3.2649230893172602e-04
+120	2.0000000000000004e+01	0	0	15	15	30	0.0000000000000000e+00	0.0000000000000000e+00	1.0000000000000000e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	31	0.0000000000000000e+00	0.0000000000000000e+00	1.0666666666666664e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	32	0.0000000000000000e+00	0.0000000000000000e+00	1.1333333333333332e+01	4.2596553591026218e-04	2.2007661031068712e-04
+120	2.0000000000000004e+01	0	0	15	15	33	0.0000000000000000e+00	0.0000000000000000e+00	1.2000000000000000e+01	4.2596553591026218e-04	2.2007661031068712e-04
diff --git a/scripts/spacetimex.th b/scripts/spacetimex.th
index 6dcde47d..a96f80d1 100644
--- a/scripts/spacetimex.th
+++ b/scripts/spacetimex.th
@@ -169,6 +169,7 @@ SpacetimeX/AHFinderX
 SpacetimeX/BrillLindquist
 SpacetimeX/Cowling
 SpacetimeX/NewRadX
+SpacetimeX/TestNewRadX
 SpacetimeX/Punctures
 SpacetimeX/PunctureTracker
 SpacetimeX/SphericalHarmonics