diff --git a/Hlt/Moore/doc/release.notes b/Hlt/Moore/doc/release.notes
index 4aebe31913377c9c4219e735c950054777af6906..814d8d15fc4e923df9606b33991a0bfbf1273ce9 100755
--- a/Hlt/Moore/doc/release.notes
+++ b/Hlt/Moore/doc/release.notes
@@ -4,6 +4,11 @@
! Purpose : LHCb HLT application
!============================================
+! 2016-05-24 - Rosen Matev
+ - Remove 2015 settings test
+ - Use test_file_db["2015NB_25ns_L0Filt0x1606"] everywhere
+ - Override conddb tag to make sure Herschel decoder works
+
! 2016-05-18 - Mika Vesterinen
- Use the correct TCK in tests/options/TCK/TCKOptions.py
diff --git a/Hlt/Moore/tests/options/Input_2015_0x0050.py b/Hlt/Moore/tests/options/Input_2015_0x0050.py
deleted file mode 100644
index 12ec2dbf493dfea124ed98b15006163c9257b24e..0000000000000000000000000000000000000000
--- a/Hlt/Moore/tests/options/Input_2015_0x0050.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from Configurables import Moore
-from PRConfig import TestFileDB
-TestFileDB.test_file_db["2015NB_25ns_L0Filt0x0050"].run(configurable=Moore())
diff --git a/Hlt/Moore/tests/options/Input_Default.py b/Hlt/Moore/tests/options/Input_Default.py
index df132899559f98a4f98e7059f521347362df9913..25deecc9270921797fceafcf0754f76885e20fbc 100644
--- a/Hlt/Moore/tests/options/Input_Default.py
+++ b/Hlt/Moore/tests/options/Input_Default.py
@@ -1,4 +1,5 @@
from Configurables import Moore
from PRConfig.TestFileDB import test_file_db
-input = test_file_db['2015HLTValidationData_L0filtered_0x0050']
+input = test_file_db["2015NB_25ns_L0Filt0x1606"]
input.run(configurable=Moore())
+Moore().CondDBtag = 'cond-20160522'
\ No newline at end of file
diff --git a/Hlt/Moore/tests/options/Moore_2016draft.py b/Hlt/Moore/tests/options/Moore_2016draft.py
index c29e2d99d5ec79cdf5d7b29c398ebcd28a28e5a0..c7ced3c7713bc5dd40edb824127d3496fe0197be 100644
--- a/Hlt/Moore/tests/options/Moore_2016draft.py
+++ b/Hlt/Moore/tests/options/Moore_2016draft.py
@@ -14,7 +14,8 @@ LHCbTimingAuditor("TIMING").addTool(LHCbSequencerTimerTool, "TIMING")
LHCbTimingAuditor("TIMING").TIMING.Normalised = True
from PRConfig import TestFileDB
-TestFileDB.test_file_db["2015NB_25ns_L0Filt0x0050"].run(configurable=Moore())
+TestFileDB.test_file_db["2015NB_25ns_L0Filt0x1606"].run(configurable=Moore())
+Moore().CondDBtag = 'cond-20160522'
Moore().RemoveInputHltRawBanks = True
from Configurables import DDDBConf
DDDBConf().InitialTime = 'Safe'
diff --git a/Hlt/Moore/tests/options/tckgen.py b/Hlt/Moore/tests/options/tckgen.py
index 9f1b99726df3774ad3d9135aae1eadeac2324905..5eacd0442778404140499e2a48b35654ebaa0ba7 100644
--- a/Hlt/Moore/tests/options/tckgen.py
+++ b/Hlt/Moore/tests/options/tckgen.py
@@ -83,7 +83,7 @@ print "modified config in: "+ os.path.join(expp(configdest),"config.cdb")
#run events
print "running",numEvents
import subprocess
-cmd = shlex.split("gaudirun.py ../options/Moore_Hlt1And2.py ../options/default-threshold.py ../options/Moore-LocalTCKData.py ../options/Input_2015_0x0050.py --option=" + commandoptions)
+cmd = shlex.split("gaudirun.py ../options/Moore_Hlt1And2.py ../options/default-threshold.py ../options/Moore-LocalTCKData.py ../options/Input_Default.py --option=" + commandoptions)
print ' '.join(cmd)
process = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, close_fds = True)
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/2015_25ns.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/2015_25ns.qmt
deleted file mode 100755
index 4d2367ecf2c207446111d7b6410f2dfb139242ae..0000000000000000000000000000000000000000
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/2015_25ns.qmt
+++ /dev/null
@@ -1,44 +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: Roel Aaij
-# Purpose: Check that Moore runs on the 2015 validation dataset with the draft settings.
-# Prerequisites:
-# 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.
-# . MINOR: This test also currently checks the number of lines of stdout, which are demanded to be less than a given amount. Ideally this nubmer would be very small and not allowed to increase.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout">
- <integer>1200</integer>
- </argument>
- <argument name="args"><set>
- <text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_2015_0x0050.py</text>
- <text>../options/default-threshold.py</text>
- <text>--option</text>
- <text>from Configurables import Moore; Moore().RemoveInputHltRawBanks = True; Moore().EnableTimer='physics.2015_25ns.csv'; from Configurables import EventSelector; EventSelector().PrintFreq=100;</text>
- </set></argument>
- <argument name="validator"><text>
-myname='moore.physics.2015_25ns'
-
-if len(stdout.split('\n'))<128:
- causes.append('stdout is too short, aiming for at least 128 lines')
- result['moore.physics.2015_25ns.lt_lines']=result.Quote('Expected at least 128 lines, got '+ str(len(stdout.split('\n'))))
-
-if len(stdout.split('\n'))>2000:
- causes.append('stdout is too long, aiming for at most 2000 lines')
- result['moore.physics.2015_25ns.gt_lines']=result.Quote('Expected at most 2000 lines, got '+ str(len(stdout.split('\n'))))
-
-#count error lines, shouldn't be any warnings or errors, ideally
-countErrorLines({"FATAL":0,"ERROR":0,"WARNING":3})
-
-</text></argument>
-</extension>
-
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt
index 513b8ee137c5e0f051f9cbc748aaa9ec2089f874..37fdf78127c06c31731efdee50d651266d208b77 100755
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt
+++ b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt1only.qmt
@@ -21,7 +21,7 @@
</argument>
<argument name="args"><set>
<text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_2015_0x0050.py</text>
+ <text>../options/Input_Default.py</text>
<text>../options/default-threshold.py</text>
<text>../options/Moore_Hlt1Only.py</text>
<text>--option</text>
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt
index e7fb94ab6379f1db9a1a72f0f08871b4262ffbd3..42ea4913ea05a676d82afaa7798742f83a95f553 100644
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt
+++ b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/deferral.qms/hlt2only.qmt
@@ -19,7 +19,7 @@
</argument>
<argument name="args"><set>
<text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_2015_0x0050.py</text>
+ <text>../options/Input_Default.py</text>
<text>../options/default-threshold.py</text>
<text>../options/Moore_Hlt2Only.py</text>
<text>--option</text>
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
index acdf0f42bd4cf2ebe7a7ee73b826cb29dbae61a4..bc34c297c611b299821c47a97ea2ec1bd924cf3f 100755
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
+++ b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
@@ -6,7 +6,7 @@
</argument>
<argument name="args"><set>
<text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_2015_0x0050.py</text>
+ <text>../options/Input_Default.py</text>
<text>../options/hlt1_trackingonly-threshold.py</text>
<text>../options/Moore_Hlt1Only.py</text>
<text>--option</text>