diff --git a/Phys/Tesla/tests/options/DV_2015_CaloCheck.py b/Phys/Tesla/tests/options/DV_2015_CaloCheck.py
index ab683bea8763126e6e673dcd777a87aad56c4fd7..eed8c67e919be879a102498d7c965a6c0bc723c0 100644
--- a/Phys/Tesla/tests/options/DV_2015_CaloCheck.py
+++ b/Phys/Tesla/tests/options/DV_2015_CaloCheck.py
@@ -10,6 +10,7 @@ DstConf().Turbo=True
 DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().DataType="2015"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True ) 
diff --git a/Phys/Tesla/tests/options/DV_2015_SharedContainers.py b/Phys/Tesla/tests/options/DV_2015_SharedContainers.py
index bce27871996b6d08b5941328167c5b201b7a694e..be470648df5340bd4325fb68c23a4c3d9ecd583a 100644
--- a/Phys/Tesla/tests/options/DV_2015_SharedContainers.py
+++ b/Phys/Tesla/tests/options/DV_2015_SharedContainers.py
@@ -10,6 +10,7 @@ DstConf().Turbo=True
 DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().DataType="2015"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True ) 
diff --git a/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py b/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py
index eef664a07318b3dd26bb5d4e67b008baefb3744a..f82147108c97794b10c674559e36d2789809f315 100644
--- a/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py
+++ b/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py
@@ -8,6 +8,7 @@ DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().Lumi=True
 DaVinci().DataType="2016"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["DiMuon.dst"] , clear=True ) 
diff --git a/Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py b/Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py
index 4d695b41653e91870f647f4953f222c8caf3ead3..957dc7d1702abe2f4c52987f2930c8f96bff288f 100644
--- a/Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py
+++ b/Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py
@@ -8,6 +8,7 @@ DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().Lumi=True
 DaVinci().DataType="2016"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["Dstp_PR.dst"] , clear=True ) 
diff --git a/Phys/Tesla/tests/options/TeslaStep.py b/Phys/Tesla/tests/options/TeslaStep.py
index 5d86e0a6099049cce9ea360f348bb9d7c7c58384..431c35d3aee1cf2601116c4bbd1752971b20a858 100644
--- a/Phys/Tesla/tests/options/TeslaStep.py
+++ b/Phys/Tesla/tests/options/TeslaStep.py
@@ -4,7 +4,6 @@ Tesla().InputType = "RAW"
 Tesla().DataType = '2016'
 Tesla().Simulation = False
 Tesla().Mode = 'Online'
-Tesla().RawFormatVersion = 0.2
 Tesla().VertRepLoc = 'Hlt2'
 Tesla().KillInputHlt2Reps = True
 
diff --git a/Phys/Tesla/tests/options/TupleStep.py b/Phys/Tesla/tests/options/TupleStep.py
index 3287738e92bb55f5526013d2886adaf36755359e..1da06b26977e0002ac9b3b31854adad150c896fb 100644
--- a/Phys/Tesla/tests/options/TupleStep.py
+++ b/Phys/Tesla/tests/options/TupleStep.py
@@ -1,18 +1,10 @@
 from Configurables import DaVinci
 from Configurables import DecayTreeTuple
 
-from Configurables import DstConf
-DstConf().Turbo=True
-
 Tuple = DecayTreeTuple("psi")
 Tuple.Decay = "J/psi(1S) -> mu+ mu-"
 Tuple.Inputs = [ '/Event/Turbo/Hlt2DiMuonJPsiTurbo/Particles']
 
-from Configurables import DstConf, TurboConf
-DstConf().Turbo = True
-TurboConf().PersistReco = True
-from StandardParticles import StdAllNoPIDsPions
-
 # Necessary DaVinci parameters #################
 DaVinci().Simulation   = False
 DaVinci().SkipEvents = 0
@@ -24,4 +16,4 @@ DaVinci().DataType      = '2016'
 DaVinci().UserAlgorithms = [] 
 DaVinci().UserAlgorithms += [Tuple]
 DaVinci().InputType = 'MDST'
