diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 6d51486f34ed91d0e1e48e33e8b500c47cb3c60a..c7976397adc4eb9683cae91f6e3d5f3eaa3aef60 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -1,7 +1,7 @@
 TrigSignatureMoniMT                                 INFO HLT_2e17_etcut_L12EM15VH      20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_2e17_etcut_L12EM15VH decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2e3_etcut_L12EM3          20        20        13        12        12        0         0         12        
-TrigSignatureMoniMT                                 INFO HLT_2e3_etcut_L12EM3 decisions                    49        210       89        0         0         
+TrigSignatureMoniMT                                 INFO HLT_2e3_etcut_L12EM3          20        20        13        13        13        0         0         13        
+TrigSignatureMoniMT                                 INFO HLT_2e3_etcut_L12EM3 decisions                    46        233       85        0         0         
 TrigSignatureMoniMT                                 INFO HLT_2g20_tight_L12EM20VH      20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_2g20_tight_L12EM20VH decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_2g35_etcut_L12EM20VH      20        20        0         0         0         0         0         0         
@@ -16,16 +16,16 @@ TrigSignatureMoniMT                                 INFO HLT_2mu10_bUpsimumu_L12
 TrigSignatureMoniMT                                 INFO HLT_2mu10_bUpsimumu_L12MU10 decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_2mu14_L12MU10             20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_2mu14_L12MU10 decisions                       0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu4_bJpsimumu_L12MU4     20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu4_bJpsimumu_L12MU4 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu4_bUpsimumu_L12MU4     20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu4_bUpsimumu_L12MU4 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6Comb_L12MU6           20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6Comb_L12MU6 decisions                     0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6_10invm70_L1MU6       20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6_10invm70_L1MU6 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6_L12MU6               20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_2mu6_L12MU6 decisions                         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu4_bJpsimumu_L12MU4     20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu4_bJpsimumu_L12MU4 decisions                    4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu4_bUpsimumu_L12MU4     20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu4_bUpsimumu_L12MU4 decisions                    4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6Comb_L12MU6           20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6Comb_L12MU6 decisions                     4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6_10invm70_L1MU6       20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6_10invm70_L1MU6 decisions                    4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6_L12MU6               20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_2mu6_L12MU6 decisions                         4         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_3j200_L1J100              20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_3j200_L1J100 decisions                        0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_3j200_L1J20               20        20        0         0         0         0         0         0         
@@ -42,34 +42,34 @@ TrigSignatureMoniMT                                 INFO HLT_beamspot_allTE_trkf
 TrigSignatureMoniMT                                 INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 decisions                    20        20        0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_costmonitor_CostMonDS_L1All20        20        20        20        0         0         0         20        
 TrigSignatureMoniMT                                 INFO HLT_costmonitor_CostMonDS_L1All decisions                    20        20        0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_e26_etcut_L1EM22VHI       20        20        1         1         1         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_e26_etcut_L1EM22VHI decisions                    1         6         1         0         0         
-TrigSignatureMoniMT                                 INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020        20        1         0         0         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions                    2         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_e3_etcut_L1EM3            20        20        18        18        18        0         0         18        
-TrigSignatureMoniMT                                 INFO HLT_e3_etcut_L1EM3 decisions                      54        219       99        0         0         
-TrigSignatureMoniMT                                 INFO HLT_e5_etcut_L1EM3            20        20        17        16        16        0         0         16        
-TrigSignatureMoniMT                                 INFO HLT_e5_etcut_L1EM3 decisions                      51        212       51        0         0         
-TrigSignatureMoniMT                                 INFO HLT_e7_etcut_L1EM3            20        20        14        13        12        0         0         12        
-TrigSignatureMoniMT                                 INFO HLT_e7_etcut_L1EM3 decisions                      35        174       28        0         0         
+TrigSignatureMoniMT                                 INFO HLT_e26_etcut_L1EM22VHI       20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_e26_etcut_L1EM22VHI decisions                    1         6         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU1020        20        0         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 decisions                    0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_e3_etcut_L1EM3            20        20        15        13        13        0         0         13        
+TrigSignatureMoniMT                                 INFO HLT_e3_etcut_L1EM3 decisions                      48        233       85        0         0         
+TrigSignatureMoniMT                                 INFO HLT_e5_etcut_L1EM3            20        20        13        12        12        0         0         12        
+TrigSignatureMoniMT                                 INFO HLT_e5_etcut_L1EM3 decisions                      41        217       47        0         0         
+TrigSignatureMoniMT                                 INFO HLT_e7_etcut_L1EM3            20        20        13        12        11        0         0         11        
+TrigSignatureMoniMT                                 INFO HLT_e7_etcut_L1EM3 decisions                      26        153       21        0         0         
 TrigSignatureMoniMT                                 INFO HLT_g140_etcut_L1EM24VHI      20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_g140_etcut_L1EM24VHI decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_g140_loose_L1EM24VHI      20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_g140_loose_L1EM24VHI decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15   20        20        5         5         3         3         0         3         
-TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15 decisions                    5         5         3         3         0         
-TrigSignatureMoniMT                                 INFO HLT_g5_etcut_L1EM3            20        20        17        17        17        0         0         17        
-TrigSignatureMoniMT                                 INFO HLT_g5_etcut_L1EM3 decisions                      51        51        55        0         0         
-TrigSignatureMoniMT                                 INFO HLT_g5_etcut_LArPEB_L1EM3     20        20        17        17        17        17        0         17        
-TrigSignatureMoniMT                                 INFO HLT_g5_etcut_LArPEB_L1EM3 decisions                    51        51        55        55        0         
-TrigSignatureMoniMT                                 INFO HLT_g5_loose_L1EM3            20        20        12        12        12        8         0         8         
-TrigSignatureMoniMT                                 INFO HLT_g5_loose_L1EM3 decisions                      21        21        37        11        0         
-TrigSignatureMoniMT                                 INFO HLT_g5_medium_L1EM3           20        20        11        11        11        8         0         8         
-TrigSignatureMoniMT                                 INFO HLT_g5_medium_L1EM3 decisions                     20        20        37        11        0         
-TrigSignatureMoniMT                                 INFO HLT_g5_tight_L1EM3            20        20        11        11        11        5         0         5         
-TrigSignatureMoniMT                                 INFO HLT_g5_tight_L1EM3 decisions                      20        20        37        5         0         
-TrigSignatureMoniMT                                 INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020        20        1         0         0         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions                    2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15   20        20        4         4         3         3         0         3         
+TrigSignatureMoniMT                                 INFO HLT_g20_etcut_LArPEB_L1EM15 decisions                    5         5         4         4         0         
+TrigSignatureMoniMT                                 INFO HLT_g5_etcut_L1EM3            20        20        13        13        13        0         0         13        
+TrigSignatureMoniMT                                 INFO HLT_g5_etcut_L1EM3 decisions                      41        41        50        0         0         
+TrigSignatureMoniMT                                 INFO HLT_g5_etcut_LArPEB_L1EM3     20        20        13        13        13        13        0         13        
+TrigSignatureMoniMT                                 INFO HLT_g5_etcut_LArPEB_L1EM3 decisions                    41        41        50        50        0         
+TrigSignatureMoniMT                                 INFO HLT_g5_loose_L1EM3            20        20        10        10        10        2         0         2         
+TrigSignatureMoniMT                                 INFO HLT_g5_loose_L1EM3 decisions                      15        15        31        2         0         
+TrigSignatureMoniMT                                 INFO HLT_g5_medium_L1EM3           20        20        9         9         9         2         0         2         
+TrigSignatureMoniMT                                 INFO HLT_g5_medium_L1EM3 decisions                     13        13        30        2         0         
+TrigSignatureMoniMT                                 INFO HLT_g5_tight_L1EM3            20        20        9         9         9         1         0         1         
+TrigSignatureMoniMT                                 INFO HLT_g5_tight_L1EM3 decisions                      13        13        30        1         0         
+TrigSignatureMoniMT                                 INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020        20        2         0         0         0         0         2         
+TrigSignatureMoniMT                                 INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions                    5         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J10020        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j260_320eta490_L1J20      20        20        0         0         0         0         0         0         
@@ -88,14 +88,14 @@ TrigSignatureMoniMT                                 INFO HLT_j420_L1J20
 TrigSignatureMoniMT                                 INFO HLT_j420_L1J20 decisions                          0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j420_ftf_subjesgscIS_L1J2020        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j420_ftf_subjesgscIS_L1J20 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j45_L1J15                 20        20        5         0         0         0         0         5         
