diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f53b15e9..996c830e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
           du -hs ${HOME}/.cache/ccache
       - name: FlameSheet debug test
         working-directory: ./Exec/RegTests/FlameSheet
-        run: ./PeleLMeX3d.gnu.DEBUG.ex flamesheet-drm19-2d.inp amr.max_step=1 amr.plot_int=-1 amr.check_int=-1
+        run: ./PeleLMeX2d.gnu.DEBUG.ex flamesheet-drm19-2d.inp amr.max_step=1 amr.plot_int=-1 amr.check_int=-1
       - name: FlameSheet debug report
         working-directory: ./Exec/RegTests/FlameSheet
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bea4f2a..e4f79edb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(PELELMEX_PRECISION "DOUBLE" CACHE STRING "Floating point precision SINGLE or
 option(PELELMEX_ENABLE_EB "Enable Embedded Boundary" OFF)
 option(PELELMEX_ENABLE_EFIELD "Enable Electric field module" OFF)
 option(PELELMEX_ENABLE_SOOT "Enable Soot module" OFF)
-option(PELELMEX_ENABLE_PARTICLE "Enable particles" OFF)
+option(PELELMEX_ENABLE_PARTICLES "Enable particles" OFF)
 
 # HPC options
 option(PELELMEX_ENABLE_MPI "Enable MPI" OFF)
diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt
index 172a14f3..8b2856c0 100644
--- a/Exec/CMakeLists.txt
+++ b/Exec/CMakeLists.txt
@@ -1 +1,4 @@
+#add_subdirectory(Efield)
+#add_subdirectory(Production)
 add_subdirectory(RegTests)
+#add_subdirectory(UnitTests)
diff --git a/Exec/Cases/ChallengeProblem/EBUserDefined.H b/Exec/Production/ChallengeProblem/EBUserDefined.H
similarity index 100%
rename from Exec/Cases/ChallengeProblem/EBUserDefined.H
rename to Exec/Production/ChallengeProblem/EBUserDefined.H
diff --git a/Exec/Cases/ChallengeProblem/GNUmakefile b/Exec/Production/ChallengeProblem/GNUmakefile
similarity index 100%
rename from Exec/Cases/ChallengeProblem/GNUmakefile
rename to Exec/Production/ChallengeProblem/GNUmakefile
diff --git a/Exec/Cases/ChallengeProblem/README.md b/Exec/Production/ChallengeProblem/README.md
similarity index 100%
rename from Exec/Cases/ChallengeProblem/README.md
rename to Exec/Production/ChallengeProblem/README.md
diff --git a/Exec/Cases/ChallengeProblem/getLMeXChallengePB.sh b/Exec/Production/ChallengeProblem/getLMeXChallengePB.sh
similarity index 100%
rename from Exec/Cases/ChallengeProblem/getLMeXChallengePB.sh
rename to Exec/Production/ChallengeProblem/getLMeXChallengePB.sh
diff --git a/Exec/Cases/ChallengeProblem/getLMeXChallengePBHypre.sh b/Exec/Production/ChallengeProblem/getLMeXChallengePBHypre.sh
similarity index 100%
rename from Exec/Cases/ChallengeProblem/getLMeXChallengePBHypre.sh
rename to Exec/Production/ChallengeProblem/getLMeXChallengePBHypre.sh
diff --git a/Exec/Cases/ChallengeProblem/input.3d b/Exec/Production/ChallengeProblem/input.3d
similarity index 100%
rename from Exec/Cases/ChallengeProblem/input.3d
rename to Exec/Production/ChallengeProblem/input.3d
diff --git a/Exec/Cases/ChallengeProblem/input.3d_Hypre b/Exec/Production/ChallengeProblem/input.3d_Hypre
similarity index 100%
rename from Exec/Cases/ChallengeProblem/input.3d_Hypre
rename to Exec/Production/ChallengeProblem/input.3d_Hypre
diff --git a/Exec/Cases/ChallengeProblem/pelelm_prob.H b/Exec/Production/ChallengeProblem/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/ChallengeProblem/pelelm_prob.H
rename to Exec/Production/ChallengeProblem/pelelm_prob.H
diff --git a/Exec/Cases/ChallengeProblem/pelelm_prob.cpp b/Exec/Production/ChallengeProblem/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/ChallengeProblem/pelelm_prob.cpp
rename to Exec/Production/ChallengeProblem/pelelm_prob.cpp
diff --git a/Exec/Cases/ChallengeProblem/pelelm_prob_parm.H b/Exec/Production/ChallengeProblem/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/ChallengeProblem/pelelm_prob_parm.H
rename to Exec/Production/ChallengeProblem/pelelm_prob_parm.H
diff --git a/Exec/Cases/CounterFlow/CMakeLists.txt b/Exec/Production/CounterFlow/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/CounterFlow/CMakeLists.txt
rename to Exec/Production/CounterFlow/CMakeLists.txt
diff --git a/Exec/Cases/CounterFlow/GNUmakefile b/Exec/Production/CounterFlow/GNUmakefile
similarity index 100%
rename from Exec/Cases/CounterFlow/GNUmakefile
rename to Exec/Production/CounterFlow/GNUmakefile
diff --git a/Exec/Cases/CounterFlow/drm_CH4Air_stoich.dat b/Exec/Production/CounterFlow/drm_CH4Air_stoich.dat
similarity index 100%
rename from Exec/Cases/CounterFlow/drm_CH4Air_stoich.dat
rename to Exec/Production/CounterFlow/drm_CH4Air_stoich.dat
diff --git a/Exec/Cases/CounterFlow/input.2d-regt b/Exec/Production/CounterFlow/input.2d-regt
similarity index 100%
rename from Exec/Cases/CounterFlow/input.2d-regt
rename to Exec/Production/CounterFlow/input.2d-regt
diff --git a/Exec/Cases/CounterFlow/pelelm_prob.H b/Exec/Production/CounterFlow/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/CounterFlow/pelelm_prob.H
rename to Exec/Production/CounterFlow/pelelm_prob.H
diff --git a/Exec/Cases/CounterFlow/pelelm_prob.cpp b/Exec/Production/CounterFlow/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/CounterFlow/pelelm_prob.cpp
rename to Exec/Production/CounterFlow/pelelm_prob.cpp
diff --git a/Exec/Cases/CounterFlow/pelelm_prob_parm.H b/Exec/Production/CounterFlow/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/CounterFlow/pelelm_prob_parm.H
rename to Exec/Production/CounterFlow/pelelm_prob_parm.H
diff --git a/Exec/Cases/CounterFlowSpray/GNUmakefile b/Exec/Production/CounterFlowSpray/GNUmakefile
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/GNUmakefile
rename to Exec/Production/CounterFlowSpray/GNUmakefile
diff --git a/Exec/Cases/CounterFlowSpray/SprayParticlesInitInsert.cpp b/Exec/Production/CounterFlowSpray/SprayParticlesInitInsert.cpp
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/SprayParticlesInitInsert.cpp
rename to Exec/Production/CounterFlowSpray/SprayParticlesInitInsert.cpp
diff --git a/Exec/Cases/CounterFlowSpray/input.2d-regt b/Exec/Production/CounterFlowSpray/input.2d-regt
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/input.2d-regt
rename to Exec/Production/CounterFlowSpray/input.2d-regt
diff --git a/Exec/Cases/CounterFlowSpray/pelelm_prob.H b/Exec/Production/CounterFlowSpray/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/pelelm_prob.H
rename to Exec/Production/CounterFlowSpray/pelelm_prob.H
diff --git a/Exec/Cases/CounterFlowSpray/pelelm_prob.cpp b/Exec/Production/CounterFlowSpray/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/pelelm_prob.cpp
rename to Exec/Production/CounterFlowSpray/pelelm_prob.cpp
diff --git a/Exec/Cases/CounterFlowSpray/pelelm_prob_parm.H b/Exec/Production/CounterFlowSpray/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/CounterFlowSpray/pelelm_prob_parm.H
rename to Exec/Production/CounterFlowSpray/pelelm_prob_parm.H
diff --git a/Exec/Cases/DiffBunsen2D/CMakeLists.txt b/Exec/Production/DiffBunsen2D/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/CMakeLists.txt
rename to Exec/Production/DiffBunsen2D/CMakeLists.txt
diff --git a/Exec/Cases/DiffBunsen2D/GNUmakefile b/Exec/Production/DiffBunsen2D/GNUmakefile
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/GNUmakefile
rename to Exec/Production/DiffBunsen2D/GNUmakefile
diff --git a/Exec/Cases/DiffBunsen2D/input.2d-regt b/Exec/Production/DiffBunsen2D/input.2d-regt
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/input.2d-regt
rename to Exec/Production/DiffBunsen2D/input.2d-regt
diff --git a/Exec/Cases/DiffBunsen2D/pelelm_prob.H b/Exec/Production/DiffBunsen2D/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/pelelm_prob.H
rename to Exec/Production/DiffBunsen2D/pelelm_prob.H
diff --git a/Exec/Cases/DiffBunsen2D/pelelm_prob.cpp b/Exec/Production/DiffBunsen2D/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/pelelm_prob.cpp
rename to Exec/Production/DiffBunsen2D/pelelm_prob.cpp
diff --git a/Exec/Cases/DiffBunsen2D/pelelm_prob_parm.H b/Exec/Production/DiffBunsen2D/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/DiffBunsen2D/pelelm_prob_parm.H
rename to Exec/Production/DiffBunsen2D/pelelm_prob_parm.H
diff --git a/Exec/Cases/JetInCrossflow/CMakeLists.txt b/Exec/Production/JetInCrossflow/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/JetInCrossflow/CMakeLists.txt
rename to Exec/Production/JetInCrossflow/CMakeLists.txt
diff --git a/Exec/Cases/JetInCrossflow/GNUmakefile b/Exec/Production/JetInCrossflow/GNUmakefile
similarity index 100%
rename from Exec/Cases/JetInCrossflow/GNUmakefile
rename to Exec/Production/JetInCrossflow/GNUmakefile
diff --git a/Exec/Cases/JetInCrossflow/input.3d b/Exec/Production/JetInCrossflow/input.3d
similarity index 100%
rename from Exec/Cases/JetInCrossflow/input.3d
rename to Exec/Production/JetInCrossflow/input.3d
diff --git a/Exec/Cases/JetInCrossflow/pelelm_prob.H b/Exec/Production/JetInCrossflow/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/JetInCrossflow/pelelm_prob.H
rename to Exec/Production/JetInCrossflow/pelelm_prob.H
diff --git a/Exec/Cases/JetInCrossflow/pelelm_prob.cpp b/Exec/Production/JetInCrossflow/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/JetInCrossflow/pelelm_prob.cpp
rename to Exec/Production/JetInCrossflow/pelelm_prob.cpp
diff --git a/Exec/Cases/JetInCrossflow/pelelm_prob_parm.H b/Exec/Production/JetInCrossflow/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/JetInCrossflow/pelelm_prob_parm.H
rename to Exec/Production/JetInCrossflow/pelelm_prob_parm.H
diff --git a/Exec/Cases/NormalJet_OpenDomain/CMakeLists.txt b/Exec/Production/NormalJet_OpenDomain/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/CMakeLists.txt
rename to Exec/Production/NormalJet_OpenDomain/CMakeLists.txt
diff --git a/Exec/Cases/NormalJet_OpenDomain/GNUmakefile b/Exec/Production/NormalJet_OpenDomain/GNUmakefile
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/GNUmakefile
rename to Exec/Production/NormalJet_OpenDomain/GNUmakefile
diff --git a/Exec/Cases/NormalJet_OpenDomain/inputs.3d-regt b/Exec/Production/NormalJet_OpenDomain/inputs.3d-regt
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/inputs.3d-regt
rename to Exec/Production/NormalJet_OpenDomain/inputs.3d-regt
diff --git a/Exec/Cases/NormalJet_OpenDomain/pelelm_prob.H b/Exec/Production/NormalJet_OpenDomain/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/pelelm_prob.H
rename to Exec/Production/NormalJet_OpenDomain/pelelm_prob.H
diff --git a/Exec/Cases/NormalJet_OpenDomain/pelelm_prob.cpp b/Exec/Production/NormalJet_OpenDomain/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/pelelm_prob.cpp
rename to Exec/Production/NormalJet_OpenDomain/pelelm_prob.cpp
diff --git a/Exec/Cases/NormalJet_OpenDomain/pelelm_prob_parm.H b/Exec/Production/NormalJet_OpenDomain/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/NormalJet_OpenDomain/pelelm_prob_parm.H
rename to Exec/Production/NormalJet_OpenDomain/pelelm_prob_parm.H
diff --git a/Exec/Cases/PremBunsen2D/CMakeLists.txt b/Exec/Production/PremBunsen2D/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/PremBunsen2D/CMakeLists.txt
rename to Exec/Production/PremBunsen2D/CMakeLists.txt
diff --git a/Exec/Cases/PremBunsen2D/GNUmakefile b/Exec/Production/PremBunsen2D/GNUmakefile
similarity index 100%
rename from Exec/Cases/PremBunsen2D/GNUmakefile
rename to Exec/Production/PremBunsen2D/GNUmakefile
diff --git a/Exec/Cases/PremBunsen2D/drm_CH4Air_stoich.dat b/Exec/Production/PremBunsen2D/drm_CH4Air_stoich.dat
similarity index 100%
rename from Exec/Cases/PremBunsen2D/drm_CH4Air_stoich.dat
rename to Exec/Production/PremBunsen2D/drm_CH4Air_stoich.dat
diff --git a/Exec/Cases/PremBunsen2D/input.2d-regt b/Exec/Production/PremBunsen2D/input.2d-regt
similarity index 100%
rename from Exec/Cases/PremBunsen2D/input.2d-regt
rename to Exec/Production/PremBunsen2D/input.2d-regt
diff --git a/Exec/Cases/PremBunsen2D/pelelm_prob.H b/Exec/Production/PremBunsen2D/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/PremBunsen2D/pelelm_prob.H
rename to Exec/Production/PremBunsen2D/pelelm_prob.H
diff --git a/Exec/Cases/PremBunsen2D/pelelm_prob.cpp b/Exec/Production/PremBunsen2D/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/PremBunsen2D/pelelm_prob.cpp
rename to Exec/Production/PremBunsen2D/pelelm_prob.cpp
diff --git a/Exec/Cases/PremBunsen2D/pelelm_prob_parm.H b/Exec/Production/PremBunsen2D/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/PremBunsen2D/pelelm_prob_parm.H
rename to Exec/Production/PremBunsen2D/pelelm_prob_parm.H
diff --git a/Exec/Cases/PremBunsen3D/CMakeLists.txt b/Exec/Production/PremBunsen3D/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/PremBunsen3D/CMakeLists.txt
rename to Exec/Production/PremBunsen3D/CMakeLists.txt
diff --git a/Exec/Cases/PremBunsen3D/GNUmakefile b/Exec/Production/PremBunsen3D/GNUmakefile
similarity index 100%
rename from Exec/Cases/PremBunsen3D/GNUmakefile
rename to Exec/Production/PremBunsen3D/GNUmakefile
diff --git a/Exec/Cases/PremBunsen3D/drm_CH4Air_stoich.dat b/Exec/Production/PremBunsen3D/drm_CH4Air_stoich.dat
similarity index 100%
rename from Exec/Cases/PremBunsen3D/drm_CH4Air_stoich.dat
rename to Exec/Production/PremBunsen3D/drm_CH4Air_stoich.dat
diff --git a/Exec/Cases/PremBunsen3D/input.3d b/Exec/Production/PremBunsen3D/input.3d
similarity index 100%
rename from Exec/Cases/PremBunsen3D/input.3d
rename to Exec/Production/PremBunsen3D/input.3d
diff --git a/Exec/Cases/PremBunsen3D/pelelm_prob.H b/Exec/Production/PremBunsen3D/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/PremBunsen3D/pelelm_prob.H
rename to Exec/Production/PremBunsen3D/pelelm_prob.H
diff --git a/Exec/Cases/PremBunsen3D/pelelm_prob.cpp b/Exec/Production/PremBunsen3D/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/PremBunsen3D/pelelm_prob.cpp
rename to Exec/Production/PremBunsen3D/pelelm_prob.cpp
diff --git a/Exec/Cases/PremBunsen3D/pelelm_prob_parm.H b/Exec/Production/PremBunsen3D/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/PremBunsen3D/pelelm_prob_parm.H
rename to Exec/Production/PremBunsen3D/pelelm_prob_parm.H
diff --git a/Exec/Cases/SwirlFlowWallInteractions/CMakeLists.txt b/Exec/Production/SwirlFlowWallInteractions/CMakeLists.txt
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/CMakeLists.txt
rename to Exec/Production/SwirlFlowWallInteractions/CMakeLists.txt
diff --git a/Exec/Cases/SwirlFlowWallInteractions/GNUmakefile b/Exec/Production/SwirlFlowWallInteractions/GNUmakefile
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/GNUmakefile
rename to Exec/Production/SwirlFlowWallInteractions/GNUmakefile
diff --git a/Exec/Cases/SwirlFlowWallInteractions/input.3d b/Exec/Production/SwirlFlowWallInteractions/input.3d
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/input.3d
rename to Exec/Production/SwirlFlowWallInteractions/input.3d
diff --git a/Exec/Cases/SwirlFlowWallInteractions/pelelm_prob.H b/Exec/Production/SwirlFlowWallInteractions/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/pelelm_prob.H
rename to Exec/Production/SwirlFlowWallInteractions/pelelm_prob.H
diff --git a/Exec/Cases/SwirlFlowWallInteractions/pelelm_prob.cpp b/Exec/Production/SwirlFlowWallInteractions/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/pelelm_prob.cpp
rename to Exec/Production/SwirlFlowWallInteractions/pelelm_prob.cpp
diff --git a/Exec/Cases/SwirlFlowWallInteractions/pelelm_prob_parm.H b/Exec/Production/SwirlFlowWallInteractions/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/pelelm_prob_parm.H
rename to Exec/Production/SwirlFlowWallInteractions/pelelm_prob_parm.H
diff --git a/Exec/Cases/SwirlFlowWallInteractions/pmfdata.dat b/Exec/Production/SwirlFlowWallInteractions/pmfdata.dat
similarity index 100%
rename from Exec/Cases/SwirlFlowWallInteractions/pmfdata.dat
rename to Exec/Production/SwirlFlowWallInteractions/pmfdata.dat
diff --git a/Exec/Cases/TripleFlame/GNUmakefile b/Exec/Production/TripleFlame/GNUmakefile
similarity index 100%
rename from Exec/Cases/TripleFlame/GNUmakefile
rename to Exec/Production/TripleFlame/GNUmakefile
diff --git a/Exec/Cases/TripleFlame/input.2d b/Exec/Production/TripleFlame/input.2d
similarity index 100%
rename from Exec/Cases/TripleFlame/input.2d
rename to Exec/Production/TripleFlame/input.2d
diff --git a/Exec/Cases/TripleFlame/pelelm_prob.H b/Exec/Production/TripleFlame/pelelm_prob.H
similarity index 100%
rename from Exec/Cases/TripleFlame/pelelm_prob.H
rename to Exec/Production/TripleFlame/pelelm_prob.H
diff --git a/Exec/Cases/TripleFlame/pelelm_prob.cpp b/Exec/Production/TripleFlame/pelelm_prob.cpp
similarity index 100%
rename from Exec/Cases/TripleFlame/pelelm_prob.cpp
rename to Exec/Production/TripleFlame/pelelm_prob.cpp
diff --git a/Exec/Cases/TripleFlame/pelelm_prob_parm.H b/Exec/Production/TripleFlame/pelelm_prob_parm.H
similarity index 100%
rename from Exec/Cases/TripleFlame/pelelm_prob_parm.H
rename to Exec/Production/TripleFlame/pelelm_prob_parm.H
diff --git a/Exec/RegTests/CMakeLists.txt b/Exec/RegTests/CMakeLists.txt
index 45fdc848..89e19138 100644
--- a/Exec/RegTests/CMakeLists.txt
+++ b/Exec/RegTests/CMakeLists.txt
@@ -3,14 +3,14 @@
 #add_subdirectory(EB_EnclosedVortex)
 #add_subdirectory(EB_FlowPastCylinder)
 #add_subdirectory(EB_PipeFlow)
-#add_subdirectory(EnclosedFlame)
-#add_subdirectory(EnclosedInjection)
+add_subdirectory(EnclosedFlame)
+add_subdirectory(EnclosedInjection)
 add_subdirectory(FlameSheet)
-#add_subdirectory(HITDecay)
-#add_subdirectory(HotBubble)
-#add_subdirectory(PeriodicCases)
+add_subdirectory(HITDecay)
+add_subdirectory(HotBubble)
+add_subdirectory(PeriodicCases)
 #add_subdirectory(SprayTest)
-#add_subdirectory(TaylorGreen)
-#add_subdirectory(TripleFlame)
-#add_subdirectory(TurbInflow)
+add_subdirectory(TaylorGreen)
+add_subdirectory(TripleFlame)
+add_subdirectory(TurbInflow)
 #add_subdirectory(Unit)
diff --git a/Exec/RegTests/EB_BackwardStepFlame/CMakeLists.txt b/Exec/RegTests/EB_BackwardStepFlame/CMakeLists.txt
index d3ffc6d0..ae48d20f 100644
--- a/Exec/RegTests/EB_BackwardStepFlame/CMakeLists.txt
+++ b/Exec/RegTests/EB_BackwardStepFlame/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL drm19)
 set(PELELMEX_TRANSPORT_MODEL Simple)
