diff --git a/Examples/Tests/averaged_galilean/inputs_avg_3d b/Examples/Tests/averaged_galilean/inputs_avg_3d
index 1fef0ea0a47..2b324e2475f 100644
--- a/Examples/Tests/averaged_galilean/inputs_avg_3d
+++ b/Examples/Tests/averaged_galilean/inputs_avg_3d
@@ -1,7 +1,7 @@
 #################################
 ####### GENERAL PARAMETERS ######
 #################################
-max_step = 400
+max_step = 160
 
 amr.n_cell = 32 32 32
 amr.max_grid_size = 32
@@ -11,8 +11,8 @@ psatd.v_galilean = 0. 0. 0.99498743710662
 psatd.do_time_averaging  = 1
 
 geometry.coord_sys   = 0
-geometry.prob_lo     = -9.67 -9.67 -19.34
-geometry.prob_hi     = 9.67 9.67 19.34
+geometry.prob_lo     = -5. -5. -15.
+geometry.prob_hi     = 5. 5. 15.
 
 #################################
 ###### Boundary Condition #######
@@ -29,7 +29,7 @@ algo.maxwell_solver = psatd
 algo.current_deposition = direct
 algo.particle_pusher = vay
 
-warpx.cfl = 2.
+warpx.cfl = 3.
 
 # Order of particle shape factors
 algo.particle_shape = 3
@@ -54,12 +54,12 @@ electrons.profile = constant
 electrons.density = 282197938148984.7
 electrons.momentum_distribution_type = "gaussian"
 electrons.uz_m = 9.9498743710661994
-electrons.xmin = -9.67
-electrons.xmax = 9.67
-electrons.ymin = -9.67
-electrons.ymax = 9.67
-electrons.zmin =    -19.34
-electrons.zmax =   19.34
+electrons.xmin = -5.
+electrons.xmax = 5.
+electrons.ymin = -5.
+electrons.ymax = 5.
+electrons.zmin = -15.
+electrons.zmax = 15.
 electrons.ux_th = 0.0001
 electrons.uy_th = 0.0001
 electrons.uz_th = 0.0001
@@ -72,17 +72,17 @@ ions.profile = constant
 ions.density =  282197938148984.7
 ions.momentum_distribution_type = "gaussian"
 ions.uz_m = 9.9498743710661994
-ions.xmin = -9.67
-ions.xmax = 9.67
-ions.ymin = -9.67
-ions.ymax = 9.67
-ions.zmin =  -19.34
-ions.zmax = 19.34
+ions.xmin = -5.
+ions.xmax = 5.
+ions.ymin = -5.
+ions.ymax = 5.
+ions.zmin = -15.
+ions.zmax = 15.
 ions.ux_th = 0.0001
 ions.uy_th = 0.0001
 ions.uz_th = 0.0001
 
 # Diagnostics
 diagnostics.diags_names = diag1
-diag1.intervals = 400
+diag1.intervals = 160
 diag1.diag_type = Full
diff --git a/Examples/Tests/comoving/inputs_2d_hybrid b/Examples/Tests/comoving/inputs_2d_hybrid
index fcdba04f5a8..cc55c578e7b 100644
--- a/Examples/Tests/comoving/inputs_2d_hybrid
+++ b/Examples/Tests/comoving/inputs_2d_hybrid
@@ -1,12 +1,12 @@
-max_step = 500
+max_step = 400
 
 amr.max_level = 0
-amr.n_cell = 96 704
+amr.n_cell = 48 704
 warpx.numprocs = 1 2
 
 geometry.coord_sys = 0
-geometry.prob_lo = -90.e-6 -70.e-6
-geometry.prob_hi =  90.e-6   0.e-6
+geometry.prob_lo = -70.e-6 -50.e-6
+geometry.prob_hi =  70.e-6   0.e-6
 
 #################################
 ###### Boundary Condition #######
@@ -56,8 +56,8 @@ electrons.momentum_distribution_type = "gaussian"
 electrons.ux_th = 0.0001
 electrons.uy_th = 0.0001
 electrons.uz_th = 0.0001
-electrons.xmin = -85.e-6
-electrons.xmax =  85.e-6
+electrons.xmin = -45.e-6
+electrons.xmax =  45.e-6
 electrons.zmin = 0.
 electrons.zmax = 15000.e-6
 electrons.profile = "predefined"
