diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
index f66ad30e15b2405a0cb220b3909fa5891d599a5e..dab5bb9541168506571db038a63d08eab8c8a194 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref
@@ -26,68 +26,15 @@ FSROutputStreamDstWriter               INFO Events output: 1
 Tuple                               SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 Tuple                               SUCCESS List of booked N-Tuples in directory "FILE1/Tuple"
 Tuple                               SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=10 {BUNCHCROSSING_ID,BUNCHCROSSING_TYPE,EVENTNUMBER,GPSTIME,ODINTCK,RUNNUMBER,nFTClus}
-LAZY_AND: DaVinci                                   #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: FileSummaryRecords                     #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: GenFSR                                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecordStream/FSROutputStreamDstWriter            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: UserAnalysis                           #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: default                                 #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   LHCb__UnpackRawEvent/LHCb__UnpackRawEvent        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   HltPackedBufferDecoder/HltPackedBufferDecoder    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   UnpackMCParticle/UnpackMCParticle                #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   UnpackMCVertex/UnpackMCVertex                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecVertexUnpacker/RecVertexUnpacker              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecVertexUnpacker/RecVertexUnpacker#1            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecVertexUnpacker/RecVertexUnpacker#2            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecVertexUnpacker/RecVertexUnpacker#3            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecVertexUnpacker/RecVertexUnpacker#4            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#1                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#2                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#3                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#4                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#5                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#6                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   VertexUnpacker/VertexUnpacker#7                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker                      #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#1                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#2                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#3                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#4                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#5                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#6                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#7                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#8                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   TrackUnpacker/TrackUnpacker#9                    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RichPIDUnpacker/RichPIDUnpacker                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RichPIDUnpacker/RichPIDUnpacker#1                #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   MuonPIDUnpacker/MuonPIDUnpacker                  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   MuonPIDUnpacker/MuonPIDUnpacker#1                #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   CaloHypoUnpacker/CaloHypoUnpacker                #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   CaloHypoUnpacker/CaloHypoUnpacker#1              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   CaloHypoUnpacker/CaloHypoUnpacker#2              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   CaloHypoUnpacker/CaloHypoUnpacker#3              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ProtoParticleUnpacker/ProtoParticleUnpacker      #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ProtoParticleUnpacker/ProtoParticleUnpacker#1    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker                #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#1              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#2              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#3              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#4              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#5              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#6              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#7              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   ParticleUnpacker/ParticleUnpacker#8              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   RecSummaryUnpacker/RecSummaryUnpacker            #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   P2VRelationUnpacker/P2VRelationUnpacker          #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   P2VRelationUnpacker/P2VRelationUnpacker#1        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   P2VRelationUnpacker/P2VRelationUnpacker#2        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   P2VRelationUnpacker/P2VRelationUnpacker#3        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   P2VRelationUnpacker/P2VRelationUnpacker#4        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   PP2MCPRelationUnpacker/PP2MCPRelationUnpacker    #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   PP2MCPRelationUnpacker/PP2MCPRelationUnpacker#1  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   LoKi__HDRFilter/Myfilter                         #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
-   FunTupleBase_Particles/Tuple                     #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+LAZY_AND: DaVinci                               #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: FileSummaryRecords                 #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: GenFSR                              #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+   RecordStream/FSROutputStreamDstWriter        #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: UserAnalysis                       #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: default                             #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+   LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#2  #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+   LoKi__HDRFilter/Myfilter                     #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
+   FunTupleBase_Particles/Tuple                 #=7       Sum=7           Eff=|( 100.0000 +- 0.00000 )%|
 RFileCnv                               INFO dumping contents of /NTUPLES/FILE1
 TFile: name=tuple_LbToLcmunu.root, title=Gaudi Trees, option=CREATE
 NTupleSvc                              INFO NTuples saved successfully