diff --git a/Exec/RegTests/EB_EnclosedFlame/CMakeLists.txt b/Exec/RegTests/EB_EnclosedFlame/CMakeLists.txt
index d3ffc6d0..ae48d20f 100644
--- a/Exec/RegTests/EB_EnclosedFlame/CMakeLists.txt
+++ b/Exec/RegTests/EB_EnclosedFlame/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL drm19)
 set(PELELMEX_TRANSPORT_MODEL Simple)
diff --git a/Exec/RegTests/EB_EnclosedVortex/CMakeLists.txt b/Exec/RegTests/EB_EnclosedVortex/CMakeLists.txt
index b8eb7d76..bca608a0 100644
--- a/Exec/RegTests/EB_EnclosedVortex/CMakeLists.txt
+++ b/Exec/RegTests/EB_EnclosedVortex/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL air)
 set(PELELMEX_TRANSPORT_MODEL Constant)
diff --git a/Exec/RegTests/EB_FlowPastCylinder/CMakeLists.txt b/Exec/RegTests/EB_FlowPastCylinder/CMakeLists.txt
index d3ffc6d0..bca608a0 100644
--- a/Exec/RegTests/EB_FlowPastCylinder/CMakeLists.txt
+++ b/Exec/RegTests/EB_FlowPastCylinder/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
-set(PELELMEX_TRANSPORT_MODEL Simple)
+set(PELELMEX_CHEMISTRY_MODEL air)
+set(PELELMEX_TRANSPORT_MODEL Constant)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile b/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile
index 8a7d0367..87f71cb2 100644
--- a/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile
+++ b/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile
@@ -27,18 +27,11 @@ THREAD_SANITIZER = FALSE
 
 # PeleLMeX
 USE_EFIELD = FALSE
