diff --git a/DaVinciTests/tests/options/DVReadKs.py b/DaVinciTests/tests/options/DVReadKs.py
index bceeb7352c155cf9366738b7befc091c6f6b562e..b7d0b609256287c87d5111756d95c06e057bc746 100644
--- a/DaVinciTests/tests/options/DVReadKs.py
+++ b/DaVinciTests/tests/options/DVReadKs.py
@@ -52,7 +52,7 @@ DaVinci().PrintFreq = 100
 # Real Data
 #
 EventSelector().Input = [
-    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/2009_00005803_00000001_1.V0.dst' TYP='POOL_ROOTTREE' OPT='READ'"
+    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/swtest/2009_00005803_00000001_1.V0.dst' TYP='POOL_ROOTTREE' OPT='READ'"
 ]
 
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/DVTestMDSTPVRefitRun2.py b/DaVinciTests/tests/options/DVTestMDSTPVRefitRun2.py
index d8e6ac5c6349fd6f1dd6894bdf487aeb62cc1589..95b04ee232232f44cc27408090670e0cd3bb3b42 100644
--- a/DaVinciTests/tests/options/DVTestMDSTPVRefitRun2.py
+++ b/DaVinciTests/tests/options/DVTestMDSTPVRefitRun2.py
@@ -17,9 +17,9 @@ from PhysSelPython.Wrappers import AutomaticData, ValidBPVSelection, SelectionSe
 
 # 2018 Turbo data.
 IOHelper('ROOT').inputFiles([
-    'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000005_1.charmtwobody.mdst',
-    'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000012_1.charmtwobody.mdst',
-    'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000026_1.charmtwobody.mdst',
+    'PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000005_1.charmtwobody.mdst',
+    'PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000012_1.charmtwobody.mdst',
+    'PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000026_1.charmtwobody.mdst',
 ])
 
 # Configure the data settings.
diff --git a/DaVinciTests/tests/options/DVTestWriteDst.py b/DaVinciTests/tests/options/DVTestWriteDst.py
index 02da3203adcc78490f9bf4db6cbaa0cc1e1625c0..8452ce8cbba63df03ef219cd606edc4729de8cdc 100755
--- a/DaVinciTests/tests/options/DVTestWriteDst.py
+++ b/DaVinciTests/tests/options/DVTestWriteDst.py
@@ -98,5 +98,5 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
 from Gaudi.Configuration import *
 
 EventSelector().Input = [
-    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/MC2010_BsJPsiPhi_00008405_00000506_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
+    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/swtest/MC2010_BsJPsiPhi_00008405_00000506_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"
 ]
diff --git a/DaVinciTests/tests/options/DV_MCuDST.py b/DaVinciTests/tests/options/DV_MCuDST.py
index 49b4ac535509e38693924e0cde8614332d7981c8..86ca0c13074b9c7ea7d55fa3568e0361b312f022 100755
--- a/DaVinciTests/tests/options/DV_MCuDST.py
+++ b/DaVinciTests/tests/options/DV_MCuDST.py
@@ -77,7 +77,7 @@ daVinci.UserAlgorithms = [phi]
 daVinci.EvtMax = 2000
 
 daVinci.Input = [
-    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00054389/0000/00054389_00000078_3.AllStreams.mdst' SVC='Gaudi::RootEvtSelector' OPT='READ'",
+    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00054389/0000/00054389_00000078_3.AllStreams.mdst' SVC='Gaudi::RootEvtSelector' OPT='READ'",
 ]
 
 # =============================================================================
diff --git a/DaVinciTests/tests/options/InputData_Reco18_Run214741.xml b/DaVinciTests/tests/options/InputData_Reco18_Run214741.xml
index c3212754e2014aaf786019cc83075ea99cd8be89..efcd26261d7ab71adcac8f6cf5d1d73e6822ea1f 100644
--- a/DaVinciTests/tests/options/InputData_Reco18_Run214741.xml
+++ b/DaVinciTests/tests/options/InputData_Reco18_Run214741.xml
@@ -15,7 +15,7 @@
 
 <File ID="ffd3cad2-b6fc-11e8-8588-001e67dff79e">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000213.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000213.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000213.raw"/>
