diff --git a/Phys/Tesla/tests/options/DV_2015_CaloCheck.py b/Phys/Tesla/tests/options/DV_2015_CaloCheck.py
deleted file mode 100644
index 342cda5e8258fcd678aa9cc8a39556568a63c06b..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/DV_2015_CaloCheck.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
-from Configurables import GaudiSequencer,RawEventJuggler
-from Configurables import DaVinci
-from Configurables import DecodeRawEvent
-
-from Configurables import DstConf
-DstConf().Turbo=True
-
-DaVinci()
-DaVinci().EvtMax=-1
-DaVinci().DataType="2015"
-DaVinci().Turbo=True
-DaVinci().RootInTES="/Event/Turbo"
-
-from GaudiConf import IOHelper
-IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True )
-
-import GaudiPython
-from Gaudi.Configuration import ApplicationMgr
-from Configurables import LoKiSvc
-
-from GaudiKernel import ROOT6WorkAroundEnabled
-if ROOT6WorkAroundEnabled('ROOT-7492'):
- # trigger autoloading of LHCbKernel dictionary
- GaudiPython.gbl.LHCb.LHCbID
- # trigger autoloading of DigiEvent dictionary
- GaudiPython.gbl.LHCb.CaloDigit
-
-gaudi = GaudiPython.AppMgr()
-gaudi.initialize()
-
-TES = gaudi.evtsvc()
-
-version='v10r0_0x00fa0051'
-from TurboStreamProd.helpers import *
-from TurboStreamProd import prodDict
-lines = streamLines(prodDict,version,'DiMuon',debug=True)
-lines += streamLines(prodDict,version,'Charm',debug=True)
-lines += streamLines(prodDict,version,'CharmSpec',debug=True)
-
-n=0
-passed=True
-while True:
- gaudi.run(1)
- if not TES['DAQ/RawEvent']: break # probably end of file
- ### Check all hypos and clusters have valid positions
- for line in lines:
- parts = TES["Turbo/"+line+"/Particles"]
- if hasattr(parts,"__iter__"):
- for p in parts:
- if p.proto():
- for hypo in p.proto().calo():
- hypopos = hypo.target().position()
- if ( hypopos.x()**2 + hypopos.y()**2 + hypopos.z()**2 + hypopos.e()**2 ) < 5.0:
- passed=False
- print "Invalid hypo position"
- break
- for cluster in hypo.target().clusters():
- clusterpos = cluster.target().position()
- if ( clusterpos.x()**2 + clusterpos.y()**2 + clusterpos.z()**2 + clusterpos.e()**2 ) < 5.0:
- passed=False
- print "Invalid cluster position"
- break
- n+=1
- n+=1
- if passed==False:
- break
- if passed==False:
- break
-print "Analysed "+str(n)+" calo classes successfully"
-
-
diff --git a/Phys/Tesla/tests/options/DaVinciCheck.py b/Phys/Tesla/tests/options/DaVinciCheck.py
deleted file mode 100644
index ae3492198a0d0fa0e6026a23ee9cda787421e9e9..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/DaVinciCheck.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
-from Configurables import GaudiSequencer,RawEventJuggler
-from Configurables import DaVinci
-from Configurables import DecodeRawEvent
-
-DaVinci()
-DaVinci().EvtMax=-1
-DaVinci().Lumi=True
-DaVinci().DataType="2012"
-
-from GaudiConf import IOHelper
-IOHelper().inputFiles( ["Turbo_FSRcreated.dst"] , clear=True )
diff --git a/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py b/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py
deleted file mode 100644
index 41d7ae909b4dbeae1d2633cf6b7bda686e21c411..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/DaVinciCheckDiMuon.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
-from Configurables import GaudiSequencer,RawEventJuggler
-from Configurables import DaVinci
-from Configurables import DecodeRawEvent
-
-DaVinci()
-DaVinci().EvtMax=-1
-DaVinci().Lumi=True
-DaVinci().DataType="2016"
-DaVinci().Turbo=True
-DaVinci().RootInTES='/Event/Turbo'
-DaVinci().InputType='MDST'
-
-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
deleted file mode 100644
index a292410925dd85ceee1c23345e1fbb5a4e242d65..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from Gaudi.Configuration import *
-from LHCbKernel.Configuration import *
-from Configurables import GaudiSequencer,RawEventJuggler
-from Configurables import DaVinci
-from Configurables import DecodeRawEvent
-
-DaVinci()
-DaVinci().EvtMax=-1
-DaVinci().Lumi=True
-DaVinci().DataType="2016"
-DaVinci().Turbo=True
-DaVinci().RootInTES='/Event/Turbo'
-DaVinci().InputType='MDST'
-
-from GaudiConf import IOHelper
-IOHelper().inputFiles( ["Dstp_PR.dst"] , clear=True )
diff --git a/Phys/Tesla/tests/options/TeslaRawReprocess.py b/Phys/Tesla/tests/options/TeslaRawReprocess.py
deleted file mode 100644
index b7f2b79b61379deecd9e1665e9ba78b31cca4202..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/TeslaRawReprocess.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from Configurables import Tesla
-from Gaudi.Configuration import *
-
-Tesla().TriggerLines = ["Hlt2CharmHadMinBiasD02KPi"]
-Tesla().EnableLineChecker = False
-Tesla().OutputLevel = 4
-Tesla().EvtMax = 2000
-Tesla().outputFile = "Turbo_FSRcreated.dst"
-Tesla().Mode="Online"
-Tesla().Pack=True
-
-from PRConfig.TestFileDB import test_file_db
-#input = test_file_db['2012_raw_L041']
-input = test_file_db['2012_raw_full']
-input.run(configurable=Tesla())
-#from GaudiConf import IOHelper
-#IOHelper("MDF").inputFiles( ["mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2012/RAW/FULL/LHCb/COLLISION12/114753/114753_0000000015.raw"] , clear=True )
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt
deleted file mode 100644
index 966e3ae7b2e6d13c88c42d7b7f866826ee4b3bcb..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sbenson
-# Purpose: That raw file can be processed and FSRs created
-# Prerequisites: None
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout"><integer>3600</integer></argument>
- <argument name="args"><set>
- <text>../options/TeslaRawReprocess.py</text>
- </set></argument>
- <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":1595, "WARNING" :1})
- </text></argument>
-</extension>
-
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/b_lumiCheck.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/b_lumiCheck.qmt
deleted file mode 100644
index d2e0fd43b08bf01f404ae34d39dbf8ca0463e39d..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/b_lumiCheck.qmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sbenson
-# Purpose: That raw file can be processed and FSRs created
-# Prerequisites: None
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout"><integer>3600</integer></argument>
- <argument name="args"><set>
- <text>../options/DaVinciCheck.py</text>
- </set></argument>
- <argument name="validator"><text>
-block = """
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: START ==========
-IntegrateBeamCr... INFO run: [114753] RandomFrequencyBB 700 CollidingBunches 1032
-IntegrateBeamCr... INFO Luminosity scale used: 1.65e-11 relative uncertainty 0.0116
-IntegrateBeamCr... INFO Integrated luminosity: 0.000136793 +/- 1.5868e-06 [pb-1]
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: END ==========
-"""
-findReferenceBlock(block, signature_offset = 3)
- </text></argument>
-</extension>
-
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_success.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_success.qmt
index 6b0380e17ee74e2d5dbe3cd9666ff7c93605e378..d4b42cdc10d50ffbddf7a171349e162b13959d28 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_success.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_success.qmt
@@ -26,7 +26,7 @@ DaVinciInitAlg SUCCESS 50 events processed
DaVinciInitAlg SUCCESS ==================================================================
TeslaLineChecker SUCCESS Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"#accept" | 50 | 50 |( 100.000 +- 2.00000 )%| ------- | ------- |
+ |*"#accept" | 50 | 50 |( 100.0000 +- 0.000000)%| ------- | ------- |
"""
findReferenceBlock(block,signature_offset = 1)
</text></argument>
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dimuon.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dimuon.qmt
deleted file mode 100644
index bbd7c960ae473a7febfc5d7a2ee07c546b73f394..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dimuon.qmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sbenson
-# Purpose: That raw file can be processed and FSRs created
-# Prerequisites: None
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout"><integer>3600</integer></argument>
- <argument name="args"><set>
- <text>../options/DaVinciCheckDiMuon.py</text>
- </set></argument>
- <argument name="validator"><text>
-block = """
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: START ==========
-IntegrateBeamCr... INFO run: [179348] RandomFrequencyBB 1000 CollidingBunches 1767
-IntegrateBeamCr... INFO Luminosity scale used: 1.71e-11 relative uncertainty 0.05
-IntegrateBeamCr... INFO Integrated luminosity: 2.46366e-06 +/- 1.23183e-07 [pb-1]
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: END ==========
-"""
-findReferenceBlock(block, signature_offset = 3)
- </text></argument>
-</extension>
-
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dstar.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dstar.qmt
deleted file mode 100644
index 93e7ca19c074302c2da29437a43dbcba06b39629..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/z_FSRstream_Dstar.qmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sbenson
-# Purpose: That raw file can be processed and FSRs created
-# Prerequisites: None
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout"><integer>3600</integer></argument>
- <argument name="args"><set>
- <text>../options/DaVinciCheckDstp_PR.py</text>
- </set></argument>
- <argument name="validator"><text>
-block = """
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: START ==========
-IntegrateBeamCr... INFO run: [179348] RandomFrequencyBB 1000 CollidingBunches 1767
-IntegrateBeamCr... INFO Luminosity scale used: 1.71e-11 relative uncertainty 0.05
-IntegrateBeamCr... INFO Integrated luminosity: 2.46366e-06 +/- 1.23183e-07 [pb-1]
-IntegrateBeamCr... INFO ========== Integrating luminosity normalization: END ==========
-"""
-findReferenceBlock(block, signature_offset = 3)
- </text></argument>
-</extension>
-
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/z_calocheck.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/z_calocheck.qmt
deleted file mode 100644
index e6a569fb6dc651e7733b719d9add7d35dde788b2..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/z_calocheck.qmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sbenson
-# Purpose: Check the TOS and decision
-# Prerequisites: default_2015
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>python</text></argument>
- <argument name="timeout"><integer>3600</integer></argument>
- <argument name="args"><set>
- <text>../options/DV_2015_CaloCheck.py</text>
- </set></argument>
- <argument name="validator"><text>
-block = """
-Analysed 122556 calo classes successfully
-"""
-findReferenceBlock(block)
- </text></argument>
-</extension>
-