-
-# PelePhysics
-Chemistry_Model = drm19
-Eos_Model = Fuego
-Transport_Model = Simple
-
-# PeleLMeX
-CEXE_headers 	+= EBUserDefined.H
+CEXE_headers += EBUserDefined.H
 
 # PelePhysics
 Chemistry_Model = air
-Eos_Model       = Fuego
+Eos_Model = Fuego
 Transport_Model = Constant
 
 PELELMEX_HOME ?= ../../..
diff --git a/Exec/RegTests/EB_PipeFlow/CMakeLists.txt b/Exec/RegTests/EB_PipeFlow/CMakeLists.txt
index d3ffc6d0..fc4f530c 100644
--- a/Exec/RegTests/EB_PipeFlow/CMakeLists.txt
+++ b/Exec/RegTests/EB_PipeFlow/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
+set(PELELMEX_CHEMISTRY_MODEL air)
 set(PELELMEX_TRANSPORT_MODEL Simple)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/EnclosedFlame/CMakeLists.txt b/Exec/RegTests/EnclosedFlame/CMakeLists.txt
index d3ffc6d0..ae48d20f 100644
--- a/Exec/RegTests/EnclosedFlame/CMakeLists.txt
+++ b/Exec/RegTests/EnclosedFlame/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL drm19)
 set(PELELMEX_TRANSPORT_MODEL Simple)
