diff --git a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt
index db02068e5093..0a67d5645f02 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt
+++ b/packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt
@@ -1,6 +1,11 @@
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_HEX
   SOURCES test_interpolation_projection_HEX.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_HEX
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
@@ -8,68 +13,114 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
   RUN_SERIAL
   )
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_TET
   SOURCES test_interpolation_projection_TET.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_TET
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
+
     
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_QUAD
   SOURCES test_interpolation_projection_QUAD.cpp
+  ADD_DIR_TO_NAME
+  )
+  
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_QUAD
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
-  
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_InterpolationProjection_TRI
   SOURCES test_interpolation_projection_TRI.cpp
+  ADD_DIR_TO_NAME
+  )
+  
+TRIBITS_ADD_TEST(
+  Test_InterpolationProjection_TRI
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
   RUN_SERIAL
   )
-  
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_HEX
   SOURCES test_convergence_HEX.cpp
+  ADD_DIR_TO_NAME
+  )
+  
+TRIBITS_ADD_TEST(
+  Test_Convergence_HEX
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL 
   )
-  
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_TET
   SOURCES test_convergence_TET.cpp
+  ADD_DIR_TO_NAME
+  )
+  
+TRIBITS_ADD_TEST(
+  Test_Convergence_TET
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL 
   )
-  
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_QUAD
   SOURCES test_convergence_QUAD.cpp
+  ADD_DIR_TO_NAME
+  )
+  
+TRIBITS_ADD_TEST(
+  Test_Convergence_QUAD
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL
   )
-  
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
+
+
+TRIBITS_ADD_EXECUTABLE(
   Test_Convergence_TRI
   SOURCES test_convergence_TRI.cpp
+  ADD_DIR_TO_NAME
+  )
+
+TRIBITS_ADD_TEST(
+  Test_Convergence_TRI
   ARGS PrintItAll
   NUM_MPI_PROCS 1
   PASS_REGULAR_EXPRESSION "TEST PASSED"
   ADD_DIR_TO_NAME
+  RUN_SERIAL
   )
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp
index 7509f5eae136..72d5cf78665b 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp
index e36eaaaba4dc..25e75779a5a2 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp
index 5db74d4f06b0..88382b75d7cd 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp
index 0a10f618396c..e8a12fe0d008 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp
index 73c7375f8fc2..62457d3e180f 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp
index cbb98a182fd3..86830c9eda0d 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp
index f847ce283c8b..63ac0639d0ab 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp
index 43d8fb34f25d..7e1a7ab6bc4f 100644
--- a/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp
+++ b/packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Cuda>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp
index 7509f5eae136..e428193f004e 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp
index e36eaaaba4dc..b46336a66641 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp
index 5db74d4f06b0..9174a4641abe 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp
index 0a10f618396c..49146d5cec52 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp
index 73c7375f8fc2..dc9ef8ae29e6 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp
index cbb98a182fd3..a3b2970e5c50 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp
index f847ce283c8b..fec108638fc0 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;
diff --git a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp
index 43d8fb34f25d..8166184884d9 100644
--- a/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp
+++ b/packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
   const bool verbose = (argc-1) > 0;
   Kokkos::initialize();
   
-  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
+  const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::OpenMP>(verbose);
 
   Kokkos::finalize();
   return r_val;