diff --git a/test/test_files/ow_linear/ow_linear.inp b/test/test_files/ow_linear/ow_linear.inp
index 28d1e782c8..5b8461f781 100644
--- a/test/test_files/ow_linear/ow_linear.inp
+++ b/test/test_files/ow_linear/ow_linear.inp
@@ -20,9 +20,6 @@ time.checkpoint_interval      =  -1       # Steps between checkpoint files
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
 #.......................................#
-incflo.use_godunov = 1
-incflo.diffusion_type = 2
-incflo.godunov_type="weno_z"
 transport.model = TwoPhaseTransport
 transport.viscosity_fluid1=0.0
 transport.viscosity_fluid2=0.0
@@ -39,8 +36,6 @@ OceanWaves.Wave1.relax_zone_gen_length=4.0
 OceanWaves.Wave1.numerical_beach_length=8.0
 MultiPhase.density_fluid1=1000.
 MultiPhase.density_fluid2=1.
-MultiPhase.interface_smoothing=0
-MultiPhase.interface_smoothing_frequency=1
 ICNS.source_terms = GravityForcing
 ICNS.use_perturb_pressure = true
 ICNS.reconstruct_true_pressure = true
@@ -57,15 +52,10 @@ geometry.prob_lo        =     0.0   0.  -1   # Lo corner coordinates
 geometry.prob_hi        =     30.   1.   1  # Hi corner coordinates
 geometry.is_periodic    =     0     1     0   # Periodicity x y z (0/1)
 
-xlo.type =     "pressure_inflow"
+xlo.type =     "wave_generation"
 xhi.type =     "pressure_outflow"
-xlo.vof_type = "zero_gradient"
-xhi.vof_type = "zero_gradient"
 
 zlo.type =     "slip_wall"
-zhi.type =     "pressure_outflow"
-zlo.vof_type = "zero_gradient"
-zhi.vof_type = "zero_gradient"
-
-incflo.verbose=1
+zhi.type =     "slip_wall"
 
+incflo.verbose=1
\ No newline at end of file
diff --git a/test/test_files/ow_stokes/ow_stokes.inp b/test/test_files/ow_stokes/ow_stokes.inp
index 9193f4b610..e411d9346c 100644
--- a/test/test_files/ow_stokes/ow_stokes.inp
+++ b/test/test_files/ow_stokes/ow_stokes.inp
@@ -20,9 +20,6 @@ time.checkpoint_interval      =  -1       # Steps between checkpoint files
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
 #.......................................#
-incflo.use_godunov = 1
-incflo.diffusion_type = 2
-incflo.godunov_type="weno_z"
 transport.model = TwoPhaseTransport
 transport.viscosity_fluid1=0.0
 transport.viscosity_fluid2=0.0
@@ -41,8 +38,6 @@ OceanWaves.Wave1.numerical_beach_length=2.0
 OceanWaves.Wave1.numerical_beach_length_factor=2.0
 MultiPhase.density_fluid1=1000.
 MultiPhase.density_fluid2=1.
-MultiPhase.interface_smoothing=0
-MultiPhase.interface_smoothing_frequency=1
 ICNS.source_terms = GravityForcing
 ICNS.use_perturb_pressure = true
 MultiPhase.verbose=1
@@ -58,15 +53,10 @@ geometry.prob_lo        =     0.0   0.  -1   # Lo corner coordinates
 geometry.prob_hi        =     24.   1.   1  # Hi corner coordinates
 geometry.is_periodic    =     0     1     0   # Periodicity x y z (0/1)
 
-xlo.type =     "pressure_inflow"
+xlo.type =     "wave_generation"
 xhi.type =     "pressure_outflow"
-xlo.vof_type = "zero_gradient"
-xhi.vof_type = "zero_gradient"
 
 zlo.type =     "slip_wall"
-zhi.type =     "pressure_outflow"
-zlo.vof_type = "zero_gradient"
-zhi.vof_type = "zero_gradient"
-
-incflo.verbose=1
+zhi.type =     "slip_wall"
 
+incflo.verbose=1
\ No newline at end of file
diff --git a/test/test_files/ow_w2a/ow_w2a.inp b/test/test_files/ow_w2a/ow_w2a.inp
index 001a335c70..60dad0c36e 100644
--- a/test/test_files/ow_w2a/ow_w2a.inp
+++ b/test/test_files/ow_w2a/ow_w2a.inp
@@ -14,7 +14,7 @@ time.cfl              =   0.95         # CFL factor
 #.......................................#
 time.plot_interval            =  10       # Steps between plot files
 time.checkpoint_interval      =  -1       # Steps between checkpoint files
-io.outputs = density velocity p vof ow_levelset ow_velocity w2a_levelset w2a_velocity
+io.outputs = density velocity p vof ow_levelset ow_velocity
 
 OceanWaves.label = W2A1
 OceanWaves.W2A1.type = W2AWaves
@@ -29,8 +29,6 @@ OceanWaves.W2A1.number_interp_above_surface = 5
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
 #               PHYSICS                 #
 #.......................................#
-incflo.use_godunov = 1
-incflo.godunov_type = weno_z
 incflo.mflux_type = minmod
 transport.model = TwoPhaseTransport
 transport.viscosity_fluid1=1.0e-3