@@ -23,7 +23,7 @@
 </File>
 <File ID="E60DB49D-21B8-E811-A1E4-FA163EAB2EB4">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119595_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119595_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119595_1.rdst"/>
@@ -31,7 +31,7 @@
 </File>
 <File ID="1C4BBD0F-1AB8-E811-A414-FA163E025D16">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119588_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119588_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119588_1.rdst"/>
@@ -39,7 +39,7 @@
 </File>
 <File ID="A432B834-21B8-E811-B950-FA163ECA9965">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119593_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119593_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119593_1.rdst"/>
@@ -47,7 +47,7 @@
 </File>
 <File ID="43fc8590-b64f-11e8-aab5-001e67e005ef">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000101.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000101.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000101.raw"/>
@@ -55,7 +55,7 @@
 </File>
 <File ID="7c589758-b659-11e8-af60-001e67dff79e">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000135.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000135.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000135.raw"/>
@@ -63,7 +63,7 @@
 </File>
 <File ID="2d2bc8c6-b64f-11e8-a078-001e67ddcb96">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000100.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000100.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000100.raw"/>
@@ -71,7 +71,7 @@
 </File>
 <File ID="f7250d16-b6b0-11e8-992e-001e67ddcb96">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000138.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000138.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000138.raw"/>
@@ -79,7 +79,7 @@
 </File>
 <File ID="288A34ED-1AB8-E811-966E-FA163EFA0CC4">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst"/>
@@ -87,7 +87,7 @@
 </File>
 <File ID="f0df63ac-b6b0-11e8-ad12-001e67e005ef">
    <physical>
-      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000139.raw" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000139.raw" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/data/2018/RAW/FULL/LHCb/COLLISION18/214741/214741_0000000139.raw"/>
@@ -95,7 +95,7 @@
 </File>
 <File ID="5A506004-21B8-E811-9480-FA163EAFDFE7">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119590_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119590_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119590_1.rdst"/>
@@ -103,7 +103,7 @@
 </File>
 <File ID="6484E11C-21B8-E811-9104-FA163ED7514A">
    <physical>
-      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119597_1.rdst" se="CERN-SWTEST"/>
+      <pfn filetype="ROOT_All" name="root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119597_1.rdst" se="CERN-SWTEST"/>
    </physical>
    <logical>
       <lfn name="/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119597_1.rdst"/>
diff --git a/DaVinciTests/tests/options/TurboMC_2015.py b/DaVinciTests/tests/options/TurboMC_2015.py
index eec453c8255836087f522ccd39787cf7f89b6205..d4f32507ebaef1298ebad45050e81f8fc5910dff 100644
--- a/DaVinciTests/tests/options/TurboMC_2015.py
+++ b/DaVinciTests/tests/options/TurboMC_2015.py
@@ -41,5 +41,5 @@ DaVinci().EvtMax = 1000
 
 # Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2015/DST/00064085/0000/00064085_00000001_1.dst`
 IOHelper().inputFiles([
-    'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2015/DST/00064085/0000/00064085_00000001_1.dst'
+    'root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/MC/2015/DST/00064085/0000/00064085_00000001_1.dst'
 ])
diff --git a/DaVinciTests/tests/options/TurboMC_2016.py b/DaVinciTests/tests/options/TurboMC_2016.py
index e94366294eb60534f1cdba6d98ba46f908102de5..8be37ec06d3fd0512df11019d1955e50e9fae05c 100644
--- a/DaVinciTests/tests/options/TurboMC_2016.py
+++ b/DaVinciTests/tests/options/TurboMC_2016.py
@@ -40,5 +40,5 @@ DaVinci().TupleFile = 'TurboMC_2016.root'
 
 # Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2016/DST/00066623/0000/00066623_00000001_1.dst`
 IOHelper().inputFiles([
-    'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/DST/00066623/0000/00066623_00000001_1.dst'
+    'root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/MC/2016/DST/00066623/0000/00066623_00000001_1.dst'
 ])
