diff --git a/.github/workflows/dependencies-macos.sh b/.github/workflows/dependencies-macos.sh
index 98b1d33d8..198da148b 100755
--- a/.github/workflows/dependencies-macos.sh
+++ b/.github/workflows/dependencies-macos.sh
@@ -2,9 +2,7 @@
 
 set -eu -o pipefail
 
-export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=FALSE
-
-brew install open-mpi automake
+brew install open-mpi automake m4 libtool
 
 # libfabric
 wget https://github.com/ofiwg/libfabric/archive/refs/tags/v1.15.2.tar.gz
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 212916ea0..40dad5073 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -42,98 +42,98 @@ endif()
 include_directories(${TEST_EXT_INCLUDE_DIRS})
 
 set(PROGRAMS
-  pdc_init
-#  create_prop
-#  create_region
-#  create_obj_coll
-#  set_prop
-  dup_prop
-  read_obj
-  read_obj_shared
-#  create_cont
-#  create_cont_coll
-  open_cont
-  cont_life
-  cont_iter
-  cont_info
-  cont_del
-  cont_getid
-  cont_tags
-  consistency_semantics
-  create_obj
-  open_obj
-  open_existing_obj
-  obj_info
-  obj_del
-  obj_iter
-  obj_life
-#  obj_dim
-  obj_buf
-  obj_tags
-  obj_put_data
-  obj_get_data
-  read_write_perf
-  read_write_col_perf
-  region_transfer_partial
-  region_transfer_2D_partial
-  region_transfer_3D_partial
-  region_transfer_overlap
-  region_transfer_overlap_2D
-  region_transfer_overlap_3D
-  region_transfer_merge
-  obj_round_robin_io
-  obj_round_robin_io_all
-#  close_server
-#  stat_obj
-  delete_obj
-  vpicio
-  vpicio_mts
-  bdcats
-  vpicio_old
-  bdcats_old
-#  cont_add_del
-#  data_server_meta_test
- kvtag_add_get
-#  kvtag_get
- kvtag_query
-#  obj_transformation
-  region_transfer_query
-  region_transfer
-  region_transfer_status
-  region_transfer_skewed
-  region_transfer_2D
-  # region_transfer_2D_skewed
-  region_transfer_3D
-  # region_transfer_3D_skewed
-  region_transfer_write_only
-  region_transfer_read_only
-  region_transfer_write_read
-  region_transfer_all
-  region_transfer_all_2D
-  region_transfer_all_3D
-  region_transfer_all_append
-  region_transfer_all_append_2D
-  region_transfer_all_append_3D
-  region_transfer_all_split_wait
-  region_transfer_set_dims
-  region_transfer_set_dims_2D
-  region_transfer_set_dims_3D
-  #query_vpic_create_data
-  #query_vpic
-  #query_vpic_multi
-  #query_vpic_multi_preload
-  #query_vpic_multi_nopreload
-  #query_vpic_bin_sds_preload
-  #query_vpic_bin_sds_nopreload
-  #query_vpic_bin_sds1_preload
-  #query_vpic_bin_sds1_nopreload
-  #query_vpic_multi_nopreload1
-  #gen_fastbit_idx
-  #query_vpic_exyz_nopreload
-  #query_vpic_exyz_preload
-  query_data
-  producer_waitall
-  )
+  misc/pdc_init
+  #prop/create_prop
+  #region/create_region
+  #obj/create_obj_coll
+  #propset_prop
+  prop/dup_prop
+  obj/read_obj
+  obj/read_obj_shared
+  #cont/create_cont
+  #cont/create_cont_coll
+  cont/open_cont
+  cont/cont_life
+  cont/cont_iter
+  cont/cont_info
+  cont/cont_del
+  cont/cont_getid
+  cont/cont_tags
+  misc/consistency_semantics
+  obj/create_obj
+  obj/open_obj
+  obj/open_existing_obj
+  obj/obj_info
+  obj/obj_del
+  obj/obj_iter
+  obj/obj_life
+  #obj/obj_dim
+  obj/obj_buf
+  obj/obj_tags
+  obj/obj_put_data
+  obj/obj_get_data
+  misc/read_write_perf
+  misc/read_write_col_perf
+  region/region_transfer_partial
+  region/region_transfer_2D_partial
+  region/region_transfer_3D_partial
+  region/region_transfer_overlap
+  region/region_transfer_overlap_2D
+  region/region_transfer_overlap_3D
+  region/region_transfer_merge
+  obj/obj_round_robin_io
+  obj/obj_round_robin_io_all
+  #misc/close_server
+  #obj/stat_obj
+  obj/delete_obj
+  misc/vpicio
+  misc/vpicio_mts
+  misc/bdcats
+  deprecated/vpicio_old
+  deprecated/bdcats_old
+  #cont/cont_add_del
+  #misc/data_server_meta_test
+  tags/kvtag_add_get
+  #tags/kvtag_get
+  tags/kvtag_query
+  #deprecated/obj_transformation
+  region/region_transfer_query
+  region/region_transfer
+  region/region_transfer_status
+  region/region_transfer_skewed
+  region/region_transfer_2D
+  #region/region_transfer_2D_skewed
+  region/region_transfer_3D
+  #region/region_transfer_3D_skewed
+  region/region_transfer_write_only
+  region/region_transfer_read_only
+  region/region_transfer_write_read
+  region/region_transfer_all
+  region/region_transfer_all_2D
+  region/region_transfer_all_3D
+  region/region_transfer_all_append
+  region/region_transfer_all_append_2D
+  region/region_transfer_all_append_3D
+  region/region_transfer_all_split_wait
+  region/region_transfer_set_dims
+  region/region_transfer_set_dims_2D
+  region/region_transfer_set_dims_3D
+  #query/query_vpic_create_data
+  #query/query_vpic
+  #query/query_vpic_multi
+  #query/query_vpic_multi_preload
+  #query/query_vpic_multi_nopreload
+  #query/query_vpic_bin_sds_preload
+  #query/query_vpic_bin_sds_nopreload
+  #query/query_vpic_bin_sds1_preload
+  #query/query_vpic_bin_sds1_nopreload
+  #query/query_vpic_multi_nopreload1
+  #misc/gen_fastbit_idx
+  #query/query_vpic_exyz_nopreload
+  #query/query_vpic_exyz_preload
+  query/query_data
+  misc/producer_waitall
+)
 
 # TODO: Check if import_vpic.c is needed. If yes, we have to add the following :
 # if (HDF5_FOUND) 
