diff --git a/duneprototypes/Coldbox/vd/Tools/test/CMakeLists.txt b/duneprototypes/Coldbox/vd/Tools/test/CMakeLists.txt
index dcb0f669..83af0aa5 100644
--- a/duneprototypes/Coldbox/vd/Tools/test/CMakeLists.txt
+++ b/duneprototypes/Coldbox/vd/Tools/test/CMakeLists.txt
@@ -7,6 +7,13 @@
 
 include(CetTest)
 
+cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
+cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${dunedataprep_BINARY_DIR}/fcl)
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
+cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data ${dunedataprep_BINARY_DIR}/config_data)
+
 cet_test(test_VDColdboxChannelRanges SOURCE test_VDColdboxChannelRanges.cxx
   LIBRARIES
     dunecore::ArtSupport
diff --git a/duneprototypes/Protodune/hd/ChannelMap/CMakeLists.txt b/duneprototypes/Protodune/hd/ChannelMap/CMakeLists.txt
index ab259a93..283011b6 100644
--- a/duneprototypes/Protodune/hd/ChannelMap/CMakeLists.txt
+++ b/duneprototypes/Protodune/hd/ChannelMap/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories($ENV{NLOHMANN_JSON_INC})
+include_directories("${nlohmann_json_DIR}/../../../include")
 
 install_fhicl()
 install_headers()
@@ -15,4 +16,6 @@ art_make(SERVICE_LIBRARIES
                            messagefacility::MF_MessageLogger
                            ROOT::Core
  	                   duneprototypes::Protodune_hd_ChannelMap
+         LIB_LIBRARIES
+                           nlohmann_json::nlohmann_json
 )
diff --git a/duneprototypes/Protodune/hd/Tool/test/CMakeLists.txt b/duneprototypes/Protodune/hd/Tool/test/CMakeLists.txt
index 03c04070..a7dd2ac1 100644
--- a/duneprototypes/Protodune/hd/Tool/test/CMakeLists.txt
+++ b/duneprototypes/Protodune/hd/Tool/test/CMakeLists.txt
@@ -4,6 +4,14 @@
 # June 2021
 
 # Build test for each tool.
+include(CetTest)
+
+cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
+cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl)
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
+cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data)
 
 cet_test(test_PdhdChannelRanges SOURCE test_PdhdChannelRanges.cxx
   LIBRARIES
@@ -30,4 +38,3 @@ cet_test(test_PdhdChannelGroups SOURCE test_PdhdChannelGroups.cxx
     SQLite::SQLite3
     Boost::filesystem
 )
-include(CetTest)
diff --git a/duneprototypes/Protodune/hd/fcl/test/CMakeLists.txt b/duneprototypes/Protodune/hd/fcl/test/CMakeLists.txt
index 1b95f0cb..2b37626e 100644
--- a/duneprototypes/Protodune/hd/fcl/test/CMakeLists.txt
+++ b/duneprototypes/Protodune/hd/fcl/test/CMakeLists.txt
@@ -7,6 +7,14 @@
 
 include(CetTest)
 
+cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
+cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+cet_transitive_paths(CONFIG_DATA_DIR BINARY IN_TREE)
+cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_CONFIG_DATA_DIR} ${PROJECT_BINARY_DIR}/config_data)
+cet_test_env_prepend(FW_SEARCH_PATH ${dunepdlegacy_BINARY_DIR}/files ${PROJECT_BINARY_PATH}/config_files)
+
 cet_test(test_fcl_pdhdChannelFemb SOURCE test_fcl_pdhdChannelFemb.cxx
   LIBRARIES
     dunecore::ArtSupport
diff --git a/duneprototypes/Protodune/singlephase/BeamReco/CMakeLists.txt b/duneprototypes/Protodune/singlephase/BeamReco/CMakeLists.txt
index 29365fce..4c25510a 100644
--- a/duneprototypes/Protodune/singlephase/BeamReco/CMakeLists.txt
+++ b/duneprototypes/Protodune/singlephase/BeamReco/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 include_directories("${dunedetdataformats_DIR}/../../../include")
-cet_build_plugin( BeamEvent art::module LIBRARIES 
+cet_build_plugin( BeamEvent art::module LIBRARIES
                         dunecore::ArtSupport
                         ifbeam::ifbeam
                         ifdh_art::IFBeam_service
@@ -14,14 +14,14 @@ cet_build_plugin( BeamEvent art::module LIBRARIES
                         lardata::ArtDataHelper
                         lardata::Utilities
                         lardataalg::UtilitiesHeaders
-                        larsim::Simulation 
+                        larsim::Simulation
                         lardataobj::Simulation
                         dunecore::DuneObj
                         #dune_raw_data::dune-raw-data_Services_ChannelMap_PdspChannelMapService_service
                         larsim::MCCheater_PhotonBackTrackerService_service
                         larsim::MCCheater_BackTrackerService_service
                         larsim::MCCheater_ParticleInventoryService_service
-                        nug4::ParticleNavigation 
+                        nug4::ParticleNavigation
                         nusimdata::SimulationBase
                         art::Framework_Core
                         art::Framework_Principal
@@ -43,21 +43,30 @@ find_library(IFDH ifdh)
 cet_make_exec(
   test_ifbeam
   SOURCE test_ifbeam.c++
-  LIBRARIES 
-    IFBEAM
-    IFDH
+  LIBRARIES
+    ifdh::ifdh
+    ifdh_art::IFBeam_service
+    #IFBEAM
+    #IFDH
     #wda
     #curl
 )
 
 target_include_directories(
   test_ifbeam
-  PUBLIC 
+  PUBLIC
     $ENV{IFDH_ART_INC}
     $ENV{IFDHC_INC}
     "$ENV{LIBWDA_FQ_DIR}/include"
     "$ENV{IFBEAM_FQ_DIR}/include"
-)    
+)
+
+target_link_libraries(
+   test_ifbeam
+   PRIVATE
+   ifdh::ifdh
+   ifbeam::ifbeam
+)
 
 
 install_headers()
diff --git a/duneprototypes/Protodune/singlephase/Tool/test/CMakeLists.txt b/duneprototypes/Protodune/singlephase/Tool/test/CMakeLists.txt
index 68e7f411..6a922db7 100644
--- a/duneprototypes/Protodune/singlephase/Tool/test/CMakeLists.txt
+++ b/duneprototypes/Protodune/singlephase/Tool/test/CMakeLists.txt
@@ -7,6 +7,12 @@
 
 include(CetTest)
 
+cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
+cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+cet_test_env_prepend(FW_SEARCH_PATH ${dunepdlegacy_BINARY_DIR}/files ${PROJECT_BINARY_PATH}/config_files)
+
 cet_test(test_PdspOnlineChannel SOURCE test_PdspOnlineChannel.cxx
   LIBRARIES
     dunecore::ArtSupport
diff --git a/duneprototypes/Protodune/singlephase/Utility/test/CMakeLists.txt b/duneprototypes/Protodune/singlephase/Utility/test/CMakeLists.txt
index bcc1e6f3..cb7f70ce 100644
--- a/duneprototypes/Protodune/singlephase/Utility/test/CMakeLists.txt
+++ b/duneprototypes/Protodune/singlephase/Utility/test/CMakeLists.txt
@@ -7,6 +7,11 @@
 
 include(CetTest)
 
+cet_transitive_paths(FHICL_DIR BINARY IN_TREE)
+cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR})
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+
 cet_test(test_ProtoduneChannelHelper SOURCE test_ProtoduneChannelHelper.cxx
   LIBRARIES
     duneprototypes_Protodune_singlephase_Utility