diff --git a/DaVinciTests/tests/options/TurboMC_2016_uDST.py b/DaVinciTests/tests/options/TurboMC_2016_uDST.py
index 1dafef14b3ee170ce70bcd123a381163d1385247..f2d5ccda3d6dc6334728912e4693d8dc175310e4 100644
--- a/DaVinciTests/tests/options/TurboMC_2016_uDST.py
+++ b/DaVinciTests/tests/options/TurboMC_2016_uDST.py
@@ -78,5 +78,5 @@ DaVinci().TupleFile = 'TurboMC_2016_uDST.root'
 
 # Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2016/ALLSTREAMS.MDST/00063447/0000/00063447_00000001_7.AllStreams.mdst`
 IOHelper().inputFiles([
-    'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00063447/0000/00063447_00000001_7.AllStreams.mdst'
+    'root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00063447/0000/00063447_00000001_7.AllStreams.mdst'
 ])
diff --git a/DaVinciTests/tests/refs/test_stripping34_collision18_reco18.ref b/DaVinciTests/tests/refs/test_stripping34_collision18_reco18.ref
index ed4890e66c2217e1fd39592fe08cbe91435cd1e0..3bef816b6b00aa8cc4a9433e3586c84ee46cf1d8 100644
--- a/DaVinciTests/tests/refs/test_stripping34_collision18_reco18.ref
+++ b/DaVinciTests/tests/refs/test_stripping34_collision18_reco18.ref
@@ -2946,7 +2946,7 @@ FSRInputCopyStreamCharmComp...   INFO Data source: FileRecordDataSvc output: DAT
 CharmCompleteEvent_OStream       INFO Data source: EventDataSvc output: DATAFILE='000000.CharmCompleteEvent.dst' SVC='RootCnvSvc' OPT='REC'
 MonitoringSequence               INFO Member list:
 LumiSeq                          INFO OR Member list: EventAccounting/EventAccount
-EventSelector                    INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst' SVC='Gaudi::RootEvtSelector' OPT='READ'
+EventSelector                    INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst' SVC='Gaudi::RootEvtSelector' OPT='READ'
 ApplicationMgr                   INFO Application Manager Initialized successfully
 ApplicationMgr                   INFO Application Manager Started successfully
 EventSelector                 SUCCESS Reading Event record 1. Record number within stream 1: 1
@@ -120751,7 +120751,7 @@ RootCnvSvc                       INFO Disconnected data IO:1273F137-B641-E911-A0
 RootCnvSvc                       INFO Disconnected data IO:1438E144-B641-E911-A0B6-EC0D9A8B2E14 [000000.Dimuon.dst]
 RootCnvSvc                       INFO Disconnected data IO:14D2C246-B641-E911-A0B6-EC0D9A8B2E14 [000000.EW.dst]
 RootCnvSvc                       INFO Disconnected data IO:26702944-B641-E911-A0B6-EC0D9A8B2E14 [000000.Semileptonic.dst]
-RootCnvSvc                       INFO Disconnected data IO:6265B475-5367-E811-9321-001E67792688 [root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst]
+RootCnvSvc                       INFO Disconnected data IO:6265B475-5367-E811-9321-001E67792688 [root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00074708/0003/00074708_00030781_1.rdst]
 RootCnvSvc                       INFO Disconnected data IO:94511946-B641-E911-A0B6-EC0D9A8B2E14 [000000.BhadronCompleteEvent.dst]
 RootCnvSvc                       INFO Disconnected data IO:AC8F5838-B641-E911-A0B6-EC0D9A8B2E14 [000000.Charm.mdst]
 RootCnvSvc                       INFO Disconnected data IO:E24C6042-B641-E911-A0B6-EC0D9A8B2E14 [000000.CharmCompleteEvent.dst]