@@ -143,31 +143,48 @@ set(PROGRAMS
 #   message(FATAL_ERROR "Could not find HDF5, please make sure that HDF5 has been compiled with shared libraries enabled.")
 # endif()
 
-
 foreach(program ${PROGRAMS})
-  add_executable(${program} ${program}.c)
-  target_link_libraries(${program} pdc pdc_commons ${TEST_EXT_LIB})
-  target_include_directories(${program} PRIVATE ${TEST_EXT_INCLUDE_DIRS})
-endforeach(program)
+  get_filename_component(program_name ${program} NAME)
+  get_filename_component(program_dir ${program} DIRECTORY)
+
+  set(SOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${program}.c")
+
+  if(EXISTS ${SOURCE_FILE})
+    add_executable(${program_name} ${SOURCE_FILE})
+    target_include_directories(${program_name} PRIVATE "${CMAKE_SOURCE_DIR}/include")
+    target_link_libraries(${program_name} pdc pdc_commons ${TEST_EXT_LIB})
+  else()
+    message(WARNING "Source file ${SOURCE_FILE} not found, skipping ${program_name}.")
+  endif()
+endforeach()
 
 if(BUILD_MPI_TESTING)
   set(MPI_PROGRAMS
-    kvtag_range_query_scale
-    kvtag_affix_query_scale
-    kvtag_add_get_benchmark
-    kvtag_add_get_scale
-    llsm_idioms_bench
-    idioms_ci_test
+    tags/kvtag_range_query_scale
+    tags/kvtag_affix_query_scale
+    tags/kvtag_add_get_benchmark
+    tags/kvtag_add_get_scale
+    misc/llsm_idioms_bench
+    misc/idioms_ci_test
   )
 
   foreach(program ${MPI_PROGRAMS})
-    add_executable(${program} ${program}.c)
-    if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
-        target_compile_options(${program} PRIVATE ${SUPPRESSED_LIST})
+    get_filename_component(program_name ${program} NAME)
+    get_filename_component(program_dir ${program} DIRECTORY)
+  
+    set(SOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${program_dir}/${program_name}.c")
+  
+    if(EXISTS ${SOURCE_FILE})
+      add_executable(${program_name} ${SOURCE_FILE})
+      if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+        target_compile_options(${program_name} PRIVATE ${SUPPRESSED_LIST})
+      endif()
+      target_link_libraries(${program_name} pdc pdc_commons ${TEST_EXT_LIB})
+      target_include_directories(${program_name} PRIVATE ${TEST_EXT_INCLUDE_DIRS})
+    else()
+      message(WARNING "Source file ${SOURCE_FILE} not found, skipping ${program_name}.")
     endif()
-    target_link_libraries(${program} pdc pdc_commons ${TEST_EXT_LIB})
-    target_include_directories(${program} PRIVATE ${TEST_EXT_INCLUDE_DIRS})
-  endforeach(program)
+  endforeach()
 endif()
 
 
@@ -175,10 +192,10 @@ if(UUID_FOUND)
   message(STATUS "UUID library found: ${UUID_LIBRARIES}")
   message(STATUS "UUID include directory: ${UUID_INCLUDE_DIRS}")
   set(ENHANCED_PROGRAMS 
-  dart_algo_sim
-  dart_attr_dist_test
-  dart_func_test
-  dart_test
+    dart/dart_algo_sim
+    dart/dart_attr_dist_test
+    dart/dart_func_test
+    dart/dart_test
   )
 
   set(TEST_EXT_LIB ${TEST_EXT_LIB} ${UUID_LIBRARIES})
@@ -198,9 +215,18 @@ if(UUID_FOUND)
   endif(PDC_ENABLE_JULIA)
 
   foreach(program ${ENHANCED_PROGRAMS})
-    add_executable(${program} ${program}.c ${EXTRA_SRC_FILE})
-    target_link_libraries(${program} pdc pdc_commons ${TEST_EXT_LIB})
-    target_include_directories(${program} PRIVATE ${TEST_EXT_INCLUDE_DIRS})
+    get_filename_component(program_name ${program} NAME)
+    get_filename_component(program_dir ${program} DIRECTORY)
+
+    set(SOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${program}.c")
+
+    if(EXISTS ${SOURCE_FILE})
+      add_executable(${program_name} ${SOURCE_FILE} ${EXTRA_SRC_FILE})
+      target_link_libraries(${program_name} pdc pdc_commons ${TEST_EXT_LIB})
+      target_include_directories(${program_name} PRIVATE ${TEST_EXT_INCLUDE_DIRS})
+    else()
+      message(WARNING "Source file ${SOURCE_FILE} not found, skipping ${program_name}.")
+    endif()
   endforeach(program)
 endif(UUID_FOUND)
 
@@ -211,13 +237,13 @@ set(SCRIPTS
   run_multiple_test.sh
   run_multiple_mpi_test.sh
   run_checkpoint_restart_test.sh
-  )
+)
 
 foreach(script ${SCRIPTS})
   file(
-       COPY ${script} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-       FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE WORLD_READ WORLD_EXECUTE
-    )
+    COPY ${script} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE WORLD_READ WORLD_EXECUTE
+  )
 endforeach(script)
 
 
@@ -229,7 +255,7 @@ endforeach(script)
 OPTION(GEN_TRANSFORM_LIB "Create a transform library" OFF)
 if(GEN_TRANSFORM_LIB)
   FIND_LIBRARY(BLOSC_LIBRARY blosc $ENV{HOME}/Sandbox/c-blosc/build/blosc)
-  set(PDC_TRANSFORMS_SRCS pdc_transforms_lib.c)
+  set(PDC_TRANSFORMS_SRCS transforms/pdc_transforms_lib.c)
   add_library(pdctransforms  ${PDC_TRANSFORMS_SRCS})
   target_link_libraries(pdctransforms pdc ${BLOSC_LIBRARY})
 endif()
@@ -237,7 +263,7 @@ endif()
 # *******************************************
 # Create a transform library for testing
 # *******************************************
-set(PDC_ANALYSIS_SRCS pdc_analysis_lib.c)
+set(PDC_ANALYSIS_SRCS analysis/pdc_analysis_lib.c)
 add_library(pdcanalysis ${PDC_ANALYSIS_SRCS})
 target_link_libraries(pdcanalysis pdc)
 
diff --git a/src/tests/pdc_analysis_lib.c b/src/tests/analysis/pdc_analysis_lib.c
similarity index 100%
rename from src/tests/pdc_analysis_lib.c
rename to src/tests/analysis/pdc_analysis_lib.c
diff --git a/src/tests/cont_add_del.c b/src/tests/cont/cont_add_del.c
similarity index 100%
rename from src/tests/cont_add_del.c
rename to src/tests/cont/cont_add_del.c
diff --git a/src/tests/cont_del.c b/src/tests/cont/cont_del.c
similarity index 100%
rename from src/tests/cont_del.c
rename to src/tests/cont/cont_del.c
diff --git a/src/tests/cont_getid.c b/src/tests/cont/cont_getid.c
similarity index 100%
rename from src/tests/cont_getid.c
rename to src/tests/cont/cont_getid.c
diff --git a/src/tests/cont_info.c b/src/tests/cont/cont_info.c
similarity index 100%
rename from src/tests/cont_info.c
rename to src/tests/cont/cont_info.c
diff --git a/src/tests/cont_iter.c b/src/tests/cont/cont_iter.c
similarity index 100%
rename from src/tests/cont_iter.c
rename to src/tests/cont/cont_iter.c
diff --git a/src/tests/cont_iter_mt.c b/src/tests/cont/cont_iter_mt.c
similarity index 100%
rename from src/tests/cont_iter_mt.c
rename to src/tests/cont/cont_iter_mt.c
diff --git a/src/tests/cont_life.c b/src/tests/cont/cont_life.c
similarity index 100%
rename from src/tests/cont_life.c
rename to src/tests/cont/cont_life.c
diff --git a/src/tests/cont_life_mt.c b/src/tests/cont/cont_life_mt.c
similarity index 100%
rename from src/tests/cont_life_mt.c
rename to src/tests/cont/cont_life_mt.c
diff --git a/src/tests/cont_tags.c b/src/tests/cont/cont_tags.c
similarity index 100%
rename from src/tests/cont_tags.c
rename to src/tests/cont/cont_tags.c
diff --git a/src/tests/create_cont.c b/src/tests/cont/create_cont.c
similarity index 100%
rename from src/tests/create_cont.c
rename to src/tests/cont/create_cont.c
diff --git a/src/tests/create_cont_coll.c b/src/tests/cont/create_cont_coll.c
similarity index 100%
rename from src/tests/create_cont_coll.c
rename to src/tests/cont/create_cont_coll.c
diff --git a/src/tests/open_cont.c b/src/tests/cont/open_cont.c
similarity index 100%
rename from src/tests/open_cont.c
rename to src/tests/cont/open_cont.c
diff --git a/src/tests/dart_algo_sim.c b/src/tests/dart/dart_algo_sim.c
similarity index 100%
rename from src/tests/dart_algo_sim.c
rename to src/tests/dart/dart_algo_sim.c
diff --git a/src/tests/dart_attr_dist_test.c b/src/tests/dart/dart_attr_dist_test.c
similarity index 100%
rename from src/tests/dart_attr_dist_test.c
rename to src/tests/dart/dart_attr_dist_test.c
diff --git a/src/tests/dart_func_test.c b/src/tests/dart/dart_func_test.c
similarity index 100%
rename from src/tests/dart_func_test.c
rename to src/tests/dart/dart_func_test.c
diff --git a/src/tests/dart_test.c b/src/tests/dart/dart_test.c
similarity index 100%
rename from src/tests/dart_test.c
rename to src/tests/dart/dart_test.c
diff --git a/src/tests/data_server_meta.c b/src/tests/data_server/data_server_meta.c
similarity index 100%
rename from src/tests/data_server_meta.c
rename to src/tests/data_server/data_server_meta.c
diff --git a/src/tests/data_server_meta_test.c b/src/tests/data_server/data_server_meta_test.c
similarity index 100%
rename from src/tests/data_server_meta_test.c
rename to src/tests/data_server/data_server_meta_test.c
diff --git a/src/tests/data_server_read.c b/src/tests/data_server/data_server_read.c
similarity index 100%
rename from src/tests/data_server_read.c
rename to src/tests/data_server/data_server_read.c
diff --git a/src/tests/data_server_read_multi.c b/src/tests/data_server/data_server_read_multi.c
similarity index 100%
rename from src/tests/data_server_read_multi.c
rename to src/tests/data_server/data_server_read_multi.c
diff --git a/src/tests/data_server_read_vpic.c b/src/tests/data_server/data_server_read_vpic.c
similarity index 100%
rename from src/tests/data_server_read_vpic.c
rename to src/tests/data_server/data_server_read_vpic.c
diff --git a/src/tests/data_server_read_vpic_multits.c b/src/tests/data_server/data_server_read_vpic_multits.c
similarity index 100%
rename from src/tests/data_server_read_vpic_multits.c
rename to src/tests/data_server/data_server_read_vpic_multits.c
diff --git a/src/tests/data_server_read_vpic_spatial.c b/src/tests/data_server/data_server_read_vpic_spatial.c
similarity index 100%
rename from src/tests/data_server_read_vpic_spatial.c
rename to src/tests/data_server/data_server_read_vpic_spatial.c
diff --git a/src/tests/data_server_read_vpic_spatial_multits.c b/src/tests/data_server/data_server_read_vpic_spatial_multits.c
similarity index 100%
rename from src/tests/data_server_read_vpic_spatial_multits.c
rename to src/tests/data_server/data_server_read_vpic_spatial_multits.c
diff --git a/src/tests/data_server_write.c b/src/tests/data_server/data_server_write.c
similarity index 100%
rename from src/tests/data_server_write.c
rename to src/tests/data_server/data_server_write.c
diff --git a/src/tests/data_server_write_multi.c b/src/tests/data_server/data_server_write_multi.c
similarity index 100%
rename from src/tests/data_server_write_multi.c
rename to src/tests/data_server/data_server_write_multi.c
diff --git a/src/tests/data_server_write_vpic.c b/src/tests/data_server/data_server_write_vpic.c
similarity index 100%
rename from src/tests/data_server_write_vpic.c
rename to src/tests/data_server/data_server_write_vpic.c
diff --git a/src/tests/data_server_write_vpic_multits.c b/src/tests/data_server/data_server_write_vpic_multits.c
similarity index 100%
rename from src/tests/data_server_write_vpic_multits.c
rename to src/tests/data_server/data_server_write_vpic_multits.c
diff --git a/src/tests/bdcats_old.c b/src/tests/deprecated/bdcats_old.c
similarity index 100%
rename from src/tests/bdcats_old.c
rename to src/tests/deprecated/bdcats_old.c
diff --git a/src/tests/bdcats_v2.c b/src/tests/deprecated/bdcats_v2.c
similarity index 100%
rename from src/tests/bdcats_v2.c
rename to src/tests/deprecated/bdcats_v2.c
diff --git a/src/tests/blocked_lock.c b/src/tests/deprecated/blocked_lock.c
similarity index 100%
rename from src/tests/blocked_lock.c
rename to src/tests/deprecated/blocked_lock.c
diff --git a/src/tests/buf_map_mpi_v2.c b/src/tests/deprecated/buf_map_mpi_v2.c
similarity index 100%
rename from src/tests/buf_map_mpi_v2.c
rename to src/tests/deprecated/buf_map_mpi_v2.c
diff --git a/src/tests/buf_obj_map.c b/src/tests/deprecated/buf_obj_map.c
similarity index 100%
rename from src/tests/buf_obj_map.c
rename to src/tests/deprecated/buf_obj_map.c
diff --git a/src/tests/buf_obj_map_mpi.c b/src/tests/deprecated/buf_obj_map_mpi.c
similarity index 100%
rename from src/tests/buf_obj_map_mpi.c
rename to src/tests/deprecated/buf_obj_map_mpi.c
diff --git a/src/tests/obj_lock.c b/src/tests/deprecated/obj_lock.c
similarity index 100%
rename from src/tests/obj_lock.c
rename to src/tests/deprecated/obj_lock.c
diff --git a/src/tests/obj_transformation.c b/src/tests/deprecated/obj_transformation.c
similarity index 100%
rename from src/tests/obj_transformation.c
rename to src/tests/deprecated/obj_transformation.c
diff --git a/src/tests/region_obj_map.c b/src/tests/deprecated/region_obj_map.c
similarity index 100%
rename from src/tests/region_obj_map.c
rename to src/tests/deprecated/region_obj_map.c
diff --git a/src/tests/region_obj_map_2D.c b/src/tests/deprecated/region_obj_map_2D.c
similarity index 100%
rename from src/tests/region_obj_map_2D.c
rename to src/tests/deprecated/region_obj_map_2D.c
diff --git a/src/tests/region_obj_map_2D_partial.c b/src/tests/deprecated/region_obj_map_2D_partial.c
similarity index 100%
rename from src/tests/region_obj_map_2D_partial.c
rename to src/tests/deprecated/region_obj_map_2D_partial.c
diff --git a/src/tests/region_obj_map_3D.c b/src/tests/deprecated/region_obj_map_3D.c
similarity index 100%
rename from src/tests/region_obj_map_3D.c
rename to src/tests/deprecated/region_obj_map_3D.c
diff --git a/src/tests/region_obj_map_3D_partial.c b/src/tests/deprecated/region_obj_map_3D_partial.c
similarity index 100%
rename from src/tests/region_obj_map_3D_partial.c
rename to src/tests/deprecated/region_obj_map_3D_partial.c
diff --git a/src/tests/region_obj_map_merge.c b/src/tests/deprecated/region_obj_map_merge.c
similarity index 100%
rename from src/tests/region_obj_map_merge.c
rename to src/tests/deprecated/region_obj_map_merge.c
diff --git a/src/tests/region_obj_map_overlap.c b/src/tests/deprecated/region_obj_map_overlap.c
similarity index 100%
rename from src/tests/region_obj_map_overlap.c
rename to src/tests/deprecated/region_obj_map_overlap.c
diff --git a/src/tests/region_obj_map_overlap_2D.c b/src/tests/deprecated/region_obj_map_overlap_2D.c
similarity index 100%
rename from src/tests/region_obj_map_overlap_2D.c
rename to src/tests/deprecated/region_obj_map_overlap_2D.c
diff --git a/src/tests/region_obj_map_partial.c b/src/tests/deprecated/region_obj_map_partial.c
similarity index 100%
rename from src/tests/region_obj_map_partial.c
rename to src/tests/deprecated/region_obj_map_partial.c
diff --git a/src/tests/vpicio_old.c b/src/tests/deprecated/vpicio_old.c
similarity index 100%
rename from src/tests/vpicio_old.c
rename to src/tests/deprecated/vpicio_old.c
diff --git a/src/tests/vpicio_v2.c b/src/tests/deprecated/vpicio_v2.c
similarity index 100%
rename from src/tests/vpicio_v2.c
rename to src/tests/deprecated/vpicio_v2.c
diff --git a/src/tests/bdcats.c b/src/tests/misc/bdcats.c
similarity index 100%
rename from src/tests/bdcats.c
rename to src/tests/misc/bdcats.c
diff --git a/src/tests/client_server.c b/src/tests/misc/client_server.c
similarity index 100%
rename from src/tests/client_server.c
rename to src/tests/misc/client_server.c
diff --git a/src/tests/consistency_semantics.c b/src/tests/misc/consistency_semantics.c
similarity index 100%
rename from src/tests/consistency_semantics.c
rename to src/tests/misc/consistency_semantics.c
diff --git a/src/tests/data_rw_test.c b/src/tests/misc/data_rw_test.c
similarity index 100%
rename from src/tests/data_rw_test.c
rename to src/tests/misc/data_rw_test.c
diff --git a/src/tests/dt_conv.c b/src/tests/misc/dt_conv.c
similarity index 100%
rename from src/tests/dt_conv.c
rename to src/tests/misc/dt_conv.c
diff --git a/src/tests/gen_fastbit_idx.c b/src/tests/misc/gen_fastbit_idx.c
similarity index 100%
rename from src/tests/gen_fastbit_idx.c
rename to src/tests/misc/gen_fastbit_idx.c
diff --git a/src/tests/hash_table.c b/src/tests/misc/hash_table.c
similarity index 100%
rename from src/tests/hash_table.c
rename to src/tests/misc/hash_table.c
diff --git a/src/tests/idioms_ci_test.c b/src/tests/misc/idioms_ci_test.c
similarity index 100%
rename from src/tests/idioms_ci_test.c
rename to src/tests/misc/idioms_ci_test.c
diff --git a/src/tests/import_vpic.c b/src/tests/misc/import_vpic.c
similarity index 100%
rename from src/tests/import_vpic.c
rename to src/tests/misc/import_vpic.c
diff --git a/src/tests/init_only.c b/src/tests/misc/init_only.c
similarity index 100%
rename from src/tests/init_only.c
rename to src/tests/misc/init_only.c
diff --git a/src/tests/list_all.c b/src/tests/misc/list_all.c
similarity index 100%
rename from src/tests/list_all.c
rename to src/tests/misc/list_all.c
diff --git a/src/tests/llsm_idioms_bench.c b/src/tests/misc/llsm_idioms_bench.c
similarity index 100%
rename from src/tests/llsm_idioms_bench.c
rename to src/tests/misc/llsm_idioms_bench.c
diff --git a/src/tests/pdc_init.c b/src/tests/misc/pdc_init.c
similarity index 100%
rename from src/tests/pdc_init.c
rename to src/tests/misc/pdc_init.c
diff --git a/src/tests/producer_waitall.c b/src/tests/misc/producer_waitall.c
similarity index 100%
rename from src/tests/producer_waitall.c
rename to src/tests/misc/producer_waitall.c
diff --git a/src/tests/read_write_col_perf.c b/src/tests/misc/read_write_col_perf.c
similarity index 100%
rename from src/tests/read_write_col_perf.c
rename to src/tests/misc/read_write_col_perf.c
diff --git a/src/tests/read_write_perf.c b/src/tests/misc/read_write_perf.c
similarity index 100%
rename from src/tests/read_write_perf.c
rename to src/tests/misc/read_write_perf.c
diff --git a/src/tests/vpicio.c b/src/tests/misc/vpicio.c
similarity index 100%
rename from src/tests/vpicio.c
rename to src/tests/misc/vpicio.c
diff --git a/src/tests/vpicio_mts.c b/src/tests/misc/vpicio_mts.c
similarity index 100%
rename from src/tests/vpicio_mts.c
rename to src/tests/misc/vpicio_mts.c
diff --git a/src/tests/create_obj.c b/src/tests/obj/create_obj.c
similarity index 100%
rename from src/tests/create_obj.c
rename to src/tests/obj/create_obj.c
diff --git a/src/tests/create_obj_coll.c b/src/tests/obj/create_obj_coll.c
similarity index 100%
rename from src/tests/create_obj_coll.c
rename to src/tests/obj/create_obj_coll.c
diff --git a/src/tests/create_obj_scale.c b/src/tests/obj/create_obj_scale.c
similarity index 100%
rename from src/tests/create_obj_scale.c
rename to src/tests/obj/create_obj_scale.c
diff --git a/src/tests/delete_obj.c b/src/tests/obj/delete_obj.c
similarity index 100%
rename from src/tests/delete_obj.c
rename to src/tests/obj/delete_obj.c
diff --git a/src/tests/delete_obj_scale.c b/src/tests/obj/delete_obj_scale.c
similarity index 100%
rename from src/tests/delete_obj_scale.c
rename to src/tests/obj/delete_obj_scale.c
diff --git a/src/tests/obj_buf.c b/src/tests/obj/obj_buf.c
similarity index 100%
rename from src/tests/obj_buf.c
rename to src/tests/obj/obj_buf.c
diff --git a/src/tests/obj_del.c b/src/tests/obj/obj_del.c
similarity index 100%
rename from src/tests/obj_del.c
rename to src/tests/obj/obj_del.c
diff --git a/src/tests/obj_dim.c b/src/tests/obj/obj_dim.c
similarity index 100%
rename from src/tests/obj_dim.c
rename to src/tests/obj/obj_dim.c
diff --git a/src/tests/obj_get_data.c b/src/tests/obj/obj_get_data.c
similarity index 100%
rename from src/tests/obj_get_data.c
rename to src/tests/obj/obj_get_data.c
diff --git a/src/tests/obj_info.c b/src/tests/obj/obj_info.c
similarity index 100%
rename from src/tests/obj_info.c
rename to src/tests/obj/obj_info.c
diff --git a/src/tests/obj_iter.c b/src/tests/obj/obj_iter.c
similarity index 100%
rename from src/tests/obj_iter.c
rename to src/tests/obj/obj_iter.c
diff --git a/src/tests/obj_life.c b/src/tests/obj/obj_life.c
similarity index 100%
rename from src/tests/obj_life.c
rename to src/tests/obj/obj_life.c
diff --git a/src/tests/obj_map.c b/src/tests/obj/obj_map.c
similarity index 100%
rename from src/tests/obj_map.c
rename to src/tests/obj/obj_map.c
diff --git a/src/tests/obj_put_data.c b/src/tests/obj/obj_put_data.c
similarity index 100%
rename from src/tests/obj_put_data.c
rename to src/tests/obj/obj_put_data.c
diff --git a/src/tests/obj_round_robin_io.c b/src/tests/obj/obj_round_robin_io.c
similarity index 100%
rename from src/tests/obj_round_robin_io.c
rename to src/tests/obj/obj_round_robin_io.c
diff --git a/src/tests/obj_round_robin_io_all.c b/src/tests/obj/obj_round_robin_io_all.c
similarity index 100%
rename from src/tests/obj_round_robin_io_all.c
rename to src/tests/obj/obj_round_robin_io_all.c
diff --git a/src/tests/obj_tags.c b/src/tests/obj/obj_tags.c
similarity index 100%
rename from src/tests/obj_tags.c
rename to src/tests/obj/obj_tags.c
diff --git a/src/tests/open_existing_obj.c b/src/tests/obj/open_existing_obj.c
similarity index 100%
rename from src/tests/open_existing_obj.c
rename to src/tests/obj/open_existing_obj.c
diff --git a/src/tests/open_obj.c b/src/tests/obj/open_obj.c
similarity index 100%
rename from src/tests/open_obj.c
rename to src/tests/obj/open_obj.c
diff --git a/src/tests/open_obj_round_robin.c b/src/tests/obj/open_obj_round_robin.c
similarity index 100%
rename from src/tests/open_obj_round_robin.c
rename to src/tests/obj/open_obj_round_robin.c
diff --git a/src/tests/read_obj.c b/src/tests/obj/read_obj.c
similarity index 100%
rename from src/tests/read_obj.c
rename to src/tests/obj/read_obj.c
diff --git a/src/tests/read_obj_shared.c b/src/tests/obj/read_obj_shared.c
similarity index 100%
rename from src/tests/read_obj_shared.c
rename to src/tests/obj/read_obj_shared.c
diff --git a/src/tests/search_obj.c b/src/tests/obj/search_obj.c
similarity index 100%
rename from src/tests/search_obj.c
rename to src/tests/obj/search_obj.c
diff --git a/src/tests/search_obj_scale.c b/src/tests/obj/search_obj_scale.c
similarity index 100%
rename from src/tests/search_obj_scale.c
rename to src/tests/obj/search_obj_scale.c
diff --git a/src/tests/stat_obj.c b/src/tests/obj/stat_obj.c
similarity index 100%
rename from src/tests/stat_obj.c
rename to src/tests/obj/stat_obj.c
diff --git a/src/tests/update_obj.c b/src/tests/obj/update_obj.c
similarity index 100%
rename from src/tests/update_obj.c
rename to src/tests/obj/update_obj.c
diff --git a/src/tests/write_obj_shared.c b/src/tests/obj/write_obj_shared.c
similarity index 100%
rename from src/tests/write_obj_shared.c
rename to src/tests/obj/write_obj_shared.c
diff --git a/src/tests/create_prop.c b/src/tests/prop/create_prop.c
similarity index 100%
rename from src/tests/create_prop.c
rename to src/tests/prop/create_prop.c
diff --git a/src/tests/dup_prop.c b/src/tests/prop/dup_prop.c
similarity index 100%
rename from src/tests/dup_prop.c
rename to src/tests/prop/dup_prop.c
diff --git a/src/tests/set_prop.c b/src/tests/prop/set_prop.c
similarity index 100%
rename from src/tests/set_prop.c
rename to src/tests/prop/set_prop.c
diff --git a/src/tests/query_data.c b/src/tests/query/query_data.c
similarity index 100%
rename from src/tests/query_data.c
rename to src/tests/query/query_data.c
diff --git a/src/tests/query_metadata_agg.c b/src/tests/query/query_metadata_agg.c
similarity index 100%
rename from src/tests/query_metadata_agg.c
rename to src/tests/query/query_metadata_agg.c
diff --git a/src/tests/query_vpic.c b/src/tests/query/query_vpic.c
similarity index 100%
rename from src/tests/query_vpic.c
rename to src/tests/query/query_vpic.c
diff --git a/src/tests/query_vpic_bin_sds1_nopreload.c b/src/tests/query/query_vpic_bin_sds1_nopreload.c
similarity index 100%
rename from src/tests/query_vpic_bin_sds1_nopreload.c
rename to src/tests/query/query_vpic_bin_sds1_nopreload.c
diff --git a/src/tests/query_vpic_bin_sds1_preload.c b/src/tests/query/query_vpic_bin_sds1_preload.c
similarity index 100%
rename from src/tests/query_vpic_bin_sds1_preload.c
rename to src/tests/query/query_vpic_bin_sds1_preload.c
diff --git a/src/tests/query_vpic_bin_sds_nopreload.c b/src/tests/query/query_vpic_bin_sds_nopreload.c
similarity index 100%
rename from src/tests/query_vpic_bin_sds_nopreload.c
rename to src/tests/query/query_vpic_bin_sds_nopreload.c
diff --git a/src/tests/query_vpic_bin_sds_preload.c b/src/tests/query/query_vpic_bin_sds_preload.c
similarity index 100%
rename from src/tests/query_vpic_bin_sds_preload.c
rename to src/tests/query/query_vpic_bin_sds_preload.c
diff --git a/src/tests/query_vpic_create_data.c b/src/tests/query/query_vpic_create_data.c
similarity index 100%
rename from src/tests/query_vpic_create_data.c
rename to src/tests/query/query_vpic_create_data.c
diff --git a/src/tests/query_vpic_exyz_nopreload.c b/src/tests/query/query_vpic_exyz_nopreload.c
similarity index 100%
rename from src/tests/query_vpic_exyz_nopreload.c
rename to src/tests/query/query_vpic_exyz_nopreload.c
diff --git a/src/tests/query_vpic_exyz_preload.c b/src/tests/query/query_vpic_exyz_preload.c
similarity index 100%
rename from src/tests/query_vpic_exyz_preload.c
rename to src/tests/query/query_vpic_exyz_preload.c
diff --git a/src/tests/query_vpic_multi.c b/src/tests/query/query_vpic_multi.c
similarity index 100%
rename from src/tests/query_vpic_multi.c
rename to src/tests/query/query_vpic_multi.c
diff --git a/src/tests/query_vpic_multi_nopreload.c b/src/tests/query/query_vpic_multi_nopreload.c
similarity index 100%
rename from src/tests/query_vpic_multi_nopreload.c
rename to src/tests/query/query_vpic_multi_nopreload.c
diff --git a/src/tests/query_vpic_multi_nopreload1.c b/src/tests/query/query_vpic_multi_nopreload1.c
similarity index 100%
rename from src/tests/query_vpic_multi_nopreload1.c
rename to src/tests/query/query_vpic_multi_nopreload1.c
diff --git a/src/tests/query_vpic_multi_preload.c b/src/tests/query/query_vpic_multi_preload.c
similarity index 100%
rename from src/tests/query_vpic_multi_preload.c
rename to src/tests/query/query_vpic_multi_preload.c
diff --git a/src/tests/create_region.c b/src/tests/region/create_region.c
similarity index 100%
rename from src/tests/create_region.c
rename to src/tests/region/create_region.c
diff --git a/src/tests/region_obj_map_overlap_3D.c b/src/tests/region/region_obj_map_overlap_3D.c
similarity index 100%
rename from src/tests/region_obj_map_overlap_3D.c
rename to src/tests/region/region_obj_map_overlap_3D.c
diff --git a/src/tests/region_transfer.c b/src/tests/region/region_transfer.c
similarity index 100%
rename from src/tests/region_transfer.c
rename to src/tests/region/region_transfer.c
diff --git a/src/tests/region_transfer_2D.c b/src/tests/region/region_transfer_2D.c
similarity index 100%
rename from src/tests/region_transfer_2D.c
rename to src/tests/region/region_transfer_2D.c
diff --git a/src/tests/region_transfer_2D_partial.c b/src/tests/region/region_transfer_2D_partial.c
similarity index 100%
rename from src/tests/region_transfer_2D_partial.c
rename to src/tests/region/region_transfer_2D_partial.c
diff --git a/src/tests/region_transfer_2D_skewed.c b/src/tests/region/region_transfer_2D_skewed.c
similarity index 100%
rename from src/tests/region_transfer_2D_skewed.c
rename to src/tests/region/region_transfer_2D_skewed.c
diff --git a/src/tests/region_transfer_3D.c b/src/tests/region/region_transfer_3D.c
similarity index 100%
rename from src/tests/region_transfer_3D.c
rename to src/tests/region/region_transfer_3D.c
diff --git a/src/tests/region_transfer_3D_partial.c b/src/tests/region/region_transfer_3D_partial.c
similarity index 100%
rename from src/tests/region_transfer_3D_partial.c
rename to src/tests/region/region_transfer_3D_partial.c
diff --git a/src/tests/region_transfer_3D_skewed.c b/src/tests/region/region_transfer_3D_skewed.c
similarity index 100%
rename from src/tests/region_transfer_3D_skewed.c
rename to src/tests/region/region_transfer_3D_skewed.c
diff --git a/src/tests/region_transfer_all.c b/src/tests/region/region_transfer_all.c
similarity index 100%
rename from src/tests/region_transfer_all.c
rename to src/tests/region/region_transfer_all.c
diff --git a/src/tests/region_transfer_all_2D.c b/src/tests/region/region_transfer_all_2D.c
similarity index 100%
rename from src/tests/region_transfer_all_2D.c
rename to src/tests/region/region_transfer_all_2D.c
diff --git a/src/tests/region_transfer_all_3D.c b/src/tests/region/region_transfer_all_3D.c
similarity index 100%
rename from src/tests/region_transfer_all_3D.c
rename to src/tests/region/region_transfer_all_3D.c
diff --git a/src/tests/region_transfer_all_append.c b/src/tests/region/region_transfer_all_append.c
similarity index 100%
rename from src/tests/region_transfer_all_append.c
rename to src/tests/region/region_transfer_all_append.c
diff --git a/src/tests/region_transfer_all_append_2D.c b/src/tests/region/region_transfer_all_append_2D.c
similarity index 100%
rename from src/tests/region_transfer_all_append_2D.c
rename to src/tests/region/region_transfer_all_append_2D.c
diff --git a/src/tests/region_transfer_all_append_3D.c b/src/tests/region/region_transfer_all_append_3D.c
similarity index 100%
rename from src/tests/region_transfer_all_append_3D.c
rename to src/tests/region/region_transfer_all_append_3D.c
diff --git a/src/tests/region_transfer_all_fold.c b/src/tests/region/region_transfer_all_fold.c
similarity index 100%
rename from src/tests/region_transfer_all_fold.c
rename to src/tests/region/region_transfer_all_fold.c
diff --git a/src/tests/region_transfer_all_split_wait.c b/src/tests/region/region_transfer_all_split_wait.c
similarity index 100%
rename from src/tests/region_transfer_all_split_wait.c
rename to src/tests/region/region_transfer_all_split_wait.c
diff --git a/src/tests/region_transfer_all_test.c b/src/tests/region/region_transfer_all_test.c
similarity index 100%
rename from src/tests/region_transfer_all_test.c
rename to src/tests/region/region_transfer_all_test.c
diff --git a/src/tests/region_transfer_merge.c b/src/tests/region/region_transfer_merge.c
similarity index 100%
rename from src/tests/region_transfer_merge.c
rename to src/tests/region/region_transfer_merge.c
diff --git a/src/tests/region_transfer_overlap.c b/src/tests/region/region_transfer_overlap.c
similarity index 100%
rename from src/tests/region_transfer_overlap.c
rename to src/tests/region/region_transfer_overlap.c
diff --git a/src/tests/region_transfer_overlap_2D.c b/src/tests/region/region_transfer_overlap_2D.c
similarity index 100%
rename from src/tests/region_transfer_overlap_2D.c
rename to src/tests/region/region_transfer_overlap_2D.c
diff --git a/src/tests/region_transfer_overlap_3D.c b/src/tests/region/region_transfer_overlap_3D.c
similarity index 100%
rename from src/tests/region_transfer_overlap_3D.c
rename to src/tests/region/region_transfer_overlap_3D.c
diff --git a/src/tests/region_transfer_partial.c b/src/tests/region/region_transfer_partial.c
similarity index 100%
rename from src/tests/region_transfer_partial.c
rename to src/tests/region/region_transfer_partial.c
diff --git a/src/tests/region_transfer_query.c b/src/tests/region/region_transfer_query.c
similarity index 100%
rename from src/tests/region_transfer_query.c
rename to src/tests/region/region_transfer_query.c
diff --git a/src/tests/region_transfer_read_only.c b/src/tests/region/region_transfer_read_only.c
similarity index 100%
rename from src/tests/region_transfer_read_only.c
rename to src/tests/region/region_transfer_read_only.c
diff --git a/src/tests/region_transfer_set_dims.c b/src/tests/region/region_transfer_set_dims.c
similarity index 100%
rename from src/tests/region_transfer_set_dims.c
rename to src/tests/region/region_transfer_set_dims.c
diff --git a/src/tests/region_transfer_set_dims_2D.c b/src/tests/region/region_transfer_set_dims_2D.c
similarity index 100%
rename from src/tests/region_transfer_set_dims_2D.c
rename to src/tests/region/region_transfer_set_dims_2D.c
diff --git a/src/tests/region_transfer_set_dims_3D.c b/src/tests/region/region_transfer_set_dims_3D.c
similarity index 100%
rename from src/tests/region_transfer_set_dims_3D.c
rename to src/tests/region/region_transfer_set_dims_3D.c
diff --git a/src/tests/region_transfer_skewed.c b/src/tests/region/region_transfer_skewed.c
similarity index 100%
rename from src/tests/region_transfer_skewed.c
rename to src/tests/region/region_transfer_skewed.c
diff --git a/src/tests/region_transfer_status.c b/src/tests/region/region_transfer_status.c
similarity index 100%
rename from src/tests/region_transfer_status.c
rename to src/tests/region/region_transfer_status.c
diff --git a/src/tests/region_transfer_write_only.c b/src/tests/region/region_transfer_write_only.c
similarity index 100%
rename from src/tests/region_transfer_write_only.c
rename to src/tests/region/region_transfer_write_only.c
diff --git a/src/tests/region_transfer_write_read.c b/src/tests/region/region_transfer_write_read.c
similarity index 100%
rename from src/tests/region_transfer_write_read.c
rename to src/tests/region/region_transfer_write_read.c
diff --git a/src/tests/run_multiple_mpi_test.sh b/src/tests/run_multiple_mpi_test.sh
index 957473fa8..70c3002ae 100644
--- a/src/tests/run_multiple_mpi_test.sh
+++ b/src/tests/run_multiple_mpi_test.sh
@@ -47,6 +47,6 @@ done
 ret="$?"
 # and shutdown the SERVER before exiting
 echo "Close server"
-echo "$mpi_cmd -n 1 $extra_cmd ./close_server"
-$mpi_cmd -n 1 $extra_cmd ./close_server
+echo "$mpi_cmd -n $n_servers $extra_cmd ./close_server"
+$mpi_cmd -n $n_servers $extra_cmd ./close_server
 exit $ret
diff --git a/src/tests/kvtag_add_get.c b/src/tests/tags/kvtag_add_get.c
similarity index 100%
rename from src/tests/kvtag_add_get.c
rename to src/tests/tags/kvtag_add_get.c
diff --git a/src/tests/kvtag_add_get_benchmark.c b/src/tests/tags/kvtag_add_get_benchmark.c
similarity index 100%
rename from src/tests/kvtag_add_get_benchmark.c
rename to src/tests/tags/kvtag_add_get_benchmark.c
diff --git a/src/tests/kvtag_add_get_scale.c b/src/tests/tags/kvtag_add_get_scale.c
similarity index 100%
rename from src/tests/kvtag_add_get_scale.c
rename to src/tests/tags/kvtag_add_get_scale.c
diff --git a/src/tests/kvtag_affix_query_scale.c b/src/tests/tags/kvtag_affix_query_scale.c
similarity index 100%
rename from src/tests/kvtag_affix_query_scale.c
rename to src/tests/tags/kvtag_affix_query_scale.c
diff --git a/src/tests/kvtag_get.c b/src/tests/tags/kvtag_get.c
similarity index 100%
rename from src/tests/kvtag_get.c
rename to src/tests/tags/kvtag_get.c
diff --git a/src/tests/kvtag_query.c b/src/tests/tags/kvtag_query.c
similarity index 100%
rename from src/tests/kvtag_query.c
rename to src/tests/tags/kvtag_query.c
diff --git a/src/tests/kvtag_range_query_scale.c b/src/tests/tags/kvtag_range_query_scale.c
similarity index 100%
rename from src/tests/kvtag_range_query_scale.c
rename to src/tests/tags/kvtag_range_query_scale.c
diff --git a/src/tests/pdc_transforms_lib.c b/src/tests/transform/pdc_transforms_lib.c
similarity index 100%
rename from src/tests/pdc_transforms_lib.c
rename to src/tests/transform/pdc_transforms_lib.c