diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22a66a8b50..3fbd711486 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,15 @@ add_subdirectory(source)
 #------------------------------------------------------------------------------#
 add_subdirectory(bindings)
 
+#------------------------------------------------------------------------------#
+# Examples
+#------------------------------------------------------------------------------#
+option(ADIOS2_BUILD_EXAMPLES "Build examples" ON)
+option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF)
+if(ADIOS2_BUILD_EXAMPLES)
+  add_subdirectory(examples)
+endif()
+
 #------------------------------------------------------------------------------#
 # Testing
 #------------------------------------------------------------------------------#
@@ -219,15 +228,6 @@ if(BUILD_TESTING)
   add_subdirectory(testing)
 endif()
 
-#------------------------------------------------------------------------------#
-# Examples
-#------------------------------------------------------------------------------#
-option(ADIOS2_BUILD_EXAMPLES "Build examples" ON)
-option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF)
-if(ADIOS2_BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
 #------------------------------------------------------------------------------#
 # Generating package configs
 #------------------------------------------------------------------------------#
@@ -280,6 +280,7 @@ endif()
 message("    Library Type: ${msg_lib_type}")
 message("    Build Type:   ${CMAKE_BUILD_TYPE}")
 message("    Testing: ${BUILD_TESTING}")
+message("    Examples: ${ADIOS2_BUILD_EXAMPLES}")
 message("    Build Options:")
 
 foreach(opt IN LISTS ADIOS2_CONFIG_OPTS)
@@ -295,4 +296,3 @@ message("    RDMA Transport for Staging: Available")
 else()
 message("    RDMA Transport for Staging: Unconfigured")
 endif()
-message("")
diff --git a/cmake/ADIOSFunctions.cmake b/cmake/ADIOSFunctions.cmake
index d07a5fe495..e9a312f324 100644
--- a/cmake/ADIOSFunctions.cmake
+++ b/cmake/ADIOSFunctions.cmake
@@ -149,7 +149,11 @@ function(SetupTestPipeline basename pipeline do_setup)
         -DDIR_NAME=${CMAKE_CURRENT_BINARY_DIR}/${basename}
         -P ${PROJECT_SOURCE_DIR}/cmake/EmptyDir.cmake
     )
-    list(INSERT pipeline 0 "Setup")
+    if(pipeline)
+      list(INSERT pipeline 0 "Setup")
+    else()
+      set(pipeline "Setup;")
+    endif()
   endif()
   unset(prev_suffix)
   foreach(curr_step IN LISTS pipeline)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2ac65113d3..77f5a38449 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -9,9 +9,7 @@ add_subdirectory(query)
 add_subdirectory(useCases)
 
 if(ADIOS2_HAVE_MPI)
-  #if(MPIEXEC_MAX_NUMPROCS GREATER 3)
-    add_subdirectory(heatTransfer)
-  #endif()
+  add_subdirectory(heatTransfer)
 endif()
 
 if(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL)
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index ccf5a75587..c60d518ed5 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -15,23 +15,52 @@ else()
 endif()
 
 include(GoogleTest)
-function(gtest_add_tests_helper testname mpi pfx sfx)
-  set(tgt Test.${pfx}${testname})
+# gtest_add_tests_helper:
+# Create a wrapper around gtest_add_tests that uses common patterns for test
+# names, execurtable names, mpi usage, etc.
+# 
+# Arguments:
+#   testname - The basename of the test file
+#   mpi      - TRUE - build with MPI, execute with mpiexec
+#              FALSE - no mpi
+#              NOEXEC - build with MPI but don't execute with MPI
+#   src_pfx  - Source filename prefix, Test${src_pfs}${testname}.cpp
+#   tst_pfx  - Test name prefix to be added to CTest
+#   tst_sfx  - Test name suffix to be added to CTest
+# all additional arguments are passed directly to gtest_add_tests
+#
+# Example:
+#   You have a gtest file, TestFooThings.cpp that containst Test1 and Test2
+#   gtest functions that can be called with different sets of arguments.
+#
+#     gtest_add_tests_helper(Things TRUE Foo Foo. .Bar EXTRA_ARGS "Bar")
+#     gtest_add_tests_helper(Things TRUE Foo Foo. .Baz EXTRA_ARGS "Baz")
+#
+#  will create the executable Test.Foo.Things and add the tests
+#    Foo.Things.Test1.Bar
+#    Foo.Things.Test2.Bar
+#    Foo.Things.Test1.Baz
+#    Foo.Things.Test2.Baz
+#
+function(gtest_add_tests_helper testname mpi src_pfx tst_pfx tst_sfx)
+  set(tgt Test.${tst_pfx}${testname})
   if(NOT TARGET ${tgt})
-    add_executable(${tgt} Test${testname}.cpp)
+    add_executable(${tgt} Test${src_pfx}${testname}.cpp)
     target_link_libraries(${tgt} adios2 gtest)
     if(mpi)
       target_link_libraries(${tgt} MPI::MPI_C)
     endif()
   endif()
-  if(mpi)
-    gtest_add_tests(TARGET ${tgt} TEST_PREFIX "${pfx}" TEST_SUFFIX "${sfx}"
+  if(mpi AND NOT mpi STREQUAL "NOEXEC")
+    gtest_add_tests(TARGET ${tgt}
+      TEST_PREFIX "${tst_pfx}" TEST_SUFFIX "${tst_sfx}"
       EXEC_WRAPPER ${MPIEXEC_COMMAND} TEST_LIST added_tests
       ${ARGN}
     )
     set_tests_properties(${added_tests} PROPERTIES PROCESSORS ${NUM_TEST_PROCS})
   else()
-    gtest_add_tests(TARGET ${tgt} TEST_PREFIX "${pfx}" TEST_SUFFIX "${sfx}"
+    gtest_add_tests(TARGET ${tgt}
+      TEST_PREFIX "${tst_pfx}" TEST_SUFFIX "${tst_sfx}"
       ${ARGN}
     )
   endif()
diff --git a/testing/adios2/bindings/C/CMakeLists.txt b/testing/adios2/bindings/C/CMakeLists.txt
index c49b83e5a9..2ca90bf33c 100644
--- a/testing/adios2/bindings/C/CMakeLists.txt
+++ b/testing/adios2/bindings/C/CMakeLists.txt
@@ -9,9 +9,9 @@ else()
   set(mpi FALSE)
 endif()
 
-gtest_add_tests_helper(BPWriteTypes ${mpi} "Bindings.C." "")
-gtest_add_tests_helper(BPWriteReadMultiblock ${mpi} "Bindings.C." "")
-gtest_add_tests_helper(NullWriteRead ${mpi} "Bindings.C." "")
+gtest_add_tests_helper(WriteTypes ${mpi} BP Bindings.C. "")
+gtest_add_tests_helper(WriteReadMultiblock ${mpi} BP Bindings.C. "")
+gtest_add_tests_helper(NullWriteRead ${mpi} "" Bindings.C. "")
 if(mpi)
-  gtest_add_tests_helper(BPWriteAggregateReadLocal TRUE "Bindings.C." "")
+  gtest_add_tests_helper(WriteAggregateReadLocal TRUE BP Bindings.C. "")
 endif()
diff --git a/testing/adios2/engine/bp/CMakeLists.txt b/testing/adios2/engine/bp/CMakeLists.txt
index 5f9ba55945..4ce5336615 100644
--- a/testing/adios2/engine/bp/CMakeLists.txt
+++ b/testing/adios2/engine/bp/CMakeLists.txt
@@ -9,52 +9,52 @@ file(MAKE_DIRECTORY ${BP3_DIR})
 file(MAKE_DIRECTORY ${BP4_DIR})
 
 macro(bp3_bp4_gtest_add_tests_helper testname)
-  gtest_add_tests_helper(${testname} ${test_mpi} Engine.BP. .BP3
+  gtest_add_tests_helper(${testname} ${test_mpi} BP Engine.BP. .BP3
     WORKING_DIRECTORY ${BP3_DIR} EXTRA_ARGS "BP3"
   )
-  gtest_add_tests_helper(${testname} ${test_mpi} Engine.BP. .BP4
+  gtest_add_tests_helper(${testname} ${test_mpi} BP Engine.BP. .BP4
     WORKING_DIRECTORY ${BP4_DIR} EXTRA_ARGS "BP4"
   )
 endmacro()
 
 add_subdirectory(operations)
 
-bp3_bp4_gtest_add_tests_helper(BPWriteReadADIOS2)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadADIOS2fstream)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadADIOS2stdio)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadAsStreamADIOS2)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadAsStreamADIOS2_Threads)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadAttributesADIOS2)
-bp3_bp4_gtest_add_tests_helper(StreamWriteReadHighLevelAPI)
-bp3_bp4_gtest_add_tests_helper(BPWriteFlushRead)
-bp3_bp4_gtest_add_tests_helper(BPWriteMultiblockRead)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadMultiblock)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadVector)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadAttributesMultirank)
-bp3_bp4_gtest_add_tests_helper(BPLargeMetadata)
-bp3_bp4_gtest_add_tests_helper(BPWriteMemorySelectionRead)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadLocalVariables)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadLocalVariablesSel)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadLocalVariablesSelHighLevel)
-bp3_bp4_gtest_add_tests_helper(BPChangingShape)
-bp3_bp4_gtest_add_tests_helper(BPWriteReadBlockInfo)
+bp3_bp4_gtest_add_tests_helper(WriteReadADIOS2)
+bp3_bp4_gtest_add_tests_helper(WriteReadADIOS2fstream)
+bp3_bp4_gtest_add_tests_helper(WriteReadADIOS2stdio)
+bp3_bp4_gtest_add_tests_helper(WriteReadAsStreamADIOS2)
+bp3_bp4_gtest_add_tests_helper(WriteReadAsStreamADIOS2_Threads)
+bp3_bp4_gtest_add_tests_helper(WriteReadAttributesADIOS2)
+bp3_bp4_gtest_add_tests_helper(FStreamWriteReadHighLevelAPI)
+bp3_bp4_gtest_add_tests_helper(WriteFlushRead)
+bp3_bp4_gtest_add_tests_helper(WriteMultiblockRead)
+bp3_bp4_gtest_add_tests_helper(WriteReadMultiblock)
+bp3_bp4_gtest_add_tests_helper(WriteReadVector)
+bp3_bp4_gtest_add_tests_helper(WriteReadAttributesMultirank)
+bp3_bp4_gtest_add_tests_helper(LargeMetadata)
+bp3_bp4_gtest_add_tests_helper(WriteMemorySelectionRead)
+bp3_bp4_gtest_add_tests_helper(WriteReadLocalVariables)
+bp3_bp4_gtest_add_tests_helper(WriteReadLocalVariablesSel)
+bp3_bp4_gtest_add_tests_helper(WriteReadLocalVariablesSelHighLevel)
+bp3_bp4_gtest_add_tests_helper(ChangingShape)
+bp3_bp4_gtest_add_tests_helper(WriteReadBlockInfo)
 
 if(ADIOS2_HAVE_MPI)
