diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
index fcb8218209a41decd71f943840c887a18b0e6982..88fd9e9b976ed2961f21832ece1f401e47cde345 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
@@ -10,17 +10,11 @@ from DaVinci.Configuration import DaVinci
 from Gaudi.Configuration import *
 ##############################################################################
 #
-# CommonParticles
-# Thanks to Vanya for this trick
-#
 from CommonParticles import StandardBasic
-#from CommonParticles import StandardIntermediate
-#from CommonParticles.Utils import particles  # particles() method returns DoD dictionary
-List = []
+
 Locations = []
 for a,b in StandardBasic.locations.iteritems():
     print "DVTestCommonParticles adding location", a
-    List.append(b)                      # ist of algorithms
     Locations.append(a)
 
 from Configurables import CountParticles
@@ -35,16 +29,10 @@ DaVinci().HistogramFile = "DVStandardBasic.root"
 # Most of this will be configured from Dirac
 #
 ##############################################################################
-# DaVinci().UserAlgorithms = List   # explicitly run them
 DaVinci().UserAlgorithms = [ CP ]   # count them all
 DaVinci().EvtMax = 500
 DaVinci().DataType = "2010"
 DaVinci().Simulation = False
 DaVinci().InputType = "DST"
 
-#importOptions("../dimuon_testfile.py")
-
-#EventSelector().Input   = [
-#    "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/data/2009/RDST/00004937/0000/00004937_00000001_1.rdst' TYP='POOL_ROOTTREE' OPT='READ'"]
-    
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
index 44c89c85fa9f405671eae903521dea9a3e02c7eb..1cdb1e493fe2a7bdeb48913d73ddfede9238d3cd 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
@@ -10,17 +10,12 @@ from DaVinci.Configuration import DaVinci
 from Gaudi.Configuration import *
 ##############################################################################
 #
-# CommonParticles
-# Thanks to Vanya for this trick
-#
 from CommonParticles import StandardBasic
 from CommonParticles import StandardIntermediate
-#from CommonParticles.Utils import particles  # particles() method returns DoD dictionary
-List = []
+
 Locations = []
 for a,b in StandardIntermediate.locations.iteritems():
     print "DVTestCommonParticles adding location", a
-    List.append(b)                      # ist of algorithms
     Locations.append(a)
 
 from Configurables import CountParticles
@@ -35,16 +30,10 @@ DaVinci().HistogramFile = "DVStandardIntermediate.root"
 # Most of this will be configured from Dirac
 #
 ##############################################################################
-# DaVinci().UserAlgorithms = List   # explicitly run them
 DaVinci().UserAlgorithms = [ CP ]   # count them all
 DaVinci().EvtMax = 500
 DaVinci().DataType = "2012"
 DaVinci().Simulation = False
 DaVinci().InputType = "DST"
 
-#importOptions("../dimuon_testfile.py")
-
-#EventSelector().Input   = [
-#    "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/data/2009/RDST/00004937/0000/00004937_00000001_1.rdst' TYP='POOL_ROOTTREE' OPT='READ'"]
-    
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
index faa4e7eba44dc8ac3937e97230d8609245d6cb0c..5bfd90250666607788498d0ba1d08dee234ead12 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
@@ -23,6 +23,4 @@ DaVinci( UserAlgorithms = List,
          Simulation = False,
          InputType = "DST"       )
 
-#importOptions("../dimuon_testfile.py")
-
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
index fad9fff7bcf7b097e73f6fd7c4d4ff444989ec92..1f07d818648df30c030eb245bd2b7bcdd319cd21 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
@@ -24,6 +24,4 @@ DaVinci( UserAlgorithms = List,
          Simulation = False,
          InputType = "DST"       )
 
-#importOptions("../dimuon_testfile.py")
-
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/dimuon_testfile.py b/DaVinciTests/tests/options/dimuon_testfile.py
index be92bb543ecbf516013d6bff5d2a362b5f5f509d..2aceb00bf5440269eeffa6853c04a9bdf9b6a29e 100644
--- a/DaVinciTests/tests/options/dimuon_testfile.py
+++ b/DaVinciTests/tests/options/dimuon_testfile.py
@@ -1,5 +1,2 @@
-from GaudiConf import IOHelper
-
-IOHelper('ROOT').inputFiles([
-        'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/freezer/lhcb/LHCb/Collision12/FULL.DST/00020330/0004/00020330_00047243_1.full.dst'
-        ])
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["2012_DaVinciTests.stripping.test_express_appconfig"].run(configurable=DaVinci())