-TrigSignatureMoniMT                                 INFO HLT_j45_L1J15 decisions                           5         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j45_ftf_L1J15             20        20        5         0         0         0         0         5         
-TrigSignatureMoniMT                                 INFO HLT_j45_ftf_L1J15 decisions                       5         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j45_L1J15                 20        20        6         0         0         0         0         6         
+TrigSignatureMoniMT                                 INFO HLT_j45_L1J15 decisions                           6         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j45_ftf_L1J15             20        20        6         0         0         0         0         6         
+TrigSignatureMoniMT                                 INFO HLT_j45_ftf_L1J15 decisions                       6         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j45_ftf_pf_L1J20          20        20        4         0         0         0         0         4         
 TrigSignatureMoniMT                                 INFO HLT_j45_ftf_pf_L1J20 decisions                    4         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_L1J15 20        20        5         0         0         0         0         5         
-TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions                    5         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_L1J15 20        20        6         0         0         0         0         6         
+TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions                    6         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J2020        20        5         5         5         0         0         5         
 TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions                    5         5         5         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2020        20        5         5         5         0         0         5         
@@ -116,71 +116,71 @@ TrigSignatureMoniMT                                 INFO HLT_j80_0eta240_2j60_32
 TrigSignatureMoniMT                                 INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j80_j60_L1J15             20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_j80_j60_L1J15 decisions                       0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j85_L1J20                 20        20        1         0         0         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_j85_L1J20 decisions                           1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j85_ftf_L1J20             20        20        1         0         0         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_j85_ftf_L1J20 decisions                       1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_j85_ftf_pf_L1J20          20        20        1         0         0         0         0         1         
-TrigSignatureMoniMT                                 INFO HLT_j85_ftf_pf_L1J20 decisions                    1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j85_L1J20                 20        20        3         0         0         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_j85_L1J20 decisions                           3         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j85_ftf_L1J20             20        20        3         0         0         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_j85_ftf_L1J20 decisions                       3         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_j85_ftf_pf_L1J20          20        20        2         0         0         0         0         2         
+TrigSignatureMoniMT                                 INFO HLT_j85_ftf_pf_L1J20 decisions                    2         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_mb_sptrk_L1RD0_FILLED     20        20        0         0         0         0         0         20        
 TrigSignatureMoniMT                                 INFO HLT_mb_sptrk_L1RD0_FILLED decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_mu10_lateMu_L1MU10        20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_mu10_lateMu_L1MU10 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu20_ivar_L1MU6           20        20        3         1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu20_ivar_L1MU6 decisions                     3         1         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu24_idperf_L1MU20        20        20        2         2         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu24_idperf_L1MU20 decisions                    2         2         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu26_ivarmedium_L1MU20    20        20        2         1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu26_ivarmedium_L1MU20 decisions                    2         1         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu50_L1MU20               20        20        2         1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu50_L1MU20 decisions                         2         1         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2020        20        2         1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions                    2         1         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu60_0eta105_msonly_L1MU2020        20        1         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu60_0eta105_msonly_L1MU20 decisions                    1         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6Comb_L1MU6             20        20        3         2         0         0         0         2         
-TrigSignatureMoniMT                                 INFO HLT_mu6Comb_L1MU6 decisions                       3         2         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6_L1MU6                 20        20        3         2         1         1         0         1         
-TrigSignatureMoniMT                                 INFO HLT_mu6_L1MU6 decisions                           3         2         1         1         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6_idperf_L1MU6          20        20        3         3         2         2         0         2         
-TrigSignatureMoniMT                                 INFO HLT_mu6_idperf_L1MU6 decisions                    3         3         2         2         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6_ivarmedium_L1MU6      20        20        3         2         1         1         1         1         
-TrigSignatureMoniMT                                 INFO HLT_mu6_ivarmedium_L1MU6 decisions                    3         2         1         1         1         
-TrigSignatureMoniMT                                 INFO HLT_mu6_msonly_L1MU6          20        20        3         0         2         0         0         2         
-TrigSignatureMoniMT                                 INFO HLT_mu6_msonly_L1MU6 decisions                    3         0         2         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6_mu4_L12MU4            20        20        0         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6_mu4_L12MU4 decisions                      0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu6fast_L1MU6             20        20        3         0         0         0         0         3         
-TrigSignatureMoniMT                                 INFO HLT_mu6fast_L1MU6 decisions                       3         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu80_msonly_3layersEC_L1MU2020        20        2         0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions                    2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu20_ivar_L1MU6           20        20        1         1         1         0         0         1         
+TrigSignatureMoniMT                                 INFO HLT_mu20_ivar_L1MU6 decisions                     2         1         1         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu24_idperf_L1MU20        20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu24_idperf_L1MU20 decisions                    1         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu26_ivarmedium_L1MU20    20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu26_ivarmedium_L1MU20 decisions                    1         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu50_L1MU20               20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu50_L1MU20 decisions                         1         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2020        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions                    1         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu60_0eta105_msonly_L1MU2020        20        0         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu60_0eta105_msonly_L1MU20 decisions                    0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6Comb_L1MU6             20        20        1         1         0         0         0         1         
+TrigSignatureMoniMT                                 INFO HLT_mu6Comb_L1MU6 decisions                       2         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_L1MU6                 20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_L1MU6 decisions                           2         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_idperf_L1MU6          20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_idperf_L1MU6 decisions                    2         2         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_ivarmedium_L1MU6      20        20        1         1         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_ivarmedium_L1MU6 decisions                    2         1         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_msonly_L1MU6          20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_msonly_L1MU6 decisions                    2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_mu4_L12MU4            20        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6_mu4_L12MU4 decisions                      2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu6fast_L1MU6             20        20        1         0         0         0         0         1         
+TrigSignatureMoniMT                                 INFO HLT_mu6fast_L1MU6 decisions                       2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu80_msonly_3layersEC_L1MU2020        20        1         0         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions                    1         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1EM3               20        20        0         0         0         0         0         20        
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1EM3 decisions                         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1RD0_EMPTY         20        20        0         0         0         0         0         20        
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1RD0_EMPTY decisions                    0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1RD0_FILLED        20        20        0         0         0         0         0         20        
 TrigSignatureMoniMT                                 INFO HLT_noalg_L1RD0_FILLED decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_tau0_perf_ptonly_L1TAU12  20        20        8         8         0         0         0         8         