-  bp3_bp4_gtest_add_tests_helper(BPWriteAggregateRead) 
+  bp3_bp4_gtest_add_tests_helper(WriteAggregateRead) 
 endif()
 
 # BP3 only for now
-gtest_add_tests_helper(BPWriteReadVariableSpan ${test_mpi} Engine.BP. .BP3
+gtest_add_tests_helper(WriteReadVariableSpan ${test_mpi} BP Engine.BP. .BP3
   WORKING_DIRECTORY ${BP3_DIR} EXTRA_ARGS "BP3"
 )
-gtest_add_tests_helper(BPWriteNull ${test_mpi} Engine.BP. .BP3
+gtest_add_tests_helper(WriteNull ${test_mpi} BP Engine.BP. .BP3
   WORKING_DIRECTORY ${BP3_DIR} EXTRA_ARGS "BP3"
 )
 
 # BP4 only for now
-gtest_add_tests_helper(BPWriteAppendReadADIOS2 ${test_mpi} Engine.BP. .BP4
+gtest_add_tests_helper(WriteAppendReadADIOS2 ${test_mpi} BP Engine.BP. .BP4
   WORKING_DIRECTORY ${BP4_DIR} EXTRA_ARGS "BP4"
 )
-gtest_add_tests_helper(BPTimeAggregationADIOS2 ${test_mpi} Engine.BP. .BP4
+gtest_add_tests_helper(TimeAggregationADIOS2 ${test_mpi} BP Engine.BP. .BP4
   WORKING_DIRECTORY ${BP4_DIR} EXTRA_ARGS "BP4"
 )
diff --git a/testing/adios2/engine/bp/TestStreamWriteReadHighLevelAPI.cpp b/testing/adios2/engine/bp/TestBPFStreamWriteReadHighLevelAPI.cpp
similarity index 100%
rename from testing/adios2/engine/bp/TestStreamWriteReadHighLevelAPI.cpp
rename to testing/adios2/engine/bp/TestBPFStreamWriteReadHighLevelAPI.cpp
diff --git a/testing/adios2/engine/bp/operations/CMakeLists.txt b/testing/adios2/engine/bp/operations/CMakeLists.txt
index 45087468b7..e3192cc047 100644
--- a/testing/adios2/engine/bp/operations/CMakeLists.txt
+++ b/testing/adios2/engine/bp/operations/CMakeLists.txt
@@ -9,31 +9,31 @@ file(MAKE_DIRECTORY ${BP3_DIR})
 file(MAKE_DIRECTORY ${BP4_DIR})
 
 if(ADIOS2_HAVE_SZ)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadSZ)
+  bp3_bp4_gtest_add_tests_helper(WriteReadSZ)
 endif()
 
 
 if(ADIOS2_HAVE_ZFP)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadZfp)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadZfpHighLevelAPI)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadZfpConfig)
-  target_compile_definitions(Test.Engine.BP.BPWriteReadZfpConfig PRIVATE
+  bp3_bp4_gtest_add_tests_helper(WriteReadZfp)
+  bp3_bp4_gtest_add_tests_helper(WriteReadZfpHighLevelAPI)
+  bp3_bp4_gtest_add_tests_helper(WriteReadZfpConfig)
+  target_compile_definitions(Test.Engine.BP.WriteReadZfpConfig PRIVATE
     "XML_CONFIG_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
   )
 endif()
 
 if(ADIOS2_HAVE_MGARD)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadMGARD)
+  bp3_bp4_gtest_add_tests_helper(WriteReadMGARD)
 endif()
 
 if(ADIOS2_HAVE_BZip2)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadBZIP2)
+  bp3_bp4_gtest_add_tests_helper(WriteReadBZIP2)
 endif()
 
 if(ADIOS2_HAVE_PNG)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadPNG)
+  bp3_bp4_gtest_add_tests_helper(WriteReadPNG)
 endif()
 
 if(ADIOS2_HAVE_Blosc)
-  bp3_bp4_gtest_add_tests_helper(BPWriteReadBlosc)
+  bp3_bp4_gtest_add_tests_helper(WriteReadBlosc)
 endif()
diff --git a/testing/adios2/engine/common/CMakeLists.txt b/testing/adios2/engine/common/CMakeLists.txt
index ea44a104ea..31e4292c9c 100644
--- a/testing/adios2/engine/common/CMakeLists.txt
+++ b/testing/adios2/engine/common/CMakeLists.txt
@@ -16,35 +16,33 @@ endif()
 #   2nd arg: 1 for serialized execution, 0 for concurrent execution of Writer/Reader
 #   3rd arg: engine parameters
 