@@ -70,8 +70,8 @@ ions.mass = m_p
 ions.injection_style = NUniformPerCell
 ions.num_particles_per_cell_each_dim = 2 2
 ions.momentum_distribution_type = "at_rest"
-ions.xmin = -85.e-6
-ions.xmax =  85.e-6
+ions.xmin = -45.e-6
+ions.xmax =  45.e-6
 ions.zmin = 0.
 ions.zmax = 15000.e-6
 ions.profile = "predefined"
@@ -113,6 +113,6 @@ laser1.profile_focal_distance = 0.5e-3
 laser1.wavelength = 0.81e-6
 
 diagnostics.diags_names = diag1
-diag1.intervals = 500
+diag1.intervals = 400
 diag1.diag_type = Full
 diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho
diff --git a/Examples/Tests/galilean/analysis_3d.py b/Examples/Tests/galilean/analysis_3d.py
index 6e7a014b037..a6b2d89179c 100755
--- a/Examples/Tests/galilean/analysis_3d.py
+++ b/Examples/Tests/galilean/analysis_3d.py
@@ -7,7 +7,7 @@
      standard PSATD (v_galilean = (0.,0.,0.)):
          * if 'v_galilean == 0': simulation is unstable because of the arosen NCI;
          * if 'v_galilean != 0 : NCI is suppressed => simulation is stable.