-TrigSignatureMoniMT                                 INFO HLT_tau0_perf_ptonly_L1TAU12 decisions                    8         8         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_tau0_perf_ptonly_L1TAU12  20        20        4         4         0         0         0         4         
+TrigSignatureMoniMT                                 INFO HLT_tau0_perf_ptonly_L1TAU12 decisions                    5         5         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU10020        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 decisions                    0         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM20        20        8         0         0         0         0         8         
-TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions                    8         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwo_L1TAU12IM20        20        8         8         8         0         0         8         
-TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions                    8         8         8         0         0         
-TrigSignatureMoniMT                                 INFO HLT_tau25_medium1_tracktwo_L1TAU12IM20        20        6         6         6         0         0         6         
-TrigSignatureMoniMT                                 INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions                    6         6         6         0         0         
-TrigSignatureMoniMT                                 INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM20        20        5         0         0         0         0         5         
-TrigSignatureMoniMT                                 INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions                    5         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_xe30_cell_L1XE10          20        20        5         0         0         0         0         5         
-TrigSignatureMoniMT                                 INFO HLT_xe30_cell_L1XE10 decisions                    5         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM20        20        3         0         0         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions                    4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwo_L1TAU12IM20        20        3         3         3         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions                    4         4         4         0         0         
+TrigSignatureMoniMT                                 INFO HLT_tau25_medium1_tracktwo_L1TAU12IM20        20        3         3         3         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions                    4         4         4         0         0         
+TrigSignatureMoniMT                                 INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM20        20        3         0         0         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM decisions                    4         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_xe30_cell_L1XE10          20        20        3         0         0         0         0         3         
+TrigSignatureMoniMT                                 INFO HLT_xe30_cell_L1XE10 decisions                    3         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_xe30_cell_xe30_tcpufit_L1XE1020        20        2         0         0         0         0         2         
 TrigSignatureMoniMT                                 INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 decisions                    2         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_xe30_mht_L1XE10           20        20        17        0         0         0         0         17        