-gtest_add_tests_helper(Common ${test_mpi} "Engine." ".File"
+gtest_add_tests_helper(Common ${test_mpi} "" Engine. .File
   EXTRA_ARGS "File" "1"
 )
                 
 if(ADIOS2_HAVE_HDF5)
-  gtest_add_tests_helper(Common ${test_mpi} "Engine." ".HDF5"
+  gtest_add_tests_helper(Common ${test_mpi} "" Engine. .HDF5
     EXTRA_ARGS "HDF5" "1"
   )
 endif()
 
 if(ADIOS2_HAVE_SST)
-  gtest_add_tests_helper(Common ${test_mpi} "Engine." ".SST.FFS"
+  gtest_add_tests_helper(Common ${test_mpi} "" Engine. .SST.FFS
     EXTRA_ARGS "SST" "0" "MarshalMethod:FFS"
   )
-  gtest_add_tests_helper(Common ${test_mpi} "Engine." ".SST.BP"
+  gtest_add_tests_helper(Common ${test_mpi} "" Engine. .SST.BP
     EXTRA_ARGS "SST" "0" "MarshalMethod:BP"
   )
 endif()
 
 if(ADIOS2_HAVE_MPI)
-  gtest_add_tests_helper(Common TRUE "Engine." ".InSituMPI"
+  gtest_add_tests_helper(Common TRUE "" Engine. .InSituMPI
     EXTRA_ARGS "InSituMPI" "0"
   )
 endif()
 
 #if(ADIOS2_HAVE_DataMan)
-#gtest_add_tests(TARGET TestEngineCommon ${extra_test_args} 
-#                EXTRA_ARGS "DataMan" "0"
-#                TEST_SUFFIX _DataMan)
+#  gtest_add_tests_helper(Common TRUE "" Engine. .DataMan
+#    EXTRA_ARGS "DataMan" "0"
+#  )
 #endif()
-
-
diff --git a/testing/adios2/engine/dataman/CMakeLists.txt b/testing/adios2/engine/dataman/CMakeLists.txt
index 4c1a38bab9..d5cee229d5 100644
--- a/testing/adios2/engine/dataman/CMakeLists.txt
+++ b/testing/adios2/engine/dataman/CMakeLists.txt
@@ -3,39 +3,12 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-
-add_executable(TestDataManP2P2DMemSelect TestDataManP2P2DMemSelect.cpp)
-target_link_libraries(TestDataManP2P2DMemSelect adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManP2P2DMemSelect)
-
-add_executable(TestDataManP2P3DMemSelect TestDataManP2P3DMemSelect.cpp)
-target_link_libraries(TestDataManP2P3DMemSelect adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManP2P3DMemSelect)
-
-add_executable(TestDataManP2P1D TestDataManP2P1D.cpp)
-target_link_libraries(TestDataManP2P1D adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManP2P1D)
-
-add_executable(TestDataManP2PZfp2D TestDataManP2PZfp2D.cpp)
-target_link_libraries(TestDataManP2PZfp2D adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManP2PZfp2D)
-
-add_executable(TestDataManP2PSz2D TestDataManP2PSz2D.cpp)
-target_link_libraries(TestDataManP2PSz2D adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManP2PSz2D)
-
-add_executable(TestDataManSubscribe1D TestDataManSubscribe1D.cpp)
-target_link_libraries(TestDataManSubscribe1D adios2 gtest MPI::MPI_C)
-gtest_add_tests(TARGET TestDataManSubscribe1D)
-
-add_executable(TestDataManMpiBase TestDataManMpiBase.cpp)
-target_link_libraries(TestDataManMpiBase adios2 gtest MPI::MPI_C)
-add_test(
-    NAME DataManEngineTest.MpiBase
-    COMMAND ${CMAKE_COMMAND}
-    -DCMD1=TestDataManMpiBase.dataman
-    -DCMD2=$<TARGET_FILE:TestDataManMpiBase>
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/RunTest.cmake)
-
+if(ADIOS2_HAVE_MPI)
+  gtest_add_tests_helper(P2P2DMemSelect NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(P2P3DMemSelect NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(P2P1D NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(P2PZfp2D NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(P2PSz2D NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(Subscribe1D NOEXEC DataMan Engine.DataMan. "")
+  gtest_add_tests_helper(MpiBase TRUE DataMan Engine.DataMan. "")
 endif()
diff --git a/testing/adios2/engine/hdf5/CMakeLists.txt b/testing/adios2/engine/hdf5/CMakeLists.txt
index 8ec4e710cf..f0a18e285a 100644
--- a/testing/adios2/engine/hdf5/CMakeLists.txt
+++ b/testing/adios2/engine/hdf5/CMakeLists.txt
@@ -3,31 +3,22 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestNativeHDF5WriteRead TestNativeHDF5WriteRead.cpp)
-add_executable(TestHDF5WriteReadAsStream TestHDF5WriteReadAsStream.cpp)
-add_executable(TestStreamWriteReadHighLevelAPI_HDF5 TestStreamWriteReadHighLevelAPI_HDF5.cpp)
-add_executable(TestHDF5WriteReadAttributesADIOS2 TestHDF5WriteReadAttributesADIOS2.cpp)	
+gtest_add_tests_helper(WriteReadAsStream ${test_mpi} HDF5 Engine.HDF5. "")
+gtest_add_tests_helper(StreamWriteReadHighLevelAPI ${test_mpi}
+  HDF5 Engine.HDF5. ""
+)
+gtest_add_tests_helper(WriteReadAttributesADIOS2 ${test_mpi}
+  HDF5 Engine.HDF5. ""
+)
 
-# Workaround for multiple versions of FindHDF5
+gtest_add_tests_helper(NativeHDF5WriteRead ${test_mpi} "" Engine.HDF5. "")
 if(HDF5_C_INCLUDE_DIRS)
-  target_include_directories(TestNativeHDF5WriteRead PRIVATE ${HDF5_C_INCLUDE_DIRS})
+  target_include_directories(Test.Engine.HDF5.NativeHDF5WriteRead
+    PRIVATE ${HDF5_C_INCLUDE_DIRS}
+  )
 else()
-  target_include_directories(TestNativeHDF5WriteRead PRIVATE ${HDF5_INCLUDE_DIRS})
+  target_include_directories(Test.Engine.HDF5.NativeHDF5WriteRead
+    PRIVATE ${HDF5_INCLUDE_DIRS}
+  )
 endif()
-target_link_libraries(TestNativeHDF5WriteRead adios2 gtest_interface ${HDF5_C_LIBRARIES})
-target_link_libraries(TestHDF5WriteReadAsStream adios2 gtest_interface ${HDF5_C_LIBRARIES})
-target_link_libraries(TestStreamWriteReadHighLevelAPI_HDF5 adios2 gtest_interface ${HDF5_C_LIBRARIES})
-target_link_libraries(TestHDF5WriteReadAttributesADIOS2 adios2 gtest_interface ${HDF5_C_LIBRARIES})
-
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestNativeHDF5WriteRead MPI::MPI_C)
-  target_link_libraries(TestHDF5WriteReadAsStream MPI::MPI_C)
-  target_link_libraries(TestStreamWriteReadHighLevelAPI_HDF5 MPI::MPI_C)
-  target_link_libraries(TestHDF5WriteReadAttributesADIOS2 MPI::MPI_C)
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif()
-
-gtest_add_tests(TARGET TestNativeHDF5WriteRead ${extra_test_args})
-gtest_add_tests(TARGET TestHDF5WriteReadAsStream ${extra_test_args})
-gtest_add_tests(TARGET TestStreamWriteReadHighLevelAPI_HDF5 ${extra_test_args})
-gtest_add_tests(TARGET TestHDF5WriteReadAttributesADIOS2 ${extra_test_args})
+target_link_libraries(Test.Engine.HDF5.NativeHDF5WriteRead ${HDF5_C_LIBRARIES})
diff --git a/testing/adios2/engine/hdf5/TestStreamWriteReadHighLevelAPI_HDF5.cpp b/testing/adios2/engine/hdf5/TestHDF5StreamWriteReadHighLevelAPI.cpp
similarity index 100%
rename from testing/adios2/engine/hdf5/TestStreamWriteReadHighLevelAPI_HDF5.cpp
rename to testing/adios2/engine/hdf5/TestHDF5StreamWriteReadHighLevelAPI.cpp
diff --git a/testing/adios2/engine/inline/CMakeLists.txt b/testing/adios2/engine/inline/CMakeLists.txt
index bece9d3760..63be82cfa7 100644
--- a/testing/adios2/engine/inline/CMakeLists.txt
+++ b/testing/adios2/engine/inline/CMakeLists.txt
@@ -3,14 +3,4 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestInlineWriteRead TestInlineWriteRead.cpp)
-target_link_libraries(TestInlineWriteRead adios2 gtest)
-
-if(ADIOS2_HAVE_MPI)
-
-  target_link_libraries(TestInlineWriteRead MPI::MPI_C)
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-
-endif()
-
-gtest_add_tests(TARGET TestInlineWriteRead ${extra_test_args})
+gtest_add_tests_helper(WriteRead ${test_mpi} Inline Engine.Inline. "")
diff --git a/testing/adios2/engine/insitumpi/CMakeLists.txt b/testing/adios2/engine/insitumpi/CMakeLists.txt
index 8f3cfa2450..e66a988455 100644
--- a/testing/adios2/engine/insitumpi/CMakeLists.txt
+++ b/testing/adios2/engine/insitumpi/CMakeLists.txt
@@ -3,11 +3,4 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-
-add_executable(TestInSituMPIFunctionAssignPeers  TestInSituMPIFunctionAssignPeers.cpp)
-target_link_libraries(TestInSituMPIFunctionAssignPeers adios2 gtest_interface MPI::MPI_C)
-gtest_add_tests(TARGET TestInSituMPIFunctionAssignPeers ${extra_test_args})
-
-
-
+gtest_add_tests_helper(FunctionAssignPeers TRUE InSituMPI Engine.InSituMPI. "")
diff --git a/testing/adios2/engine/null/CMakeLists.txt b/testing/adios2/engine/null/CMakeLists.txt
index 47f9eeed95..3b22721c49 100644
--- a/testing/adios2/engine/null/CMakeLists.txt
+++ b/testing/adios2/engine/null/CMakeLists.txt
@@ -3,15 +3,4 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-
-add_executable(TestNullWriteRead TestNullWriteRead.cpp)
-target_link_libraries(TestNullWriteRead adios2 gtest)
-
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestNullWriteRead MPI::MPI_C)
-  
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif(ADIOS2_HAVE_MPI)
-
-gtest_add_tests(TARGET TestNullWriteRead ${extra_test_args})
-
+gtest_add_tests_helper(WriteRead ${test_mpi} Null Engine.Null. "")
diff --git a/testing/adios2/engine/nullcore/CMakeLists.txt b/testing/adios2/engine/nullcore/CMakeLists.txt
index 73ec2b907d..715a22c150 100644
--- a/testing/adios2/engine/nullcore/CMakeLists.txt
+++ b/testing/adios2/engine/nullcore/CMakeLists.txt
@@ -3,13 +3,4 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestNullCoreWrite TestNullCoreWrite.cpp)
-target_link_libraries(TestNullCoreWrite adios2 gtest)
-
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestNullCoreWrite MPI::MPI_C)
-  
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif()
-
-gtest_add_tests(TARGET TestNullCoreWrite ${extra_test_args} WORKING_DIRECTORY)
+gtest_add_tests_helper(Write ${test_mpi} NullCore Engine.NullCore. "")
diff --git a/testing/adios2/engine/skeleton/CMakeLists.txt b/testing/adios2/engine/skeleton/CMakeLists.txt
index d4e6a55180..3d99959983 100644
--- a/testing/adios2/engine/skeleton/CMakeLists.txt
+++ b/testing/adios2/engine/skeleton/CMakeLists.txt
@@ -3,52 +3,41 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
+include(ADIOSFunctions)
 
-add_executable(TestSkeletonWriter TestSkeletonWriter.cpp)
-target_link_libraries(TestSkeletonWriter adios2)
-
-add_executable(TestSkeletonReader TestSkeletonReader.cpp)
-target_link_libraries(TestSkeletonReader adios2)
+add_executable(Test.Engine.Skeleton.Writer TestSkeletonWriter.cpp)
+target_link_libraries(Test.Engine.Skeleton.Writer adios2)
 
+add_executable(Test.Engine.Skeleton.Reader TestSkeletonReader.cpp)
+target_link_libraries(Test.Engine.Skeleton.Reader adios2)
 
 if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestSkeletonWriter MPI::MPI_C)
-  target_link_libraries(TestSkeletonReader MPI::MPI_C)
+  target_link_libraries(Test.Engine.Skeleton.Writer MPI::MPI_C)
+  target_link_libraries(Test.Engine.Skeleton.Reader MPI::MPI_C)
   set(cmd_executor ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1)
 else()
   set(cmd_executor)
 endif()
 
-add_test(NAME Skeleton.Writer
-  COMMAND ${cmd_executor} $<TARGET_FILE:TestSkeletonWriter> 
+add_test(NAME Engine.Skeleton.Writer
+  COMMAND ${cmd_executor} $<TARGET_FILE:Test.Engine.Skeleton.Writer> 
 )
 
-add_test(NAME Skeleton.Reader
-  COMMAND ${cmd_executor} $<TARGET_FILE:TestSkeletonReader> 
+add_test(NAME Engine.Skeleton.Reader
+  COMMAND ${cmd_executor} $<TARGET_FILE:Test.Engine.Skeleton.Reader>
 )
+SetupTestPipeline(Engine.Skeleton "Writer;Reader" TRUE)
 
-if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Skeleton.Writer.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+add_test(NAME Engine.Skeleton.Writer.Validate
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSkeletonWriterExpectedOutput.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestSkeletonWriterOutput.txt
+    TestSkeletonWriterOutput.txt
 )
-set_property(TEST Skeleton.Writer.Validate
-  PROPERTY DEPENDS Skeleton.Writer
-)
-
+SetupTestPipeline(Engine.Skeleton "Writer;Writer.Validate" FALSE)
 
-add_test(NAME Skeleton.Reader.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+add_test(NAME Engine.Skeleton.Reader.Validate
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSkeletonReaderExpectedOutput.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestSkeletonReaderOutput.txt
+    TestSkeletonReaderOutput.txt
 )
-set_property(TEST Skeleton.Reader.Validate
-  PROPERTY DEPENDS Skeleton.Reader
-)
-
-
-endif(ADIOS2_HAVE_MPI)
-
-
+SetupTestPipeline(Engine.Skeleton "Reader;Reader.Validate" FALSE)
diff --git a/testing/adios2/engine/ssc/CMakeLists.txt b/testing/adios2/engine/ssc/CMakeLists.txt
index 6530a23996..592ea37dac 100644
--- a/testing/adios2/engine/ssc/CMakeLists.txt
+++ b/testing/adios2/engine/ssc/CMakeLists.txt
@@ -3,47 +3,18 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestSscBase TestSscBase.cpp)
-    target_link_libraries(TestSscBase adios2 gtest MPI::MPI_C)
-    add_test(
-        NAME TestSscBase
-        COMMAND ${CMAKE_COMMAND}
-        -DCMD1=TestSscBase.ssc
-        -DCMD2=$<TARGET_FILE:TestSscBase>
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/RunTest.cmake)
-endif()
+include(ADIOSFunctions)
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestSscNoAttributes TestSscNoAttributes.cpp)
-    target_link_libraries(TestSscNoAttributes adios2 gtest MPI::MPI_C)
-    add_test(
-        NAME TestSscNoAttributes
-        COMMAND ${CMAKE_COMMAND}
-        -DCMD1=TestSscNoAttributes.ssc
-        -DCMD2=$<TARGET_FILE:TestSscNoAttributes>
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/RunTest.cmake)
-endif()
+if(ADIOS2_HAVE_MPI)
+  gtest_add_tests_helper(Base TRUE Ssc Engine.SSC. "")
+  SetupTestPipeline(Engine.SSC.SscEngineTest.TestSscBase "" TRUE)
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestSscNoSelection TestSscNoSelection.cpp)
-    target_link_libraries(TestSscNoSelection adios2 gtest MPI::MPI_C)
-    add_test(
-        NAME TestSscNoSelection
-        COMMAND ${CMAKE_COMMAND}
-        -DCMD1=TestSscNoSelection.ssc
-        -DCMD2=$<TARGET_FILE:TestSscNoSelection>
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/RunTest.cmake)
-endif()
+  gtest_add_tests_helper(NoAttributes TRUE Ssc Engine.SSC. "")
+  SetupTestPipeline(Engine.SSC.SscEngineTest.TestSscNoAttributes "" TRUE)
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestSsc7d TestSsc7d.cpp)
-    target_link_libraries(TestSsc7d adios2 gtest MPI::MPI_C)
-    add_test(
-        NAME TestSsc7d
-        COMMAND ${CMAKE_COMMAND}
-        -DCMD1=TestSsc7d.ssc
-        -DCMD2=$<TARGET_FILE:TestSsc7d>
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/RunTest.cmake)
-endif()
+  gtest_add_tests_helper(NoSelection TRUE Ssc Engine.SSC. "")
+  SetupTestPipeline(Engine.SSC.SscEngineTest.TestSscNoSelection "" TRUE)
 
+  gtest_add_tests_helper(7d TRUE Ssc Engine.SSC. "")
+  SetupTestPipeline(Engine.SSC.SscEngineTest.TestSsc7d "" TRUE)
+endif()
diff --git a/testing/adios2/engine/table/CMakeLists.txt b/testing/adios2/engine/table/CMakeLists.txt
index 633ff4200c..94b201e98a 100644
--- a/testing/adios2/engine/table/CMakeLists.txt
+++ b/testing/adios2/engine/table/CMakeLists.txt
@@ -3,14 +3,15 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestTableMultiRank TestTableMultiRank.cpp)
-    target_link_libraries(TestTableMultiRank adios2 gtest MPI::MPI_C)
-    add_test(NAME TestTableMultiRank COMMAND "mpirun" "-n" "4" $<TARGET_FILE:TestTableMultiRank>)
-endif()
+if(ADIOS2_HAVE_Table)
+  gtest_add_tests_helper(MultiRank TRUE Table Engine.Table. "")
 
-if(ADIOS2_HAVE_MPI AND ADIOS2_HAVE_ZeroMQ)
-    add_executable(TestTableSingleRank TestTableSingleRank.cpp)
-    target_link_libraries(TestTableSingleRank adios2 gtest MPI::MPI_C)
-    add_test(NAME TestTableSingeRank COMMAND $<TARGET_FILE:TestTableSingleRank>)
+  add_executable(Test.Engine.Table.SingleRank TestTableSingleRank.cpp)
+  target_link_libraries(Test.Engine.Table.SingleRank
+    adios2 gtest MPI::MPI_C
+  )
+  gtest_add_tests(TARGET Test.Engine.Table.SingleRank
+    TEST_PREFIX Engine.Table.
+    EXEC_WRAPPER ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1
+  )
 endif()
diff --git a/testing/adios2/helper/CMakeLists.txt b/testing/adios2/helper/CMakeLists.txt
index 45f90b0d0d..c28326f6c3 100644
--- a/testing/adios2/helper/CMakeLists.txt
+++ b/testing/adios2/helper/CMakeLists.txt
@@ -3,18 +3,6 @@
 #accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestHelperString TestHelperStrings.cpp)
-target_link_libraries(TestHelperString adios2 gtest)
-
-gtest_add_tests(TARGET TestHelperString ${extra_test_args})
-
-add_executable(TestDivideBlock TestDivideBlock.cpp)
-target_link_libraries(TestDivideBlock adios2 gtest)
-
-gtest_add_tests(TARGET TestDivideBlock ${extra_test_args})
-
-
-add_executable(TestMinMaxs TestMinMaxs.cpp)
-target_link_libraries(TestMinMaxs adios2 gtest)
-
-gtest_add_tests(TARGET TestMinMaxs ${extra_test_args})
+gtest_add_tests_helper(Strings FALSE Helper Helper. "")
+gtest_add_tests_helper(DivideBlock FALSE "" Helper. "")
+gtest_add_tests_helper(MinMaxs FALSE "" Helper. "")
diff --git a/testing/adios2/interface/CMakeLists.txt b/testing/adios2/interface/CMakeLists.txt
index 4b8f5a9b56..997bd37882 100644
--- a/testing/adios2/interface/CMakeLists.txt
+++ b/testing/adios2/interface/CMakeLists.txt
@@ -3,37 +3,13 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestADIOSInterface TestADIOSInterface.cpp)
-target_link_libraries(TestADIOSInterface adios2 gtest)
-
-add_executable(TestADIOSInterfaceWrite TestADIOSInterfaceWrite.cpp)
-target_link_libraries(TestADIOSInterfaceWrite adios2 gtest)
-
-add_executable(TestADIOSDefineVariable TestADIOSDefineVariable.cpp)
-target_link_libraries(TestADIOSDefineVariable adios2 gtest)
-
-add_executable(TestADIOSDefineAttribute TestADIOSDefineAttribute.cpp)
-target_link_libraries(TestADIOSDefineAttribute adios2 gtest)
-
-add_executable(TestADIOSSelection TestADIOSSelection.cpp)
-target_link_libraries(TestADIOSSelection adios2 gtest)
-
-add_executable(TestADIOSNoMpi TestADIOSNoMpi.cpp)
-target_link_libraries(TestADIOSNoMpi adios2 gtest)
-
+gtest_add_tests_helper(Interface ${test_mpi} ADIOS Interface. "")
+gtest_add_tests_helper(Write ${test_mpi} ADIOSInterface Interface. "")
+gtest_add_tests_helper(DefineVariable ${test_mpi} ADIOS Interface. "")
+gtest_add_tests_helper(DefineAttribute ${test_mpi} ADIOS Interface. "")
 if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestADIOSInterface MPI::MPI_C)
