diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c3d78701d..f131cbe49e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,7 +436,7 @@ endif()
 # Here we disable them completely.
 option(NETCDF_ENABLE_NETCDF_4 "Use HDF5." OFF)
 option(NETCDF_ENABLE_NETCDF4 "Use HDF5." OFF)
-if(NETCDF_ENABLE_HDF5 OR NETCDF_ENABLE_NETCDF_4)
+if(NETCDF_ENABLE_NETCDF4 OR NETCDF_ENABLE_NETCDF_4)
   message(FATAL_ERROR "NETCDF_ENABLE_NETCDF4/NETCDF_ENABLE_NETCDF_4 are obsolete. Please use NETCDF_ENABLE_HDF5 instead.")
 endif()
 
@@ -1476,6 +1476,9 @@ if(NETCDF_ENABLE_TESTS)
   if(NETCDF_ENABLE_NCZARR)
     include_directories(nczarr_test)
     add_subdirectory(nczarr_test)
+    if(NETCDF_ENABLE_S3)
+      add_subdirectory(v3_nczarr_test)
+    endif()
   endif()
 endif()
 
diff --git a/cmake/netcdf_functions_macros.cmake b/cmake/netcdf_functions_macros.cmake
index b6b29a88d3..233ffb6a98 100644
--- a/cmake/netcdf_functions_macros.cmake
+++ b/cmake/netcdf_functions_macros.cmake
@@ -356,3 +356,16 @@ function(is_disabled feature ret_val)
     set("NC_${ret_val}" 1 PARENT_SCOPE)
   endif(${feature})
 endfunction()
+
+
+##################################################
+# Wrap existing macros to prepend v3_ in order to avoid
+# "...another target with the same name already exists" errors.
+
+macro(v3_build_bin_test_with_util_lib F UTIL_LIB)
+  build_bin_test_with_util_lib("v3_${F}" "v3_${UTIL_LIB}")
+endmacro()
+
+macro(v3_add_bin_test_with_util_lib PREFIX F UTIL_LIB)
+  add_bin_test_with_util_lib(${PREFIX} "v3_${F}" "v3_${UTIL_LIB}")
+endmacro()
diff --git a/nczarr_test/CMakeLists.txt b/nczarr_test/CMakeLists.txt
index 76e4ce9cef..3fcae97554 100644
--- a/nczarr_test/CMakeLists.txt
+++ b/nczarr_test/CMakeLists.txt
@@ -130,9 +130,6 @@ IF(NETCDF_ENABLE_TESTS)
   build_bin_test_with_util_lib(zmapio ut_util)
   if(USE_HDF5)
     build_bin_test_with_util_lib(ncdumpchunks ut_util)
-    target_include_directories(ncdumpchunks PUBLIC ../libnczarr)
-    target_include_directories(ncdumpchunks PUBLIC HDF5::HDF5)
-    target_link_libraries(ncdumpchunks netcdf HDF5::HDF5 hdf5::hdf5_hl)
   endif()
 
   IF(NETCDF_ENABLE_S3 AND NOT WITH_S3_TESTING STREQUAL "NO")
diff --git a/nczarr_test/ncdumpchunks.c b/nczarr_test/ncdumpchunks.c
index c7557a6234..8ec2376fe9 100644
--- a/nczarr_test/ncdumpchunks.c
+++ b/nczarr_test/ncdumpchunks.c
@@ -23,7 +23,7 @@
 #include "ncpathmgr.h"
 #include "nclog.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif
diff --git a/nczarr_test/test_filter_vlen.c b/nczarr_test/test_filter_vlen.c
index 5805ffe8e7..caf6761709 100644
--- a/nczarr_test/test_filter_vlen.c
+++ b/nczarr_test/test_filter_vlen.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 #include "netcdf.h"
diff --git a/v3_nczarr_test/CMakeLists.txt b/v3_nczarr_test/CMakeLists.txt
index b5b2f35482..327de955b3 100644
--- a/v3_nczarr_test/CMakeLists.txt
+++ b/v3_nczarr_test/CMakeLists.txt
@@ -11,22 +11,15 @@ set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 # So provide a Makefile target to update the files here with copies
 # of those in nczarr test and elsewhere.
 