-  2) Averaged Galilean PSATD with large timestep dz/dx = 2. and c*dt = dz:
+  2) Averaged Galilean PSATD with large timestep dz/dx = 3. and c*dt = dz:
      reference energy was calculated with Galilean PSATD (v_galilean = (0.,0.,0.99498743710662):
          * if standard Galilean PSATD is used (psatd.do_time_averaging == 0'):
            simulation is unstable because of the arosen NCI.
@@ -37,7 +37,7 @@
 
 if (averaged):
     # energyE_ref was calculated with Galilean PSATD method (v_galilean = (0,0,0.99498743710662))
-    energyE_ref = 460315.9845556079
+    energyE_ref = 6.816182771544472
     tolerance_rel = 1e-4
 elif (current_correction):
     # energyE_ref was calculated with standard PSATD method (v_galilean = (0.,0.,0.)):
diff --git a/Examples/Tests/galilean/inputs_2d_hybrid b/Examples/Tests/galilean/inputs_2d_hybrid
index 7df3c1dace6..21767a609bf 100644
--- a/Examples/Tests/galilean/inputs_2d_hybrid
+++ b/Examples/Tests/galilean/inputs_2d_hybrid
@@ -1,12 +1,12 @@
-max_step = 500
+max_step = 400
 
 amr.max_level = 0
-amr.n_cell = 96 704
+amr.n_cell = 48 704
 warpx.numprocs = 1 2
 
 geometry.coord_sys = 0
-geometry.prob_lo = -90.e-6 -70.e-6
-geometry.prob_hi =  90.e-6   0.e-6
+geometry.prob_lo = -70.e-6 -50.e-6
+geometry.prob_hi =  70.e-6   0.e-6
 
 # Boundary condition
 boundary.field_lo = periodic damped
@@ -54,8 +54,8 @@ electrons.momentum_distribution_type = "gaussian"
 electrons.ux_th = 0.0001
 electrons.uy_th = 0.0001
 electrons.uz_th = 0.0001
-electrons.xmin = -85.e-6
-electrons.xmax =  85.e-6
+electrons.xmin = -45.e-6
+electrons.xmax =  45.e-6
 electrons.zmin = 0.
 electrons.zmax = 15000.e-6
 electrons.profile = "predefined"
@@ -68,8 +68,8 @@ ions.mass = m_p
 ions.injection_style = NUniformPerCell
 ions.num_particles_per_cell_each_dim = 2 2
 ions.momentum_distribution_type = "at_rest"
-ions.xmin = -85.e-6
-ions.xmax =  85.e-6
+ions.xmin = -45.e-6
+ions.xmax =  45.e-6
 ions.zmin = 0.
 ions.zmax = 15000.e-6
 ions.profile = "predefined"
@@ -111,6 +111,6 @@ laser1.profile_focal_distance = 0.5e-3
 laser1.wavelength = 0.81e-6
 
 diagnostics.diags_names = diag1
-diag1.intervals = 500
+diag1.intervals = 400
 diag1.diag_type = Full
 diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho
diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json b/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json
index a93cd9e02f1..64214adb5f3 100644
--- a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json
+++ b/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json
@@ -2,34 +2,34 @@
   "electrons": {
     "particle_cpu": 0.0,
     "particle_id": 536887296.0,
-    "particle_momentum_x": 3.235370594842269e-20,
-    "particle_momentum_y": 3.116556644010673e-20,
-    "particle_momentum_z": 8.904212408978889e-17,
-    "particle_position_x": 158433.3678817281,
-    "particle_position_y": 158432.165536343,
-    "particle_position_z": 15724303.92031937,
-    "particle_weight": 4.082754265421834e+18
+    "particle_momentum_x": 7.266679876000112e-22,
+    "particle_momentum_y": 7.383489173934850e-22,
+    "particle_momentum_z": 8.903836199717060e-17,
+    "particle_position_x": 8.192002938829830e+04,
+    "particle_position_y": 8.191963682799038e+04,
+    "particle_position_z": 4.859842246411671e+06,
+    "particle_weight": 8.465938144469544e+17
   },
   "ions": {
     "particle_cpu": 0.0,
     "particle_id": 1610629120.0,
-    "particle_momentum_x": 1.314439943956008e-18,
-    "particle_momentum_y": 1.311628100016085e-18,
-    "particle_momentum_z": 1.6348803463772493e-13,
-    "particle_position_x": 158433.36794743972,
-    "particle_position_y": 158432.1305546865,
-    "particle_position_z": 15724303.986768533,
-    "particle_weight": 4.082754265421834e+18
+    "particle_momentum_x": 1.313784732445962e-18,
+    "particle_momentum_y": 1.311039706805427e-18,
+    "particle_momentum_z": 1.634880384573924e-13,
+    "particle_position_x": 8.192002728584511e+04,
+    "particle_position_y": 8.191964341175802e+04,
+    "particle_position_z": 4.859842246204210e+06,
+    "particle_weight": 8.465938144469544e+17
   },
   "lev=0": {
-    "Bx": 0.06085014302192544,
-    "By": 0.0629280293306694,
-    "Bz": 0.5674918973594997,
-    "Ex": 183829738.031337,
-    "Ey": 176127082.12742153,
-    "Ez": 1031944.8742862595,
-    "jx": 72051.25977794768,
-    "jy": 69843.47286996675,
-    "jz": 21538.61066907263
+    "Bx": 2.144547734312894e-03,
+    "By": 2.140165710633042e-03,
+    "Bz": 1.338918864467607e-03,
+    "Ex": 7.033871490128702e+05,
+    "Ey": 7.314614886312798e+05,
+    "Ez": 5.899611395558689e+04,
+    "jx": 5.206443497993416e+02,
+    "jy": 5.356834701823582e+02,
+    "jz": 1.271341804930311e+04
   }
 }
diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json
index da0357780c6..2c66b9843ff 100644
--- a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json
+++ b/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json
@@ -2,34 +2,34 @@
   "electrons": {
     "particle_cpu": 0.0,
     "particle_id": 536887296.0,
-    "particle_momentum_x": 3.069066828245467e-20,
-    "particle_momentum_y": 2.955868705778091e-20,
-    "particle_momentum_z": 8.904171964713278e-17,
-    "particle_position_x": 158433.3693892244,
-    "particle_position_y": 158432.16743352715,
-    "particle_position_z": 15724303.927902682,
-    "particle_weight": 4.082754265421834e+18
+    "particle_momentum_x": 7.645562440610894e-22,
+    "particle_momentum_y": 7.701497641150062e-22,
+    "particle_momentum_z": 8.903836155428374e-17,
+    "particle_position_x": 8.192003025897461e+04,
+    "particle_position_y": 8.191962659597211e+04,
+    "particle_position_z": 4.859842246432355e+06,
+    "particle_weight": 8.465938144469544e+17
   },
   "ions": {
     "particle_cpu": 0.0,
     "particle_id": 1610629120.0,
-    "particle_momentum_x": 1.314370492303153e-18,
-    "particle_momentum_y": 1.311559654544720e-18,
-    "particle_momentum_z": 1.6348803504847822e-13,
-    "particle_position_x": 158433.36794743096,
-    "particle_position_y": 158432.13055422663,
-    "particle_position_z": 15724303.986784957,
-    "particle_weight": 4.082754265421834e+18
+    "particle_momentum_x": 1.313741580546445e-18,
+    "particle_momentum_y": 1.310996366510680e-18,
+    "particle_momentum_z": 1.634880384578601e-13,
+    "particle_position_x": 8.192002728525293e+04,
+    "particle_position_y": 8.191964341716655e+04,
+    "particle_position_z": 4.859842246204216e+06,
+    "particle_weight": 8.465938144469544e+17
   },
   "lev=0": {
-    "Bx": 5.811688215947619e-02,
-    "By": 6.003802004939475e-02,
-    "Bz": 5.330066640710849e-01,
-    "Ex": 1.732369792715417e+08,
-    "Ey": 1.658909323129718e+08,
-    "Ez": 1.037164140296824e+06,
-    "jx": 76766.28402952384,
-    "jy": 75076.8695684449,
-    "jz": 20606.225852789266
+    "Bx": 1.446349499148714e-03,
+    "By": 1.456125168616220e-03,
+    "Bz": 1.339627652627294e-03,
+    "Ex": 5.250525396939223e+05,
+    "Ey": 5.587387700727878e+05,
+    "Ez": 6.106704319862885e+04,
+    "jx": 5.355287941546474e+02,
+    "jy": 5.505728912673302e+02,
+    "jz": 1.273315076795212e+04
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json
index ae1e184c090..bd15b2a18af 100644
--- a/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json
+++ b/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json
@@ -2,43 +2,43 @@
   "beam": {
     "particle_cpu": 0.0,
     "particle_id": 500500.0,
-    "particle_momentum_x": 7.563066430240103e-19,
-    "particle_momentum_y": 4.375673067987335e-19,
-    "particle_momentum_z": 9.209804731214944e-18,
-    "particle_position_x": 0.004921158713228969,
-    "particle_position_y": 0.166800695179479,
+    "particle_momentum_x": 6.908048548008327e-19,
+    "particle_momentum_y": 4.375388007121479e-19,
+    "particle_momentum_z": 6.425331770864911e-18,
+    "particle_position_x": 1.294490194537805e-03,
+    "particle_position_y": 3.587212659414640e-01,
     "particle_weight": 3120754537230.3823
   },
   "electrons": {
-    "particle_cpu": 155246.0,
-    "particle_id": 26701298988.0,
-    "particle_momentum_x": 9.138382757187134e-19,
-    "particle_momentum_y": 8.102352146596644e-19,
-    "particle_momentum_z": 5.717081627874409e-16,
-    "particle_position_x": 6.63436641815958,
-    "particle_position_y": 58.08983230909047,
-    "particle_weight": 3.212794520240557e+18
+    "particle_cpu": 6.596800000000000e+04,
+    "particle_id": 6.104975576000000e+09,
+    "particle_momentum_x": 7.037094162013838e-19,
+    "particle_momentum_y": 2.205223727583870e-18,
+    "particle_momentum_z": 2.534718326041411e-16,
+    "particle_position_x": 1.503477014281835e+00,
+    "particle_position_y": 1.650643908439910e+01,
+    "particle_weight": 1.237233115616234e+18
   },
   "ions": {
-    "particle_cpu": 155246.0,
-    "particle_id": 26830093836.0,
-    "particle_momentum_x": 1.995914762995399e-18,
-    "particle_momentum_y": 8.202097696570524e-19,
-    "particle_momentum_z": 1.008982176537234e-12,
-    "particle_position_x": 6.622297069965442,
-    "particle_position_y": 58.08877602017003,
-    "particle_weight": 3.212794492131793e+18
+    "particle_cpu": 6.596800000000000e+04,
+    "particle_id": 6.121863384000000e+09,
+    "particle_momentum_x": 1.614909223635599e-18,
+    "particle_momentum_y": 2.233793497251167e-18,
+    "particle_momentum_z": 4.287308902695165e-13,
+    "particle_position_x": 1.491184576084333e+00,
+    "particle_position_y": 1.650444400636357e+01,
+    "particle_weight": 1.237233488417416e+18
   },
   "lev=0": {
-    "Bx": 1304551.76017722,
-    "By": 4001809.462013564,
-    "Bz": 203861.0471774578,
-    "Ex": 1201723647048811.0,
-    "Ey": 408363329945885.8,
-    "Ez": 217289865973087.3,
-    "jx": 3.511742519412693e+16,
-    "jy": 2.310538585094334e+16,
-    "jz": 4.090401768405855e+17,
-    "rho": 1338040452.163162
+    "Bx": 1.119428883934432e+06,
+    "By": 3.254745746872413e+06,
+    "Bz": 2.808770020415855e+05,
+    "Ex": 9.772750948490669e+14,
+    "Ey": 4.031008265066674e+14,
+    "Ez": 1.587397924001068e+14,
+    "jx": 2.990746184529068e+16,
+    "jy": 8.872436234044910e+16,
+    "jz": 3.169290239023944e+17,
+    "rho": 1.061774778022005e+09
   }
-}
\ No newline at end of file
+}
diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json
index 03a6dcab53b..e19106f871c 100644
--- a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json
+++ b/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json
@@ -2,43 +2,43 @@
   "beam": {
     "particle_cpu": 0.0,
     "particle_id": 500500.0,
-    "particle_momentum_x": 7.461083945872488e-19,
-    "particle_momentum_y": 4.375351469858068e-19,
-    "particle_momentum_z": 8.38317279674658e-18,
-    "particle_position_x": 0.006250756356669092,
-    "particle_position_y": 0.1698673360055165,
+    "particle_momentum_x": 7.014911055568698e-19,
+    "particle_momentum_y": 4.374990443003924e-19,
+    "particle_momentum_z": 6.144839759536769e-18,
+    "particle_position_x": 1.623893891495396e-03,
+    "particle_position_y": 3.589438241178938e-01,
     "particle_weight": 3120754537230.3823
   },
   "electrons": {
-    "particle_cpu": 155383.0,
-    "particle_id": 26721507984.0,
-    "particle_momentum_x": 7.341386128424509e-19,
-    "particle_momentum_y": 5.669198506709852e-19,
-    "particle_momentum_z": 5.697789969435323e-16,
-    "particle_position_x": 6.639855486381005,
-    "particle_position_y": 58.21052062206886,
-    "particle_weight": 3.215903513895884e+18
+    "particle_cpu": 6.609200000000000e+04,
+    "particle_id": 6.107999254000000e+09,
+    "particle_momentum_x": 6.169956515126386e-19,
+    "particle_momentum_y": 1.583051027303753e-18,
+    "particle_momentum_z": 2.511097403463241e-16,
+    "particle_position_x": 1.504302633039738e+00,
+    "particle_position_y": 1.657581368802835e+01,
+    "particle_weight": 1.239606291193504e+18
   },
   "ions": {
-    "particle_cpu": 155428.0,
-    "particle_id": 26814790002.0,
-    "particle_momentum_x": 1.67009293897836e-18,
-    "particle_momentum_y": 5.73613275436841e-19,
-    "particle_momentum_z": 1.010167755387852e-12,
-    "particle_position_x": 6.630049987530896,
-    "particle_position_y": 58.2491476194403,
-    "particle_weight": 3.21662600232034e+18
+    "particle_cpu": 6.609200000000000e+04,
+    "particle_id": 6.124902934000000e+09,
+    "particle_momentum_x": 1.432391082050426e-18,
+    "particle_momentum_y": 1.601245030863376e-18,
+    "particle_momentum_z": 4.295399524954519e-13,
+    "particle_position_x": 1.493983946277303e+00,
+    "particle_position_y": 1.657402249695651e+01,
+    "particle_weight": 1.239606638389712e+18
   },
   "lev=0": {
-    "Bx": 1224534.28632093,
-    "By": 3461431.799452949,
-    "Bz": 194465.343296229,
-    "Ex": 1039175495873930.0,
-    "Ey": 384235211603772.4,
-    "Ez": 200269082524794.7,
-    "jx": 3.099312732808666e+16,
-    "jy": 2.221553619576155e+16,
-    "jz": 2.917528921198255e+17,
-    "rho": 992759655.0625863
+    "Bx": 1.088581358097739e+06,
+    "By": 2.889643558326487e+06,
+    "Bz": 2.642398776547430e+05,
+    "Ex": 8.682837571691724e+14,
+    "Ey": 3.934387585819411e+14,
+    "Ez": 1.457308307049998e+14,
+    "jx": 2.671180534419889e+16,
+    "jy": 8.642332131330187e+16,
+    "jz": 2.735799445907443e+17,
+    "rho": 9.169225052610879e+08
   }
-}
\ No newline at end of file
+}