diff --git a/Exec/RegTests/EnclosedInjection/CMakeLists.txt b/Exec/RegTests/EnclosedInjection/CMakeLists.txt
index d3ffc6d0..ae48d20f 100644
--- a/Exec/RegTests/EnclosedInjection/CMakeLists.txt
+++ b/Exec/RegTests/EnclosedInjection/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL drm19)
 set(PELELMEX_TRANSPORT_MODEL Simple)
diff --git a/Exec/RegTests/HITDecay/CMakeLists.txt b/Exec/RegTests/HITDecay/CMakeLists.txt
index d3ffc6d0..fc4f530c 100644
--- a/Exec/RegTests/HITDecay/CMakeLists.txt
+++ b/Exec/RegTests/HITDecay/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
+set(PELELMEX_CHEMISTRY_MODEL air)
 set(PELELMEX_TRANSPORT_MODEL Simple)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/HotBubble/CMakeLists.txt b/Exec/RegTests/HotBubble/CMakeLists.txt
index d3ffc6d0..bca608a0 100644
--- a/Exec/RegTests/HotBubble/CMakeLists.txt
+++ b/Exec/RegTests/HotBubble/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
-set(PELELMEX_TRANSPORT_MODEL Simple)
+set(PELELMEX_CHEMISTRY_MODEL air)
+set(PELELMEX_TRANSPORT_MODEL Constant)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/PeriodicCases/CMakeLists.txt b/Exec/RegTests/PeriodicCases/CMakeLists.txt
index d3ffc6d0..bca608a0 100644
--- a/Exec/RegTests/PeriodicCases/CMakeLists.txt
+++ b/Exec/RegTests/PeriodicCases/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
-set(PELELMEX_TRANSPORT_MODEL Simple)
+set(PELELMEX_CHEMISTRY_MODEL air)
+set(PELELMEX_TRANSPORT_MODEL Constant)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/SprayTest/CMakeLists.txt b/Exec/RegTests/SprayTest/CMakeLists.txt
index d3ffc6d0..9feb1e0c 100644
--- a/Exec/RegTests/SprayTest/CMakeLists.txt
+++ b/Exec/RegTests/SprayTest/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
+set(PELELMEX_ENABLE_PARTICLES ON)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
+set(PELELMEX_CHEMISTRY_MODEL decane_3sp)
 set(PELELMEX_TRANSPORT_MODEL Simple)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/TaylorGreen/CMakeLists.txt b/Exec/RegTests/TaylorGreen/CMakeLists.txt