-TrigSignatureMoniMT                                 INFO HLT_xe30_mht_L1XE10 decisions                     17        0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_xe30_tcpufit_L1XE10       20        20        3         0         0         0         0         3         
-TrigSignatureMoniMT                                 INFO HLT_xe30_tcpufit_L1XE10 decisions                    3         0         0         0         0         
-TrigSignatureMoniMT                                 INFO HLT_xe30_trkmht_L1XE10        20        20        9         0         0         0         0         9         
-TrigSignatureMoniMT                                 INFO HLT_xe30_trkmht_L1XE10 decisions                    9         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_xe30_mht_L1XE10           20        20        16        0         0         0         0         16        
+TrigSignatureMoniMT                                 INFO HLT_xe30_mht_L1XE10 decisions                     16        0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_xe30_tcpufit_L1XE10       20        20        2         0         0         0         0         2         
+TrigSignatureMoniMT                                 INFO HLT_xe30_tcpufit_L1XE10 decisions                    2         0         0         0         0         
+TrigSignatureMoniMT                                 INFO HLT_xe30_trkmht_L1XE10        20        20        7         0         0         0         0         7         
+TrigSignatureMoniMT                                 INFO HLT_xe30_trkmht_L1XE10 decisions                    7         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_xe65_cell_L1XE50          20        20        0         0         0         0         0         0         
 TrigSignatureMoniMT                                 INFO HLT_xe65_cell_L1XE50 decisions                    0         0         0         0         0         
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
index c58e2e21bfff48b25f64924bee60855a06cdff74..8f15cee4d4babc9a74766dcc65e0e893b0c77106 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/exec_TrigUpgradeTest_art_athenaMT.sh
@@ -64,9 +64,7 @@ fi
 ###
 
 if [[ $INPUT == "run2data" ]]; then
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"
-elif [[ $INPUT == "run2dataFTK" ]]; then
-  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0001.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0002.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0003.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.MissingTowers._lb0151._SFO-6._0004.1"
+  export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1"
 elif [[ $INPUT == "run2mc_ttbar" ]]; then
   # ttbar RDO_FTK produced in 21.3
   export DS="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s3214_r11234_d1505/RDO_FTK.17071950._000065.pool.root.1,/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.digit.RDO_FTK.e4993_s3214_r11234_d1505/RDO_FTK.17071950._000235.pool.root.1"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
index fb4a353dbd6a5ab4fbd9cca402e3400dfe6a4c2a..b1d9b7969c34b9b3bf563224006bea8a2cfe585c 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_cf_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/IDCalo.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
index cb930f12c07648473d6f929330aa576c71a0b762..d49798386474bb3767bd9c5786667a03978e09fd 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_only_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/Calo.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
index ee603bf8b67abf141aff82c13adb7aa2136cc14a..778b364e2b5ee4fb763084b00ff83e61208bbfcd 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_calo_ringer_only_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/CaloRinger.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
index d79ede93eebaf405e21f462a4e4e8659deae4ae8..31b80c855cd20ec3a72837c7f901ac684eb100f4 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_egamma_ringer_cf_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
index aa89dec4f249df65e826261627b23aedc08b700f..3138b6fec16e82959a047acd7134f5544dde81aa 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
@@ -5,7 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export EVENTS=10
+export EVENTS=20
 export THREADS=2
 export SLOTS=2
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
index 0b27cbfd7b9fc1777f6362adc6aa0b4d978a2f73..448c69cad249655926ab892d79470857be0078f9 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
@@ -5,7 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export INPUT="ttbar"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
index 35deaaaa4b3c199c264fe0ea28d95679986e0470..8b0922b0f1454a8a86689811608b127b38f51825 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index 106e39cef85f645043827fa562be9df7026a5da2..8a9875938731d2f4b976ac708aa27be8d5c72c81 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh
index a752fbf366da95dba15831c411d656fa0c408c8c..7a8d73fba8486873a455b1c252b8689a84193ab7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py
index 929ea587c9149799da261428407d5dcb2f663fb0..bf7faa76309a1f34c542443eea69de9f0067834e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py
@@ -13,7 +13,6 @@ ex.type = 'athena'
 ex.job_options = 'TrigUpgradeTest/full_menu.py'
 ex.input = 'data'
 ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;failIfNoProxy=True;"'
-ex.skip_events = 10
 
 test = Test.Test()
 test.art_type = 'build'
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
index a8dcb8264361d8a12fe683e31358848af463e5cf..b31b3536613a7b38d96ad8a12c018c39ef34d7ce 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_grid.sh
@@ -14,7 +14,6 @@
 # art-output: *.pmon.gz
 # art-output: *perfmon*
 
