diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index 098c684fa716cdf0e98237c9e02791e997408c22..b8bd2079a362f6248689512c736702f4e72eecf3 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -379,17 +379,20 @@ namespace InDet {
 }
 
 StatusCode TrigFastTrackFinder::execute() {
+
   auto ctx = getContext();
   //RoI preparation/update 
+
   SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey, ctx);
+
   ATH_CHECK(roiCollection.isValid());
-  TrigRoiDescriptorCollection::const_iterator roi = roiCollection->begin();
-  TrigRoiDescriptorCollection::const_iterator roiE = roiCollection->end();
+
   TrigRoiDescriptor internalRoI;
-  for (; roi != roiE; ++roi) {
-    internalRoI.push_back(*roi);
-  }
-  internalRoI.manageConstituents(false);//Don't try to delete RoIs at the end
+
+  if ( roiCollection->size()>1 ) ATH_MSG_WARNING( "More than one Roi in the collection: " << m_roiCollectionKey << ", this is not supported - use a composite Roi" );  
+  if ( roiCollection->size()>0 ) internalRoI = **roiCollection->begin();
+
+  //  internalRoI.manageConstituents(false);//Don't try to delete RoIs at the end
   m_countTotalRoI++;
 
   SG::WriteHandle<TrackCollection> outputTracks(m_outputTracksKey, ctx);
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index b79b909a9db537df7afb7b87e37f12c42c3a41e1..c55807ce0c8cf8fac9c411ce7e9d7717cb08230f 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package( requests )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/TrigInDetValidation_*.py share/Cosmic.py)
+atlas_install_joboptions( share/TrigInDetValidation_*.py share/Cosmic.py share/*.py )
 atlas_install_data( share/*.json)
 atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_*.py TIDAbuild )
 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
index 7ad6eeb5cdfbe981d33cbd027fd215a692515fa0..7cbc02fdacab82f0b864ef8eb06e31158c786d81 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_Base.py
@@ -65,6 +65,9 @@ else :
     lowpt_local = [ False ]
 
 
+if "Args" not in locals() : 
+    Args = " "
+
 # allow command line to override programed number of events to process
 
 if Events_local != 0 : 
@@ -109,13 +112,13 @@ for ref in TrackReference :
     ext       = ''
 
     if   ( ref == 'Truth' ) :
-        args = 'TIDAdata-run3.dat  -b Test_bin.dat -o '+hist_file
+        args = 'TIDAdata-run3.dat  -b Test_bin.dat -o ' + hist_file + Args
     elif ( ref == 'Offline' ) :
         # if more than one reefrence ...
         if len(TrackReference)>1 : 
             hist_file = 'data-hists-offline.root'
             ext       = 'offline'
-        args = 'TIDAdata-run3-offline.dat  -b Test_bin.dat -o '+hist_file
+        args = 'TIDAdata-run3-offline.dat -r Offline  -b Test_bin.dat -o ' + hist_file
     else :
         # here actually we should allow functionality 
         # to use different pdgid truth or offline as
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
index ba01bff8d11a7d751a3487bf64f3e086b8084797..545a0469fe9cf56880b89dbe6f6734abd4d136b2 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_mt.py
@@ -29,10 +29,11 @@
 
 Slices  = ['muon']
 RunEF   = True
-Events  = 2000 
+Events  = 8000 
 Threads = 4 
 Slots   = 4 # what about the mt: 4 art directive ? nfiles: 3 ?
 Input   = 'Zmumu_pu40'    # defined in TrigValTools/share/TrigValInputs.json
+Args    = " -p 13 "
 
 TrackReference = [ 'Truth', 'Offline' ]
 Lowpt          = [ False, True ]