-  target_link_libraries(TestADIOSInterfaceWrite MPI::MPI_C)
-  target_link_libraries(TestADIOSDefineVariable MPI::MPI_C)
-  target_link_libraries(TestADIOSDefineAttribute MPI::MPI_C)
-  target_link_libraries(TestADIOSSelection MPI::MPI_C)
-
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
+  gtest_add_tests_helper(Selection NOEXEC ADIOS Interface. "")
+else()
+  gtest_add_tests_helper(Selection FALSE ADIOS Interface. "")
 endif()
-
-gtest_add_tests(TARGET TestADIOSInterface ${extra_test_args})
-gtest_add_tests(TARGET TestADIOSInterfaceWrite ${extra_test_args})
-gtest_add_tests(TARGET TestADIOSDefineVariable ${extra_test_args})
-gtest_add_tests(TARGET TestADIOSDefineAttribute ${extra_test_args})
-gtest_add_tests(TARGET TestADIOSSelection)
-gtest_add_tests(TARGET TestADIOSNoMpi)
+gtest_add_tests_helper(NoMpi FALSE ADIOS Interface. "")
diff --git a/testing/adios2/performance/manyvars/CMakeLists.txt b/testing/adios2/performance/manyvars/CMakeLists.txt
index f9331ca982..a70af46676 100644
--- a/testing/adios2/performance/manyvars/CMakeLists.txt
+++ b/testing/adios2/performance/manyvars/CMakeLists.txt
@@ -3,21 +3,11 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-set(extra_test_args)
-
-add_executable(TestManyVars manyVars.cpp)
-target_link_libraries(TestManyVars adios2 gtest_interface)
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestManyVars MPI::MPI_C)
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif()
-
-gtest_add_tests(TARGET TestManyVars ${extra_test_args})
+gtest_add_tests_helper(ManyVars ${test_mpi} "" Performance. "")
 
 if(ADIOS2_HAVE_MPI)
   # Pure C code, not added to test, 
   # just for executing manually for performance studies
