diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 717087ee48431922fed2224e5f36c3f75da10df4..ce5e65bbf59f3f283ea2e9daf896500ed7b246b0 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -308,11 +308,11 @@
 + Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools
 + Simulation/ISF/ISF_SimulationSelectors
 + Simulation/ISF/ISF_Tracking/ISF_TrackingInterfaces
-+ Simulation/ISF/ISF_Validation
 + Simulation/Interfaces/HepMC_Interfaces
 + Simulation/RunDependentSim/RunDependentSimComps
 + Simulation/SimuJobTransforms
 + Simulation/SimulationJobOptions
++ Simulation/Tests/ISF_Validation
 + Simulation/Tools/AtlasCLHEP_RandomGenerators
 + Simulation/Tools/McEventCollectionFilter
 + TileCalorimeter/TileCalib/TileCalibBlobObjs
diff --git a/Simulation/ISF/ISF_Validation/CMakeLists.txt b/Simulation/Tests/ISF_Validation/CMakeLists.txt
similarity index 100%
rename from Simulation/ISF/ISF_Validation/CMakeLists.txt
rename to Simulation/Tests/ISF_Validation/CMakeLists.txt
diff --git a/Simulation/ISF/ISF_Validation/scripts/generate_new_ISF_RTT_MCProd_references.sh b/Simulation/Tests/ISF_Validation/scripts/generate_new_ISF_RTT_MCProd_references.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/scripts/generate_new_ISF_RTT_MCProd_references.sh
rename to Simulation/Tests/ISF_Validation/scripts/generate_new_ISF_RTT_MCProd_references.sh
diff --git a/Simulation/ISF/ISF_Validation/scripts/skip_if_dbg.sh b/Simulation/Tests/ISF_Validation/scripts/skip_if_dbg.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/scripts/skip_if_dbg.sh
rename to Simulation/Tests/ISF_Validation/scripts/skip_if_dbg.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh b/Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
rename to Simulation/Tests/ISF_Validation/test/test_AtlasG4_FullG4_comparison.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_FatrasGammaCones_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_FullG4_LongLived_ZPrime_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_FullG4_LongLived_ZPrime_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_FullG4_LongLived_ZPrime_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_FullG4_LongLived_ZPrime_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_FullG4_ttbar_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_FullG4_ttbar_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_FullG4_ttbar_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4BHadronsOnly_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4GammaCones_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4GammaCones_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4GammaCones_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4GammaCones_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4JPsiLeptonsCone_FatrasID_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4JPsiLeptonsCone_FatrasID_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4JPsiLeptonsCone_FatrasID_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4JPsiLeptonsCone_FatrasID_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4WLeptonsCone_FatrasID_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4WLeptonsCone_FatrasID_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4WLeptonsCone_FatrasID_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4WLeptonsCone_FatrasID_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_G4ZDecayProducts_FatrasID_FastCalo_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_G4ZDecayProducts_FatrasID_FastCalo_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_G4ZDecayProducts_FatrasID_FastCalo_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_G4ZDecayProducts_FatrasID_FastCalo_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_MC16_G4FastCalo_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_minbias.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_minbias.sh
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
similarity index 100%
rename from Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_ttbar.sh