-export INPUT="run2dataFTK" # FTK doesn't matter here - using this dataset because of larger stats
 export EVENTS=1000
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh
index f7cf740e85ea0439c54f0f2f6cc75dfb0e17eb06..e83a1f154ae8dede0afc078a659e164517114df7 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
index cf8cbb5b21e1092571238de5f1d123c87396f5ed..9314580570a7c2491ad88c94502e734d4bbe6090 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
index 6cbd40ed4ed3fc2ba5cc21a0e741d480f4fca755..25fae673df9dc4ed7d8ae68749ba9e2ac5145c90 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/IDCalo.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
index 33d5897f17bdf5b5370669b870634993dadfbe46..c7f694adc0e7523882b1e770d2d2c41000838865 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export INPUT="ttbar"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
index e02d99b3b09a6b2323c9f6d3208d1e4d34b8c8e0..ec73b07b3b26c2ed640f2c79f02372b8bcb59726 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_jet_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=5
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/simpleJetJob.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
index 98462a34126a8823d6ed1a5da344187c7c85ff49..3d9627d6698fe1c55da739d1eba749459308ed79 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_minbias_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/MinBias.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
index 9636fbfd97a7be3a7f3512cc924d45399274a18c..bedfba2b47b0e9c9a1e40fd94a9db797d60d88a8 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_mu_cf_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=50
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
index d66266c0a0d67ea77d8ae1fba420fb2655a1c021..8310770fbd86f629dbe995a13e6d647d32732bf4 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_newJO_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=30
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py
index 2d423e11c956d3e77e9bd6bb401a13578070ff71..5044adcb250378a4a34392556c563d75c105c668 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py
@@ -13,7 +13,6 @@ ex.type = 'athena'
 ex.job_options = 'TrigUpgradeTest/full_menu.py'
 ex.input = 'data'
 ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
-ex.skip_events = 10
 
 test = Test.Test()
 test.art_type = 'build'
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
index 1a8d53d718f6e4b027026f5f3d03650902f2e2ea..f484210efab775dcddbaf560e7bb1a8817010b5a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bjet_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=0
-export EVENTS=100
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
index 60529de662e8b23fbb7ea9d154951ec22a797687..90030a7eec4aa48fdbf5c0615d10d333c0e42e84 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_bphysics_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=50
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_egamma_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_egamma_build.sh
index 4907a179a95663dfeb6512d130ba764a99b0c6a1..a7561fe931b39a0aae6492f122889bce40a5811e 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_egamma_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_egamma_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
index 10be6dcf2575480638641aa9d8d1d6f9d21fa9b0..527c051e38c81b73fe5b297cd28a843b333f3e1b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_jet_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
index d7dba4b8839653303b21f840b0e26ccb50837ad9..ae2858c7ba284ed9ee7c6d34143e693a9b57f4fd 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_build.sh
@@ -5,7 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export EVENTS=50
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_mc_build.sh
index 54d23160dc4863485d97d7007c1b7b57e9150c1c..7f4f1852906029db512d98acee1182103ef0bc11 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_met_mc_build.sh
@@ -5,10 +5,10 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export EVENTS=50
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
-export INPUT="run2mc_ttbar"
+export INPUT="ttbar"
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
 export REGTESTEXP="TrigSignatureMoniMT.*HLT_.*"
 export EXTRA="doL1Sim=True;doEmptyMenu=True;doMETSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_minbias_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_minbias_build.sh
index cc3bc4134d3eb8796d4201f2ec9d9468e5356009..415e3b1081e920de11354c07d7afa114126afa44 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_minbias_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_minbias_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=50
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
index d7decc502c5e506b02eb2610ce5c09defe9b1af6..683861f8ca114499cc9f8957e9460ead080880fd 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_build.sh
@@ -5,8 +5,7 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=50
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
index b4d021dd4e53ba47e83c2b94b42af230c79605cc..4c85c316b9335db407c7c53d6deb94eaf876fe3a 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
@@ -5,10 +5,10 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export EVENTS=10
+export EVENTS=20
 export THREADS=1
 export SLOTS=1
-export INPUT="run2mc_ttbar"
+export INPUT="ttbar"
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
 export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
 export EXTRA="doL1Sim=True;doEmptyMenu=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
index 39df99bd1669ba7411e2161a23f63376728815e3..44c8101bf700c6a337327b5aa9be54d62d567548 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_grid.sh
@@ -17,7 +17,7 @@
 export EVENTS=1000
 export THREADS=1
 export SLOTS=1
-export INPUT="run2mc_ttbar"
+export INPUT="ttbar"
 export JOBOPTION="TrigUpgradeTest/full_menu.py"
 export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*"
 export EXTRA="doL1Sim=True;doEmptyMenu=True;doMuonSlice=True;doWriteBS=False;doWriteRDOTrigger=True;"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
index adcd90ecb3889c87602f4a744d407be87ff1d49a..c2d8a283002ff7ab2b6cd98f6335bb7a8e6e9f77 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_tau_build.sh
@@ -5,7 +5,6 @@
 # Skipping art-output which has no effect for build tests.
 # If you create a grid version, check art-output in existing grid tests.
 
-export SKIPEVENTS=10
 export EVENTS=20
 export THREADS=1
 export SLOTS=1