diff --git a/Tests/Rivet/EE/EE-10.00.in b/Tests/Rivet/EE/EE-10.00.in
--- a/Tests/Rivet/EE/EE-10.00.in
+++ b/Tests/Rivet/EE/EE-10.00.in
@@ -1,16 +1,16 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.0
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.0
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # argus eta pi0
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I268577
 # argus phi
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
diff --git a/Tests/Rivet/EE/EE-9.46.in b/Tests/Rivet/EE/EE-9.46.in
--- a/Tests/Rivet/EE/EE-9.46.in
+++ b/Tests/Rivet/EE/EE-9.46.in
@@ -1,11 +1,11 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.4
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 
 # BELLE charm hadron production
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
diff --git a/Tests/Rivet/EE/EE-Upsilon.in b/Tests/Rivet/EE/EE-Upsilon.in
--- a/Tests/Rivet/EE/EE-Upsilon.in
+++ b/Tests/Rivet/EE/EE-Upsilon.in
@@ -1,22 +1,22 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 4.73015*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 4.73015*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 9.45
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 # set hard process
 create Herwig::MEee2VectorMeson  /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon
 set /Herwig/MatrixElements/MEUpsilon:Coupling 41.15810
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2669951
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I276860
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262415
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PLUTO_1981_I165122
diff --git a/Tests/Rivet/EE/EE-Upsilon2.in b/Tests/Rivet/EE/EE-Upsilon2.in
--- a/Tests/Rivet/EE/EE-Upsilon2.in
+++ b/Tests/Rivet/EE/EE-Upsilon2.in
@@ -1,17 +1,17 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.01163*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.01163*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.02
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(2S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 62.72911
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # BELLE charm hadron production
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2669951
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1990_I278933
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I262551
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1988_I251097
diff --git a/Tests/Rivet/EE/EE-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in
--- a/Tests/Rivet/EE/EE-Upsilon4.in
+++ b/Tests/Rivet/EE/EE-Upsilon4.in
@@ -1,50 +1,50 @@
 # -*- ThePEG-repository -*-
 create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV
 set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV
 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792
 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
 set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
 set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity
 create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so
 set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S)
 set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794
 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon
 # ARGUS pi,K, proton
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2653028
 # ARGUS K*, rho, omega
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213
 # various semileptonic decays
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632
 # BELLE b->s gamma
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289
 # BES D -> K, pi semi-leptonic
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425
 # eta/omega dalitz
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 A2_2017_I1486671
 # BES eta' dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1364494
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1641075
 # BES J/psi dalitz
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377
 # multiplicities
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES
 # BES multiplicty in eta_c decays
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880
 # eta -> pi+pi-pi0
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 KLOE2_2016_I1416990
 # kaons in b decays
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224
 # # MC analyses based on old internal ones
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Meson_Meson_Leptons_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_OmegaPhia1_3Pion_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_D_Dalitz
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Eta_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Onium_PiPi_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Semi_Leptonic_Decay
 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102