index d3ffc6d0..bca608a0 100644
--- a/Exec/RegTests/TaylorGreen/CMakeLists.txt
+++ b/Exec/RegTests/TaylorGreen/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
-set(PELELMEX_TRANSPORT_MODEL Simple)
+set(PELELMEX_CHEMISTRY_MODEL air)
+set(PELELMEX_TRANSPORT_MODEL Constant)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/TripleFlame/CMakeLists.txt b/Exec/RegTests/TripleFlame/CMakeLists.txt
index d3ffc6d0..ae48d20f 100644
--- a/Exec/RegTests/TripleFlame/CMakeLists.txt
+++ b/Exec/RegTests/TripleFlame/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
 set(PELELMEX_CHEMISTRY_MODEL drm19)
 set(PELELMEX_TRANSPORT_MODEL Simple)
diff --git a/Exec/RegTests/TurbInflow/CMakeLists.txt b/Exec/RegTests/TurbInflow/CMakeLists.txt
index d3ffc6d0..fc4f530c 100644
--- a/Exec/RegTests/TurbInflow/CMakeLists.txt
+++ b/Exec/RegTests/TurbInflow/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
+set(PELELMEX_CHEMISTRY_MODEL air)
 set(PELELMEX_TRANSPORT_MODEL Simple)
 include(BuildExeAndLib)
diff --git a/Exec/RegTests/Unit/CMakeLists.txt b/Exec/RegTests/Unit/CMakeLists.txt
index d3ffc6d0..bca608a0 100644
--- a/Exec/RegTests/Unit/CMakeLists.txt
+++ b/Exec/RegTests/Unit/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(PELELMEX_ENABLE_PARTICLES OFF)
 set(PELELMEX_EOS_MODEL Fuego)
-set(PELELMEX_CHEMISTRY_MODEL drm19)
-set(PELELMEX_TRANSPORT_MODEL Simple)
+set(PELELMEX_CHEMISTRY_MODEL air)
+set(PELELMEX_TRANSPORT_MODEL Constant)
 include(BuildExeAndLib)