-
+DaVinci().Turbo = True
diff --git a/Phys/Tesla/tests/options/TupleStepOneLine.py b/Phys/Tesla/tests/options/TupleStepOneLine.py
index 80d825849924652c796c903a663e26b8cc9f70b7..21d75bb84fc352b5ab513067eb107554047e6dde 100644
--- a/Phys/Tesla/tests/options/TupleStepOneLine.py
+++ b/Phys/Tesla/tests/options/TupleStepOneLine.py
@@ -2,4 +2,4 @@ from GaudiConf import IOHelper
 IOHelper().inputFiles(['PFN:Tesla.dst'])
 from Configurables import DaVinci
 DaVinci().TupleFile = 'TupleStepOneLine.root'
-
+DaVinci().RootInTES = '/Event/Turbo'
diff --git a/Phys/Tesla/tests/options/TupleStepStreams.py b/Phys/Tesla/tests/options/TupleStepStreams.py
index e5c272338120deb5d0dc96f4ef1c0b7c75b81832..fab7702a6a6bd6b4b76b082f8cb88b17c9bf3358 100644
--- a/Phys/Tesla/tests/options/TupleStepStreams.py
+++ b/Phys/Tesla/tests/options/TupleStepStreams.py
@@ -2,3 +2,4 @@ from GaudiConf import IOHelper
 IOHelper().inputFiles(['PFN:DiMuon.dst'])
 from Configurables import DaVinci
 DaVinci().TupleFile = 'TupleStepStreams.root'
+DaVinci().RootInTES = '/Event/DiMuon/Turbo'
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt
index 2a3185cb1ed8514d2d0f24333df2f3e0731143d3..966e3ae7b2e6d13c88c42d7b7f866826ee4b3bcb 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt
@@ -20,7 +20,7 @@
     <text>../options/TeslaRawReprocess.py</text>
   </set></argument>
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":1595, "WARNING" :0})
+countErrorLines({"FATAL":0, "ERROR":1595, "WARNING" :1})
   </text></argument>
 </extension>
 
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/default.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/default.qmt
index c7fee8aed873e13dbf3238f08e020ff80031c70f..cb42dd7f53d9d775d82a5c4300e53a31179bf1fa 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/default.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/default.qmt
@@ -19,8 +19,9 @@
   <argument name="args"><set>
     <text>../options/default.py</text>
   </set></argument>
+  <!-- TODO: we see 161 more errors than we should -->
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":5561, "WARNING" :161})
+countErrorLines({"FATAL":0, "ERROR":5561, "WARNING" :162})
 #findReferenceBlock("""
 #Hlt2SelReportsD...  ERROR HltSelReportsDecoder::  Did not find string key for trigger selection in storage
 #""", id = "AllowResp" )
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/default_2015.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/default_2015.qmt
index 774042ecc76337e3f565d87b82202794daf15a4b..d94eb9f01a9fb747d69c76c3d198184db697bf8d 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/default_2015.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/default_2015.qmt
@@ -20,7 +20,7 @@
     <text>../options/TCK_2015RP.py</text>
   </set></argument>
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":0, "WARNING" :0})
+countErrorLines({"FATAL":0, "ERROR":0, "WARNING" :1})
 </text></argument>
 </extension>
 
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt
index 54941792c901ab087a9dbebbceefc4eb31c17b39..a7f5f1cf5e515d510903dbe7a00a61b383e3cf60 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt
@@ -31,6 +31,11 @@ TeslaLineChecker    ERROR Affected run : 179348
 TeslaLineChecker    ERROR Affected TCK : 0x21361609
 TeslaLineChecker    ERROR FIX!
 TeslaLineChecker    ERROR In case you are testing, set Tesla().EnableLineChecker = False to skip this check.
+TeslaLineChecker    ERROR Maximum number of errors ( 'ErrorMax':1) reached.
+DaVinciUserSequ...  ERROR Maximum number of errors ( 'ErrorMax':1) reached.
+DaVinciAnalysisSeq  ERROR Maximum number of errors ( 'ErrorMax':1) reached.
+FilteredEventSeq    ERROR Maximum number of errors ( 'ErrorMax':1) reached.
+DaVinciEventSeq     ERROR Maximum number of errors ( 'ErrorMax':1) reached.
 EventLoopMgr      WARNING Execution of algorithm DaVinciEventSeq failed
 EventLoopMgr        ERROR Error processing event loop.
 EventLoopMgr        ERROR Terminating event processing loop due to errors