-# Sources that are copies of same files from nczarr_test
-set(TESTFILES_NCZARR test_nczarr.sh test_chunking.c test_filter_vlen.c test_h5_endians.c test_put_vars_two_unlim_dim.c test_quantize.c test_unlim_vars.c tst_pure_awssdk.cpp)
-set(TESTFILES_NCZARR ${TESTFILES_NCZARR} zhex.c zisjson.c zmapio.c zs3parse.c s3util.c ncdumpchunks.c)
-set(TESTFILES_NCZARR ${TESTFILES_NCZARR} run_chunkcases.sh run_corrupt.sh run_external.sh run_fillonlyz.sh run_filter.sh run_filterinstall.sh run_filter_misc.sh run_filter_vlen.sh run_interop.sh run_jsonconvention.sh run_misc.sh run_mud.sh run_nccopy5.sh run_nccopyz.sh run_ncgen4.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_notzarr.sh run_nulls.sh run_perf_chunks1.sh run_purezarr.sh run_quantize.sh run_scalar.sh run_specific_filters.sh run_strings.sh run_unknown.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh)
-
-set(TESTDATA_NCZARR ref_nulls_nczarr.baseline ref_zarr_test_data.cdl.gz ref_avail1.cdl ref_byte.cdl ref_byte_fill_value_null.cdl ref_fillonly.cdl ref_misc1.cdl ref_ndims.cdl ref_newformatpure.cdl ref_nulls.cdl ref_oldformat.cdl ref_perdimspecs.cdl ref_power_901_constants.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_rem.cdl ref_scalar.cdl ref_skip.cdl ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_map_create.cdl ref_ut_map_writedata.cdl ref_ut_map_writemeta.cdl ref_ut_map_writemeta2.cdl ref_ut_testmap_create.cdl ref_whole.cdl ref_avail1.dmp ref_misc1.dmp ref_ndims.dmp ref_rem.dmp ref_noshape.file.zip ref_groups.h5 ref_notzarr.tar.gz ref_avail1.txt ref_skip.txt ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_search.txt ref_ut_map_readmeta.txt ref_ut_map_readmeta2.txt ref_ut_map_search.txt ref_ut_proj.txt ref_whole.txt ref_byte.zarr.zip ref_byte_fill_value_null.zarr.zip ref_oldformat.zip ref_power_901_constants_orig.zip ref_quotes_orig.zip)
-
-for(TF ${TESTFILES_NCZARR})
+foreach(TF ${TESTFILES_NCZARR})
   file(COPY "${netCDF_SOURCE_DIR}/nczarr_test/${TF}"
-      DESTINATION ${netCDF_BINARY_DIR}/v3_nczarr_test/${TF}"
+      DESTINATION "${netCDF_BINARY_DIR}/v3_nczarr_test/${TF}"
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endforeach()
 
-for(TD ${TESTDATA_NCZARR})
+foreach(TD ${TESTDATA_NCZARR})
   file(COPY "${netCDF_SOURCE_DIR}/nczarr_test/${TD}"
-      DESTINATION ${netCDF_BINARY_DIR}/v3_nczarr_test/${TD}"
+      DESTINATION "${netCDF_BINARY_DIR}/v3_nczarr_test/${TD}"
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endforeach()
 
@@ -46,31 +39,31 @@ endif()
 # Built Sources that are copies from nczarr_test
 set(NCZARRFILES run_corrupt.sh run_external.sh run_interop.sh run_chunkcases.sh run_fillonlyz.sh run_filter.sh run_nccopyz.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_perf_chunks1.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ncgen4.sh run_quantize.sh run_purezarr.sh run_misc.sh run_jsonconvention.sh run_strings.sh run_scalar.sh run_nulls.sh run_notzarr.sh)
 
-set(NCZARRFILES ${NCZARRFILES} ref_noshape.file.zip ref_power_901_constants.cdl ref_power_901_constants_orig.zip ref_avail1.cdl ref_avail1.dmp ref_avail1.txt ref_byte.cdl ref_byte_fill_value_null.cdl ref_byte_fill_value_null.zarr.zip ref_byte.zarr.zip ref_fillonly.cdl ref_groups.h5 ref_misc1.cdl ref_misc1.dmp ref_ndims.cdl ref_ndims.dmp ref_newformatpure.cdl ref_notzarr.tar.gz ref_nulls.cdl ref_nulls_nczarr.baseline ref_oldformat.cdl ref_oldformat.zip ref_perdimspecs.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_quotes_orig.zip ref_rem.cdl ref_rem.dmp ref_scalar.cdl ref_skip.cdl ref_skip.txt ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_mapapi_search.txt ref_ut_map_create.cdl ref_ut_map_readmeta2.txt ref_ut_map_readmeta.txt ref_ut_map_search.txt ref_ut_map_writedata.cdl ref_ut_map_writemeta2.cdl ref_ut_map_writemeta.cdl ref_ut_proj.txt ref_ut_testmap_create.cdl ref_whole.cdl ref_whole.txt ref_zarr_test_data.cdl.gz ref_bzip2.cdl ref_filtered.cdl)
+set(NCZARRFILES ${NCZARRFILES} ref_noshape.file.zip ref_power_901_constants.cdl ref_power_901_constants_orig.zip ref_avail1.cdl ref_avail1.dmp ref_avail1.txt ref_byte.cdl ref_byte_fill_value_null.cdl ref_byte_fill_value_null.zarr.zip ref_byte.zarr.zip ref_fillonly.cdl ref_groups.h5 ref_misc1.cdl ref_misc1.dmp ref_ndims.cdl ref_ndims.dmp ref_newformatpure.cdl ref_notzarr.tar.gz ref_nulls.cdl ref_nulls_nczarr.baseline ref_oldformat.cdl ref_oldformat.zip ref_perdimspecs.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_quotes_orig.zip ref_rem.cdl ref_rem.dmp ref_scalar.cdl ref_skip.cdl ref_skip.txt ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_mapapi_search.txt ref_ut_map_create.cdl ref_ut_map_readmeta2.txt ref_ut_map_readmeta.txt ref_ut_map_search.txt ref_ut_map_writedata.cdl ref_ut_map_writemeta2.cdl ref_ut_map_writemeta.cdl ref_ut_proj.txt ref_ut_testmap_create.cdl ref_whole.cdl ref_whole.txt ref_zarr_test_data.cdl.gz)
 
-for(NZ ${NCZARRFILES})
+foreach(NZ ${NCZARRFILES})
   file(COPY "${netCDF_SOURCE_DIR}/nczarr_test/${NZ}"
-      DESTINATION ${netCDF_BINARY_DIR}/v3_nczarr_test/${NZ}"
+      DESTINATION "${netCDF_BINARY_DIR}/v3_nczarr_test/${NZ}"
       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endforeach()
 
 if(NETCDF_ENABLE_TESTS)
 
-  add_library(ut_util STATIC ut_util.c ut_test.c ut_includes.h ut_test.h ${XGETOPTSRC})
+  add_library(v3_ut_util STATIC ut_util.c ut_test.c ut_includes.h ut_test.h ${XGETOPTSRC})
   if(NETCDF_ENABLE_DLL)
-    target_compile_definitions(ut_util PUBLIC -DDLL_EXPORT -DDLL_NETCDF)
+    target_compile_definitions(v3_ut_util PUBLIC -DDLL_EXPORT -DDLL_NETCDF)
   endif(NETCDF_ENABLE_DLL)
-  target_include_directories(ut_util PUBLIC ../libnczarr ../plugins ${CMAKE_CURRENT_LIST_DIR})
-  target_link_libraries(ut_util PUBLIC netcdf ${ALL_TLL_LIBS})
+  target_include_directories(v3_ut_util PUBLIC ../libnczarr ../plugins ${CMAKE_CURRENT_LIST_DIR})
+  target_link_libraries(v3_ut_util PUBLIC netcdf ${ALL_TLL_LIBS})
 
-  add_library(test_utils STATIC test_utils.c test_utils.h ${XGETOPTSRC})
+  add_library(v3_test_utils STATIC test_utils.c test_utils.h ${XGETOPTSRC})
   if(NETCDF_ENABLE_DLL)
-    target_compile_definitions(test_utils PUBLIC -DDLL_EXPORT -DDLL_NETCDF)
+    target_compile_definitions(v3_test_utils PUBLIC -DDLL_EXPORT -DDLL_NETCDF)
   endif(NETCDF_ENABLE_DLL)
-  target_include_directories(test_utils PUBLIC ../libnczarr ../plugins ${CMAKE_CURRENT_LIST_DIR})
-  target_link_libraries(test_utils PUBLIC netcdf ${ALL_TLL_LIBS})
+  target_include_directories(v3_test_utils PUBLIC ../libnczarr ../plugins ${CMAKE_CURRENT_LIST_DIR})
+  target_link_libraries(v3_test_utils PUBLIC netcdf ${ALL_TLL_LIBS})
 
-  set_target_properties(ut_util test_utils PROPERTIES
+  set_target_properties(v3_ut_util v3_test_utils PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}
     RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}
@@ -81,48 +74,39 @@ if(NETCDF_ENABLE_TESTS)
   # must be run in a particular order. It is painful but will use macros to help
   # keep it from being too bad.
 
-  build_bin_test_with_util_lib(ut_map ut_util)
-  build_bin_test_with_util_lib(ut_mapapi ut_util)
-  build_bin_test_with_util_lib(ut_json ut_util)
+  v3_build_bin_test_with_util_lib(ut_map v3_ut_util)
+  v3_build_bin_test_with_util_lib(ut_mapapi v3_ut_util)
+  v3_build_bin_test_with_util_lib(ut_json v3_ut_util)
 
-  build_bin_test_with_util_lib(test_fillonlyz test_utils)
-  build_bin_test_with_util_lib(test_quantize test_utils)
-  build_bin_test_with_util_lib(test_notzarr test_utils)
+  v3_build_bin_test_with_util_lib(test_fillonlyz v3_test_utils)
+  v3_build_bin_test_with_util_lib(test_quantize v3_test_utils)
+  v3_build_bin_test_with_util_lib(test_notzarr v3_test_utils)
 
-#  ADD_BIN_TEST(nczarr_test test_endians ${TSTCOMMONSRC})
+#  v3_add_bin_test(nczarr_test test_endians ${TSTCOMMONSRC})
 
   # Unlimited Tests
   if(USE_HDF5)
-  add_bin_test_with_util_lib(nczarr_test test_unlim_vars test_utils)
-  add_bin_test_with_util_lib(nczarr_test test_put_vars_two_unlim_dim test_utils)
-  build_bin_test_with_util_lib(test_zchunks ut_util)
-  build_bin_test_with_util_lib(test_zchunks2 ut_util)
-  build_bin_test_with_util_lib(test_zchunks3 ut_util)
-  build_bin_test_with_util_lib(test_unlim_io test_utils)
-  build_bin_test_with_util_lib(test_chunking test_utils)
+  add_bin_test_with_util_lib(nczarr_test test_unlim_vars v3_test_utils)
+  add_bin_test_with_util_lib(nczarr_test test_put_vars_two_unlim_dim v3_test_utils)
+  v3_build_bin_test_with_util_lib(test_zchunks v3_ut_util)
+  v3_build_bin_test_with_util_lib(test_zchunks2 v3_ut_util)
+  v3_build_bin_test_with_util_lib(test_zchunks3 v3_ut_util)
+  v3_build_bin_test_with_util_lib(test_unlim_io v3_test_utils)
+  v3_build_bin_test_with_util_lib(test_chunking v3_test_utils)
   add_sh_test(nczarr_test run_nccopyz)
   add_sh_test(nczarr_test run_unlim_io)
   add_sh_test(nczarr_test run_nccopy5)
   add_sh_test(nczarr_test run_mud)
   endif()
   
-  if(FALSE) # Obsolete tests
-      build_bin_test(ut_projections ${COMMONSRC})
-      build_bin_test(ut_chunking ${COMMONSRC})
-      build_bin_test(ut_walk ${COMMONSRC})
-  endif()
-
   # Helper programs for testing
-  build_bin_test(zhex)
-  build_bin_test_with_util_lib(zisjson ut_util)
+  v3_build_bin_test_with_util_lib(zisjson v3_ut_util)
   target_include_directories(zisjson PUBLIC ../libnczarr)
-  build_bin_test_with_util_lib(zs3parse ut_util)
+  v3_build_bin_test_with_util_lib(zs3parse v3_ut_util)
   target_include_directories(zs3parse PUBLIC ../libnczarr)
-  build_bin_test_with_util_lib(zmapio ut_util)
+  v3_build_bin_test_with_util_lib(zmapio v3_ut_util)
 
   if(NETCDF_ENABLE_S3 AND NOT WITH_S3_TESTING STREQUAL "NO")
-  # Helper programs for testing
-    build_bin_test(s3util ${COMMONSRC})
   # Pure AWS Test
     if(NETCDF_ENABLE_S3_AWS)
       set(TMP_CMAKE_CXX_STANDARD ${MAKE_CXX_STANDARD})
@@ -147,7 +131,7 @@ if(NETCDF_ENABLE_TESTS)
   endif()
   
   if(USE_HDF5)
-    build_bin_test_with_util_lib(ncdumpchunks ut_util)
+    v3_build_bin_test_with_util_lib(ncdumpchunks v3_ut_util)
   endif()
 
   if(BUILD_UTILITIES)
@@ -156,9 +140,9 @@ if(NETCDF_ENABLE_TESTS)
     add_sh_test(nczarr_test run_ut_misc)
     add_sh_test(nczarr_test run_ncgen4)
     if(LARGE_FILE_TESTS)
-      build_bin_test(test_readcaching)
-      build_bin_test(test_writecaching)
-      build_bin_test(test_chunkcases ${TSTCOMMONSRC})
+      v3_build_bin_test(test_readcaching)
+      v3_build_bin_test(test_writecaching)
+      v3_build_bin_test(test_chunkcases ${TSTCOMMONSRC})
       add_sh_test(nczarr_test run_cachetest)
       add_sh_test(nczarr_test run_chunkcases)
     endif()
@@ -220,7 +204,7 @@ endif(NETCDF_ENABLE_TESTS)
 
 ## Specify files to be distributed by 'make dist'
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl)
-SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am zmapio.c zhex.c ncdumpchunks.c)
+SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
 ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
 
 # Sources that are specific to Zarr V3 testing
@@ -230,11 +214,9 @@ set(V3DATA ref_nczarr2zarr.cdl ref_purezarr.cdl ref_xarray.cdl ref_misc2.cdl ref
 # Sources that are copies of same files from nczarr_test
 set(TESTFILES_NCZARR test_nczarr.sh test_chunking.c test_filter_vlen.c test_h5_endians.c test_put_vars_two_unlim_dim.c test_quantize.c test_unlim_vars.c tst_pure_awssdk.cpp)
 
-set(TESTFILES_NCZARR ${TESTFILES_NCZARR} zhex.c zisjson.c zmapio.c zs3parse.c s3util.c ncdumpchunks.c)
-
-set(TESTFILES_NCZARR ${TESTFILES_NCZARR} test_nczarr.sh run_chunkcases.sh run_corrupt.sh run_external.sh run_fillonlyz.sh run_filter.sh run_filterinstall.sh run_filter_misc.sh run_filter_vlen.sh run_interop.sh run_jsonconvention.sh run_misc.sh run_nccopy5.sh run_nccopyz.sh run_ncgen4.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_notzarr.sh run_nulls.sh run_perf_chunks1.sh run_purezarr.sh run_quantize.sh run_scalar.sh run_specific_filters.sh run_strings.sh run_unknown.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh run_nan.sh)
+set(TESTFILES_NCZARR ${TESTFILES_NCZARR} run_chunkcases.sh run_corrupt.sh run_external.sh run_fillonlyz.sh run_filter.sh run_filterinstall.sh run_filter_misc.sh run_filter_vlen.sh run_interop.sh run_jsonconvention.sh run_misc.sh run_mud.sh run_nccopy5.sh run_nccopyz.sh run_ncgen4.sh run_nczarr_fill.sh run_nczfilter.sh run_newformat.sh run_notzarr.sh run_nulls.sh run_perf_chunks1.sh run_purezarr.sh run_quantize.sh run_scalar.sh run_specific_filters.sh run_strings.sh run_unknown.sh run_unlim_io.sh run_ut_map.sh run_ut_mapapi.sh run_ut_misc.sh)
 
-set(TESTDATA_NCZARR ref_nulls_nczarr.baseline ref_zarr_test_data.cdl.gz ref_avail1.cdl ref_byte.cdl ref_byte_fill_value_null.cdl ref_fillonly.cdl ref_misc1.cdl ref_ndims.cdl ref_newformatpure.cdl ref_nulls.cdl ref_oldformat.cdl ref_perdimspecs.cdl ref_power_901_constants.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_rem.cdl ref_scalar.cdl ref_skip.cdl ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_map_create.cdl ref_ut_map_writedata.cdl ref_ut_map_writemeta.cdl ref_ut_map_writemeta2.cdl ref_ut_testmap_create.cdl ref_whole.cdl ref_avail1.dmp ref_misc1.dmp ref_ndims.dmp ref_rem.dmp ref_noshape.file.zip ref_groups.h5 ref_notzarr.tar.gz ref_avail1.txt ref_skip.txt ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_search.txt ref_ut_map_readmeta.txt ref_ut_map_readmeta2.txt ref_ut_map_search.txt ref_ut_proj.txt ref_whole.txt ref_byte.zarr.zip ref_byte_fill_value_null.zarr.zip ref_oldformat.zip ref_power_901_constants_orig.zip ref_quotes_orig.zip ref_tst_nans.dmp)
+set(TESTDATA_NCZARR ref_nulls_nczarr.baseline ref_zarr_test_data.cdl.gz ref_avail1.cdl ref_byte.cdl ref_byte_fill_value_null.cdl ref_fillonly.cdl ref_misc1.cdl ref_ndims.cdl ref_newformatpure.cdl ref_nulls.cdl ref_oldformat.cdl ref_perdimspecs.cdl ref_power_901_constants.cdl ref_purezarr_base.cdl ref_quotes.cdl ref_rem.cdl ref_scalar.cdl ref_skip.cdl ref_skipw.cdl ref_string.cdl ref_t_meta_dim1.cdl ref_t_meta_var1.cdl ref_ut_mapapi_create.cdl ref_ut_mapapi_data.cdl ref_ut_mapapi_meta.cdl ref_ut_map_create.cdl ref_ut_map_writedata.cdl ref_ut_map_writemeta.cdl ref_ut_map_writemeta2.cdl ref_ut_testmap_create.cdl ref_whole.cdl ref_avail1.dmp ref_misc1.dmp ref_ndims.dmp ref_rem.dmp ref_noshape.file.zip ref_groups.h5 ref_notzarr.tar.gz ref_avail1.txt ref_skip.txt ref_ut_json_build.txt ref_ut_json_parse.txt ref_ut_mapapi_search.txt ref_ut_map_readmeta.txt ref_ut_map_readmeta2.txt ref_ut_map_search.txt ref_ut_proj.txt ref_whole.txt ref_byte.zarr.zip ref_byte_fill_value_null.zarr.zip ref_oldformat.zip ref_power_901_constants_orig.zip ref_quotes_orig.zip)
 
 # Add command to update the v3_test source from nczarr_test
 add_custom_target(update_testfiles DEPENDS testfiles_nczarr testdata_nczarr)
@@ -245,9 +227,8 @@ add_custom_target(testfiles_nczarr
       set(SRCPATH "${netCDF_SOURCE_DIR}/nczarr_test/${U}")
       set(DSTPATH "${netCDF_SOURCE_DIR}/v3_nczarr_test/${U}")
       file(REMOVE ${DSTPATH})
-      file(COPY ${SRCPATH} DESINTATION ${DSTPATH}
+      file(COPY ${SRCPATH} DESTINATION ${DSTPATH}
            FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-      )
     endforeach()
 )
 
@@ -257,6 +238,6 @@ add_custom_target(testdata_nczarr
       set(SRCPATH "${netCDF_SOURCE_DIR}/nczarr_test/${U}")
       set(DSTPATH "${netCDF_SOURCE_DIR}/v3_nczarr_test/${U}")
       file(REMOVE ${DSTPATH})
-      file(COPY ${SRCPATH} DESINTATION ${DSTPATH})
+      file(COPY ${SRCPATH} DESTINATION ${DSTPATH})
     endforeach()
 )
diff --git a/v3_nczarr_test/test_chunkcases.c b/v3_nczarr_test/test_chunkcases.c
index 8def2c8dee..eaa46af2d5 100644
--- a/v3_nczarr_test/test_chunkcases.c
+++ b/v3_nczarr_test/test_chunkcases.c
@@ -8,7 +8,7 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif
diff --git a/v3_nczarr_test/test_unlim_io.c b/v3_nczarr_test/test_unlim_io.c
index e3f1c91890..1bcd68463a 100644
--- a/v3_nczarr_test/test_unlim_io.c
+++ b/v3_nczarr_test/test_unlim_io.c
@@ -9,7 +9,7 @@
 #include "ncpathmgr.h"
 #include "nclist.h"
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif
diff --git a/v3_nczarr_test/test_utils.c b/v3_nczarr_test/test_utils.c
index f53201544a..abeb454ee7 100644
--- a/v3_nczarr_test/test_utils.c
+++ b/v3_nczarr_test/test_utils.c
@@ -18,7 +18,7 @@
 #include "XGetopt.h"
 #endif
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #include <H5DSpublic.h>
 #endif
diff --git a/v3_nczarr_test/testfilter.c b/v3_nczarr_test/testfilter.c
index 5234233cd2..626b826f9b 100644
--- a/v3_nczarr_test/testfilter.c
+++ b/v3_nczarr_test/testfilter.c
@@ -43,7 +43,7 @@ netcdf bzip2 {
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 
diff --git a/v3_nczarr_test/testfilter_misc.c b/v3_nczarr_test/testfilter_misc.c
index 184d762fd4..cd13c49104 100644
--- a/v3_nczarr_test/testfilter_misc.c
+++ b/v3_nczarr_test/testfilter_misc.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif
 
diff --git a/v3_nczarr_test/testfilter_multi.c b/v3_nczarr_test/testfilter_multi.c
index aff8a7b25c..5bbeb660b9 100644
--- a/v3_nczarr_test/testfilter_multi.c
+++ b/v3_nczarr_test/testfilter_multi.c
@@ -12,7 +12,7 @@ Test support for multiple filters per variable
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_HDF5_H
+#ifdef USE_HDF5
 #include <hdf5.h>
 #endif