-  add_executable(PerfManyVars manyVars.c)
-  target_link_libraries(PerfManyVars adios2)
-  target_link_libraries(PerfManyVars MPI::MPI_C)
+  add_executable(PerfManyVars PerfManyVars.c)
+  target_link_libraries(PerfManyVars adios2 MPI::MPI_C)
 endif()
diff --git a/testing/adios2/performance/manyvars/manyVars.c b/testing/adios2/performance/manyvars/PerfManyVars.c
similarity index 100%
rename from testing/adios2/performance/manyvars/manyVars.c
rename to testing/adios2/performance/manyvars/PerfManyVars.c
diff --git a/testing/adios2/performance/manyvars/manyVars.cpp b/testing/adios2/performance/manyvars/TestManyVars.cpp
similarity index 100%
rename from testing/adios2/performance/manyvars/manyVars.cpp
rename to testing/adios2/performance/manyvars/TestManyVars.cpp
diff --git a/testing/adios2/performance/query/CMakeLists.txt b/testing/adios2/performance/query/CMakeLists.txt
index 6a0e63dde1..989380933b 100644
--- a/testing/adios2/performance/query/CMakeLists.txt
+++ b/testing/adios2/performance/query/CMakeLists.txt
@@ -3,14 +3,4 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-set(extra_test_args)
-
-add_executable(TestQuery TestBPQuery.cpp)
-target_link_libraries(TestQuery adios2 gtest_interface)
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestQuery MPI::MPI_C)
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif()
-
-gtest_add_tests(TARGET TestQuery ${extra_test_args})
-
+gtest_add_tests_helper(Query ${test_mpi} BP Performance. "")
diff --git a/testing/adios2/xml/CMakeLists.txt b/testing/adios2/xml/CMakeLists.txt
index 9bf82db76d..947dd6328b 100644
--- a/testing/adios2/xml/CMakeLists.txt
+++ b/testing/adios2/xml/CMakeLists.txt
@@ -3,16 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestXMLConfig TestXMLConfig.cpp)
-target_link_libraries(TestXMLConfig adios2 gtest)
-target_compile_definitions(TestXMLConfig PRIVATE
+gtest_add_tests_helper(XMLConfig ${test_mpi} "" "" "")
+target_compile_definitions(Test.XMLConfig PRIVATE
   "XML_CONFIG_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
 )
-
-if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestXMLConfig MPI::MPI_C)
-
-  set(extra_test_args EXEC_WRAPPER ${MPIEXEC_COMMAND})
-endif()
-
-gtest_add_tests(TARGET TestXMLConfig ${extra_test_args})
diff --git a/testing/examples/heatTransfer/TestBPFileMx1.cmake b/testing/examples/heatTransfer/TestBPFileMx1.cmake
index a6a877ccff..ba26ff7e2b 100644
--- a/testing/examples/heatTransfer/TestBPFileMx1.cmake
+++ b/testing/examples/heatTransfer/TestBPFileMx1.cmake
@@ -31,7 +31,7 @@ add_test(NAME HeatTransfer.BP3.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -66,7 +66,7 @@ add_test(NAME HeatTransfer.BP4.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake b/testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake
index d57d204bc3..5e62e95964 100644
--- a/testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake
+++ b/testing/examples/heatTransfer/TestBPFileMx1_zfp.cmake
@@ -30,7 +30,7 @@ add_test(NAME HeatTransfer.BP3.zfp.Mx1.Dump
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
 
-SetupTestPipeline(HeatTransfer.BP3.zfp.Mx1 "Write;Read;Dump;Validate" TRUE)
+SetupTestPipeline(HeatTransfer.BP3.zfp.Mx1 "Write;Read;Dump" TRUE)
 
 #############################################################################
 add_test(NAME HeatTransfer.BP4.zfp.Mx1.Write
@@ -58,4 +58,4 @@ add_test(NAME HeatTransfer.BP4.zfp.Mx1.Dump
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
 
-SetupTestPipeline(HeatTransfer.BP4.zfp.Mx1 "Write;Read;Dump;Validate" TRUE)
+SetupTestPipeline(HeatTransfer.BP4.zfp.Mx1 "Write;Read;Dump" TRUE)
diff --git a/testing/examples/heatTransfer/TestBPFileMxM.cmake b/testing/examples/heatTransfer/TestBPFileMxM.cmake
index 2d740919ba..e125083e2e 100644
--- a/testing/examples/heatTransfer/TestBPFileMxM.cmake
+++ b/testing/examples/heatTransfer/TestBPFileMxM.cmake
@@ -33,7 +33,7 @@ add_test(NAME HeatTransfer.BP3.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -68,7 +68,7 @@ add_test(NAME HeatTransfer.BP4.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestBPFileMxN.cmake b/testing/examples/heatTransfer/TestBPFileMxN.cmake
index 066b7b82d7..c3e3622b7d 100644
--- a/testing/examples/heatTransfer/TestBPFileMxN.cmake
+++ b/testing/examples/heatTransfer/TestBPFileMxN.cmake
@@ -33,7 +33,7 @@ add_test(NAME HeatTransfer.BP3.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -68,7 +68,7 @@ add_test(NAME HeatTransfer.BP4.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestInsituMPIMx1.cmake b/testing/examples/heatTransfer/TestInsituMPIMx1.cmake
index 5119ccf312..eadd6bc1f6 100644
--- a/testing/examples/heatTransfer/TestInsituMPIMx1.cmake
+++ b/testing/examples/heatTransfer/TestInsituMPIMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestInsituMPIMxM.cmake b/testing/examples/heatTransfer/TestInsituMPIMxM.cmake
index 351c407a34..4276ca9b10 100644
--- a/testing/examples/heatTransfer/TestInsituMPIMxM.cmake
+++ b/testing/examples/heatTransfer/TestInsituMPIMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestInsituMPIMxN.cmake b/testing/examples/heatTransfer/TestInsituMPIMxN.cmake
index 246a24709f..cde73219f4 100644
--- a/testing/examples/heatTransfer/TestInsituMPIMxN.cmake
+++ b/testing/examples/heatTransfer/TestInsituMPIMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTBPMx1.cmake b/testing/examples/heatTransfer/TestSSTBPMx1.cmake
index 98a96e20a4..81158a7597 100644
--- a/testing/examples/heatTransfer/TestSSTBPMx1.cmake
+++ b/testing/examples/heatTransfer/TestSSTBPMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTBPMxM.cmake b/testing/examples/heatTransfer/TestSSTBPMxM.cmake
index 30de47c6af..361ae3565e 100644
--- a/testing/examples/heatTransfer/TestSSTBPMxM.cmake
+++ b/testing/examples/heatTransfer/TestSSTBPMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTBPMxN.cmake b/testing/examples/heatTransfer/TestSSTBPMxN.cmake
index 422447ddcb..48a7dd69a7 100644
--- a/testing/examples/heatTransfer/TestSSTBPMxN.cmake
+++ b/testing/examples/heatTransfer/TestSSTBPMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake b/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake
index f5484d0d3e..bbce26e5ff 100644
--- a/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake
+++ b/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.RDMA.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.RDMA.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTFFSMx1.cmake b/testing/examples/heatTransfer/TestSSTFFSMx1.cmake
index 8aec3ba558..1c8338a800 100644
--- a/testing/examples/heatTransfer/TestSSTFFSMx1.cmake
+++ b/testing/examples/heatTransfer/TestSSTFFSMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTFFSMxM.cmake b/testing/examples/heatTransfer/TestSSTFFSMxM.cmake
index 5d33698336..a90b5fb06a 100644
--- a/testing/examples/heatTransfer/TestSSTFFSMxM.cmake
+++ b/testing/examples/heatTransfer/TestSSTFFSMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTFFSMxN.cmake b/testing/examples/heatTransfer/TestSSTFFSMxN.cmake
index 834c7232f7..ff95d70530 100644
--- a/testing/examples/heatTransfer/TestSSTFFSMxN.cmake
+++ b/testing/examples/heatTransfer/TestSSTFFSMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake b/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake
index c494959c2c..e470ebbaa5 100644
--- a/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake
+++ b/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
diff --git a/testing/utils/changingshape/CMakeLists.txt b/testing/utils/changingshape/CMakeLists.txt
index f70a0ae379..88b22e7973 100644
--- a/testing/utils/changingshape/CMakeLists.txt
+++ b/testing/utils/changingshape/CMakeLists.txt
@@ -3,62 +3,56 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestUtilsChangingShape TestUtilsChangingShape.cpp)
-target_link_libraries(TestUtilsChangingShape adios2)
+include(ADIOSFunctions)
+
+add_executable(Test.Utils.ChangingShape TestUtilsChangingShape.cpp)
+target_link_libraries(Test.Utils.ChangingShape adios2)
 
 if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestUtilsChangingShape MPI::MPI_C)
+  target_link_libraries(Test.Utils.ChangingShape MPI::MPI_C)
   set(cmd_executor ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1)
 else()
   set(cmd_executor)
 endif()
 
 add_test(NAME Utils.ChangingShape
-  COMMAND ${cmd_executor} $<TARGET_FILE:TestUtilsChangingShape>
+  COMMAND ${cmd_executor} $<TARGET_FILE:Test.Utils.ChangingShape>
 )
-# This test produces TestUtilsChangingShape.bp
-
 
+########################################
 # bpls -la to screen for testing
-add_test(NAME Utils.ChangingShape.Bpls.la.Screen
+########################################
+add_test(NAME Utils.ChangingShape.Screen
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-la
     -DINPUT_FILE=TestUtilsChangingShape.bp
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.la.Screen
-  PROPERTY DEPENDS Utils.ChangingShape
-)
 
-
-# bpls -la
-add_test(NAME Utils.ChangingShape.Bpls.la.Dump
+add_test(NAME Utils.ChangingShape.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-la
     -DINPUT_FILE=TestUtilsChangingShape.bp
     -DOUTPUT_FILE=TestUtilsChangingShape.bplsla.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.la.Dump
-  PROPERTY DEPENDS Utils.ChangingShape
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.ChangingShape.Bpls.la.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsla.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsChangingShape.bplsla.result.txt
-)
-set_property(TEST Utils.ChangingShape.Bpls.la.Validate
-  PROPERTY DEPENDS Utils.ChangingShape.Bpls.la.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.ChangingShape.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsla.expected.txt
+      TestUtilsChangingShape.bplsla.result.txt
+  )
+  SetupTestPipeline(Utils.ChangingShape ";Screen;Dump;Validate" TRUE)
+else()
+  SetupTestPipeline(Utils.ChangingShape ";Screen;Dump" TRUE)
+endif()
 
 
+########################################
 # bpls -ld  AlternatingStepsAndChangingShapeVar
-add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Dump
+########################################
+add_test(NAME Utils.ChangingShape.AlternatingStepsAndChangingShapeVar.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-ld
     -DARG2=AlternatingStepsAndChangingShapeVar
@@ -66,25 +60,27 @@ add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Dum
     -DOUTPUT_FILE=TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Dump
-  PROPERTY DEPENDS Utils.ChangingShape
-)
 
 if(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.ChangingShape.AlternatingStepsAndChangingShapeVar.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.expected.txt
+      TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.result.txt
+  )
+  SetupTestPipeline(Utils.ChangingShape
+    ";AlternatingStepsAndChangingShapeVar.Dump;AlternatingStepsAndChangingShapeVar.Validate"
+    FALSE
+  )
+else()
+  SetupTestPipeline(Utils.ChangingShape
+    ";AlternatingStepsAndChangingShapeVar.Dump" FALSE
+  )
+endif()
 
-add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.result.txt
-)
-set_property(TEST Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Validate
-  PROPERTY DEPENDS Utils.ChangingShape.Bpls.ldAlternatingStepsAndChangingShapeVar.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
-
+########################################
 # bpls -ld AlternatingStepsVar -s "1,0,0" -c "3,-1,-1" -n 8
-add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Dump
+########################################
+add_test(NAME Utils.ChangingShape.AlternatingStepsVarSelection.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-ld
     -DARG2=AlternatingStepsVar
@@ -98,25 +94,27 @@ add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Dump
     -DOUTPUT_FILE=TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Dump
-  PROPERTY DEPENDS Utils.ChangingShape
-)
 
 if(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.ChangingShape.AlternatingStepsVarSelection.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.expected.txt
+      TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.result.txt
+  )
+  SetupTestPipeline(Utils.ChangingShape
+    ";AlternatingStepsVarSelection.Dump;AlternatingStepsVarSelection.Validate"
+    FALSE
+  )
+else()
+  SetupTestPipeline(Utils.ChangingShape
+    ";AlternatingStepsVarSelection.Dump" FALSE
+  )
+endif()
 
-add_test(NAME Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.result.txt
-)
-set_property(TEST Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Validate
-  PROPERTY DEPENDS Utils.ChangingShape.Bpls.ldAlternatingStepsVarSelection.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
-
+########################################
 # bpls -ld ChangingShapeVar -s "5,0,0" -c "1,-1,-1" -n 12
-add_test(NAME Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Dump
+########################################
+add_test(NAME Utils.ChangingShape.ChangingShapeVarOneStep.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-ld
     -DARG2=ChangingShapeVar
@@ -130,26 +128,24 @@ add_test(NAME Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Dump
     -DOUTPUT_FILE=TestUtilsChangingShape.bplsldChangingShapeVarOneStep.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Dump
-  PROPERTY DEPENDS Utils.ChangingShape
-)
-
 if(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.ChangingShape.ChangingShapeVarOneStep.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldChangingShapeVarOneStep.expected.txt
+      TestUtilsChangingShape.bplsldChangingShapeVarOneStep.result.txt
+  )
+  SetupTestPipeline(Utils.ChangingShape
+    ";ChangingShapeVarOneStep.Dump;ChangingShapeVarOneStep.Validate"
+    FALSE
+  )
+else()
+  SetupTestPipeline(Utils.ChangingShape ";ChangingShapeVarOneStep.Dump" FALSE)
+endif()
 
-add_test(NAME Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldChangingShapeVarOneStep.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsChangingShape.bplsldChangingShapeVarOneStep.result.txt
-)
-set_property(TEST Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Validate
-  PROPERTY DEPENDS Utils.ChangingShape.Bpls.ldChangingShapeVarOneStep.Dump
-)
-
-
-endif(ADIOS2_HAVE_MPI)
-
+########################################
 # bpls -ld FixedShapeVar -s "5,0,0" -c "10,-1,-1"
-add_test(NAME Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Dump
+########################################
+add_test(NAME Utils.ChangingShape.FixedShapeVarTooManySteps.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-ld
     -DARG2=FixedShapeVar
@@ -161,22 +157,19 @@ add_test(NAME Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Dump
     -DOUTPUT_FILE=TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Dump
-  PROPERTY DEPENDS Utils.ChangingShape
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.result.txt
-)
-set_property(TEST Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Validate
-  PROPERTY DEPENDS Utils.ChangingShape.Bpls.ldFixedShapeVarTooManySteps.Dump
-)
-
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.ChangingShape.FixedShapeVarTooManySteps.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.expected.txt
+      TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.result.txt
+  )
+  SetupTestPipeline(Utils.ChangingShape
+    ";FixedShapeVarTooManySteps.Dump;FixedShapeVarTooManySteps.Validate"
+    FALSE
+  )
+else()
+  SetupTestPipeline(Utils.ChangingShape ";FixedShapeVarTooManySteps.Dump" FALSE)
+endif()
 
 
diff --git a/testing/utils/cwriter/CMakeLists.txt b/testing/utils/cwriter/CMakeLists.txt
index c8c652ad8f..95130d6876 100644
--- a/testing/utils/cwriter/CMakeLists.txt
+++ b/testing/utils/cwriter/CMakeLists.txt
@@ -3,191 +3,174 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-add_executable(TestUtilsCWriter TestUtilsCWriter.c)
-target_link_libraries(TestUtilsCWriter adios2)
+include(ADIOSFunctions)
+
+add_executable(Test.Utils.CWriter TestUtilsCWriter.c)
+target_link_libraries(Test.Utils.CWriter adios2)
 
 if(ADIOS2_HAVE_MPI)
-  target_link_libraries(TestUtilsCWriter MPI::MPI_C)
+  target_link_libraries(Test.Utils.CWriter MPI::MPI_C)
   set(cmd_executor ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1)
 else()
   set(cmd_executor)
 endif()
 
-add_test(NAME Utils.C.Writer
-  COMMAND ${cmd_executor} $<TARGET_FILE:TestUtilsCWriter>
+add_test(NAME Utils.CWriter
+  COMMAND ${cmd_executor} $<TARGET_FILE:Test.Utils.CWriter>
 )
 # This test produces TestUtilsCWriter.bp
 
+########################################
 # bpls -h
-add_test(NAME Utils.C.Writer.Bpls.h.Dump
+########################################
+add_test(NAME Utils.CWriter.Bpls.h.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-h
     -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsh.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.h.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.C.Writer.Bpls.h.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsh.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsh.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.h.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.h.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.h.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsh.expected.txt
+      TestUtilsCWriter.bplsh.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter ";Bpls.h.Dump;Bpls.h.Validate" TRUE)
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.h.Dump" TRUE)
+endif()
 
 
-# bpls -la to screen for testing
-add_test(NAME Utils.C.Writer.Bpls.la.Screen
+########################################
+# bpls -la
+########################################
+add_test(NAME Utils.CWriter.Bpls.la.Screen
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-la
     -DINPUT_FILE=TestUtilsCWriter.bp
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.la.Screen
-  PROPERTY DEPENDS Utils.C.Writer
-)
-
 
 # bpls -la
-add_test(NAME Utils.C.Writer.Bpls.la.Dump
+add_test(NAME Utils.CWriter.Bpls.la.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-la
     -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsla.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.la.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.C.Writer.Bpls.la.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsla.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsla.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.la.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.la.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.la.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsla.expected.txt
+      TestUtilsCWriter.bplsla.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter
+    ";Bpls.la.Screen;Bpls.la.Dump;Bpls.la.Validate" FALSE
+  )
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.la.Screen;Bpls.la.Dump" FALSE)
+endif()
 
 
+########################################
 # bpls -Al
-add_test(NAME Utils.C.Writer.Bpls.Al.Dump
+########################################
+add_test(NAME Utils.CWriter.Bpls.Al.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-Al
     -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsAl.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.Al.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.Al.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsAl.expected.txt
+      TestUtilsCWriter.bplsAl.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter ";Bpls.Al.Dump;Bpls.Al.Validate" FALSE)
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.Al.Dump" FALSE)
+endif()
 
-add_test(NAME Utils.C.Writer.Bpls.Al.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsAl.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsAl.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.Al.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.Al.Dump
-)
-
-endif(ADIOS2_HAVE_MPI)
-
+########################################
 # bpls -ldDav
-add_test(NAME Utils.C.Writer.Bpls.ldDav.Dump
+########################################
+add_test(NAME Utils.CWriter.Bpls.ldDav.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1='-ldDav'
     -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsldDav.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.ldDav.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.C.Writer.Bpls.ldDav.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDav.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsldDav.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.ldDav.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.ldDav.Dump
-)
-
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.ldDav.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDav.expected.txt
+      TestUtilsCWriter.bplsldDav.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter ";Bpls.ldDav.Dump;Bpls.ldDav.Validate" FALSE)
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.ldDav.Dump" FALSE)
+endif()
 
 
+########################################
 # bpls -ldDavvv
-add_test(NAME Utils.C.Writer.Bpls.ldDavvv.Dump
+########################################
+add_test(NAME Utils.CWriter.Bpls.ldDavvv.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1='-ldDavvv'
     -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsldDavvv.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.ldDavvv.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.C.Writer.Bpls.ldDavvv.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDavvv.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsldDavvv.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.ldDavvv.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.ldDavvv.Dump
-)
-
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.ldDavvv.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDavvv.expected.txt
+      TestUtilsCWriter.bplsldDavvv.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter
+    ";Bpls.ldDavvv.Dump;Bpls.ldDavvv.Validate" FALSE
+  )
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.ldDavvv.Dump" FALSE)
+endif()
 
 
+########################################
 # bpls -ld varI16 -n 10
-add_test(NAME Utils.C.Writer.Bpls.ldvarI16.Dump
+########################################
+add_test(NAME Utils.CWriter.Bpls.ldvarI16.Dump
   COMMAND ${CMAKE_COMMAND}
     -DARG1=-ld
     -DARG2=varI16
     -DARG3=-n
     -DARG4=10
-   -DINPUT_FILE=TestUtilsCWriter.bp
+    -DINPUT_FILE=TestUtilsCWriter.bp
     -DOUTPUT_FILE=TestUtilsCWriter.bplsldvarI16.result.txt
     -P "${PROJECT_BINARY_DIR}/$<CONFIG>/bpls.cmake"
 )
-set_property(TEST Utils.C.Writer.Bpls.ldvarI16.Dump
-  PROPERTY DEPENDS Utils.C.Writer
-)
 
 if(ADIOS2_HAVE_MPI)
-
-add_test(NAME Utils.C.Writer.Bpls.ldvarI16.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
-    ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldvarI16.expected.txt
-    ${CMAKE_CURRENT_BINARY_DIR}/TestUtilsCWriter.bplsldvarI16.result.txt
-)
-set_property(TEST Utils.C.Writer.Bpls.ldvarI16.Validate
-  PROPERTY DEPENDS Utils.C.Writer.Bpls.ldvarI16.Dump
-)
-
-
-endif(ADIOS2_HAVE_MPI)
+  add_test(NAME Utils.CWriter.Bpls.ldvarI16.Validate
+    COMMAND ${DIFF_EXECUTABLE} -uw
+      ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldvarI16.expected.txt
+      TestUtilsCWriter.bplsldvarI16.result.txt
+  )
+  SetupTestPipeline(Utils.CWriter
+    ";Bpls.ldvarI16.Dump;Bpls.ldvarI16.Validate" FALSE
+  )
+else()
+  SetupTestPipeline(Utils.CWriter ";Bpls.ldvarI16.Dump" FALSE)
+endif()
 
 
diff --git a/testing/utils/iotest/CMakeLists.txt b/testing/utils/iotest/CMakeLists.txt
index 611d8bc4b1..0bff002f77 100644
--- a/testing/utils/iotest/CMakeLists.txt
+++ b/testing/utils/iotest/CMakeLists.txt
@@ -28,7 +28,7 @@ add_test(NAME Utils.IOTest.Pipe2.BP.Write.Dump
 )
 
 add_test(NAME Utils.IOTest.Pipe2.BP.Write.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.BP.Write.bpls.txt
     IOTest.Pipe2.BP.Write.bpls.txt
 )
@@ -59,7 +59,7 @@ add_test(NAME Utils.IOTest.Pipe2.BP.Read.Dump
 )
 
 add_test(NAME Utils.IOTest.Pipe2.BP.Read.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.BP.Read.bpls.txt
     IOTest.Pipe2.BP.Read.bpls.txt
 )
@@ -91,7 +91,7 @@ if(ADIOS2_HAVE_HDF5)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.HDF5.Write.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.HDF5.Write.bpls.txt
       IOTest.Pipe2.HDF5.Write.bpls.txt
   )
@@ -122,7 +122,7 @@ if(ADIOS2_HAVE_HDF5)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.HDF5.Read.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.HDF5.Read.bpls.txt
       IOTest.Pipe2.HDF5.Read.bpls.txt
   )
@@ -161,7 +161,7 @@ if(MPIEXEC_MAX_NUMPROCS GREATER 1)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.InSituMPI.bpls.txt
       IOTest.Pipe2.InSituMPI.bpls.txt
   )
@@ -196,7 +196,7 @@ if(MPIEXEC_MAX_NUMPROCS GREATER 1)
     )
 
     add_test(NAME Utils.IOTest.Pipe2.SST.Validate
-      COMMAND ${DIFF_EXECUTABLE} -u
+      COMMAND ${DIFF_EXECUTABLE} -uw
         ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.SST.bpls.txt
         IOTest.Pipe2.SST.bpls.txt
     )