diff --git a/DaVinciTests/tests/refs/test_stripping34r0p1_collision18_reco18.ref b/DaVinciTests/tests/refs/test_stripping34r0p1_collision18_reco18.ref
index f420f779ecb5e432bec560a5064a6946b62b0b64..0cb853fb6812a4ae165c261f1f25cdf96d5ec763 100644
--- a/DaVinciTests/tests/refs/test_stripping34r0p1_collision18_reco18.ref
+++ b/DaVinciTests/tests/refs/test_stripping34r0p1_collision18_reco18.ref
@@ -2602,7 +2602,7 @@ FSRInputCopyStreamCharmComp...   INFO Data source: FileRecordDataSvc output: DAT
 CharmCompleteEvent_OStream       INFO Data source: EventDataSvc output: DATAFILE='000000.CharmCompleteEvent.dst' SVC='RootCnvSvc' OPT='REC'
 MonitoringSequence               INFO Member list:
 LumiSeq                          INFO OR Member list: EventAccounting/EventAccount
-EventSelector                    INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst' SVC='Gaudi::RootEvtSelector' OPT='READ'
+EventSelector                    INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst' SVC='Gaudi::RootEvtSelector' OPT='READ'
 ApplicationMgr                   INFO Application Manager Initialized successfully
 ApplicationMgr                   INFO Application Manager Started successfully
 EventSelector                 SUCCESS Reading Event record 1. Record number within stream 1: 1
@@ -60801,7 +60801,7 @@ RootCnvSvc                       INFO Disconnected data IO:1273F137-B641-E911-A0
 RootCnvSvc                       INFO Disconnected data IO:1438E144-B641-E911-A0B6-EC0D9A8B2E14 [000000.Dimuon.dst]
 RootCnvSvc                       INFO Disconnected data IO:14D2C246-B641-E911-A0B6-EC0D9A8B2E14 [000000.EW.dst]
 RootCnvSvc                       INFO Disconnected data IO:26702944-B641-E911-A0B6-EC0D9A8B2E14 [000000.Semileptonic.dst]
-RootCnvSvc                       INFO Disconnected data IO:288A34ED-1AB8-E811-966E-FA163EFA0CC4 [root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst]
+RootCnvSvc                       INFO Disconnected data IO:288A34ED-1AB8-E811-966E-FA163EFA0CC4 [root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/LHCb/Collision18/RDST/00077427/0011/00077427_00119592_1.rdst]
 RootCnvSvc                       INFO Disconnected data IO:94511946-B641-E911-A0B6-EC0D9A8B2E14 [000000.BhadronCompleteEvent.dst]
 RootCnvSvc                       INFO Disconnected data IO:AC8F5838-B641-E911-A0B6-EC0D9A8B2E14 [000000.Charm.mdst]
 RootCnvSvc                       INFO Disconnected data IO:E24C6042-B641-E911-A0B6-EC0D9A8B2E14 [000000.CharmCompleteEvent.dst]
diff --git a/Phys/Tesla/tests/options/TeslaRawReprocess.py b/Phys/Tesla/tests/options/TeslaRawReprocess.py
index 8c1b83097414de2e6580413cfcaa5d393def5f36..a4a55d96429db5459f7a2f640059326e44a161d8 100644
--- a/Phys/Tesla/tests/options/TeslaRawReprocess.py
+++ b/Phys/Tesla/tests/options/TeslaRawReprocess.py
@@ -24,4 +24,4 @@ from PRConfig.TestFileDB import test_file_db
 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 )
+#IOHelper("MDF").inputFiles( ["mdf:root://eoslhcb.cern.ch//eos/lhcb/cern-swtest/lhcb/data/2012/RAW/FULL/LHCb/COLLISION12/114753/114753_0000000015.raw"] , clear=True )