diff --git a/PhysicsTools/MXNet/test/testPredictor.cc b/PhysicsTools/MXNet/test/testMXNetCppPredictor.cc
similarity index 100%
rename from PhysicsTools/MXNet/test/testPredictor.cc
rename to PhysicsTools/MXNet/test/testMXNetCppPredictor.cc
diff --git a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
index f043896539ea7..1a7c4205e4a58 100644
--- a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
+++ b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
@@ -72,7 +72,7 @@ class DeepBoostedJetTagInfoProducer : public edm::stream::EDProducer<>
   const reco::Vertex *pv_ = nullptr;
 };
 
-const static std::vector<std::string> DeepBoostedJetTagInfoProducer::particle_features_ {
+const std::vector<std::string> DeepBoostedJetTagInfoProducer::particle_features_ {
   "pfcand_puppiw",
   "pfcand_hcalFrac",
   "pfcand_VTX_ass",
@@ -117,7 +117,7 @@ const static std::vector<std::string> DeepBoostedJetTagInfoProducer::particle_fe
   "pfcand_btagJetDistVal",
 };
 
-const static std::vector<std::string> DeepBoostedJetTagInfoProducer::sv_features_ {
+const std::vector<std::string> DeepBoostedJetTagInfoProducer::sv_features_ {
   "sv_phirel",
   "sv_etarel",
   "sv_deltaR",
diff --git a/RecoBTag/MXNet/test/test_deep_boosted_jet_cfg.py b/RecoBTag/MXNet/test/test_deep_boosted_jet_cfg.py
index e4bf66bd08fd2..b28dcae0a65eb 100644
--- a/RecoBTag/MXNet/test/test_deep_boosted_jet_cfg.py
+++ b/RecoBTag/MXNet/test/test_deep_boosted_jet_cfg.py
@@ -48,6 +48,7 @@
 
 ## and add them to the event content
 from PhysicsTools.PatAlgos.tools.jetTools import updateJetCollection
+from RecoBTag.MXNet.pfDeepBoostedJet_cff import _pfDeepBoostedJetTagsAll as pfDeepBoostedJetTagsAll
 
 updateJetCollection(
    process,
@@ -56,58 +57,7 @@
    svSource = cms.InputTag('slimmedSecondaryVertices'),
    rParam = 0.8,
    jetCorrections = ('AK8PFPuppi', cms.vstring(['L2Relative', 'L3Absolute']), 'None'),
-   btagDiscriminators = [
-           # DeepBoostedJet (Nominal)
-          'pfDeepBoostedJetTags:probTbcq',
-          'pfDeepBoostedJetTags:probTbqq',
-          'pfDeepBoostedJetTags:probTbc',
-          'pfDeepBoostedJetTags:probTbq',
-          'pfDeepBoostedJetTags:probWcq',
-          'pfDeepBoostedJetTags:probWqq',
-          'pfDeepBoostedJetTags:probZbb',
-          'pfDeepBoostedJetTags:probZcc',
-          'pfDeepBoostedJetTags:probZqq',
-          'pfDeepBoostedJetTags:probHbb',
-          'pfDeepBoostedJetTags:probHcc',
-          'pfDeepBoostedJetTags:probHqqqq',
-          'pfDeepBoostedJetTags:probQCDbb',
-          'pfDeepBoostedJetTags:probQCDcc',
-          'pfDeepBoostedJetTags:probQCDb',
-          'pfDeepBoostedJetTags:probQCDc',
-          'pfDeepBoostedJetTags:probQCDothers',
-           # meta taggers
-          'pfDeepBoostedDiscriminatorsJetTags:TvsQCD',
-          'pfDeepBoostedDiscriminatorsJetTags:WvsQCD',
-
-           # DeepBoostedJet (mass decorrelated)
-          'pfMassDecorrelatedDeepBoostedJetTags:probTbcq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probTbqq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probTbc',
-          'pfMassDecorrelatedDeepBoostedJetTags:probTbq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probWcq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probWqq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probZbb',
-          'pfMassDecorrelatedDeepBoostedJetTags:probZcc',
-          'pfMassDecorrelatedDeepBoostedJetTags:probZqq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probHbb',
-          'pfMassDecorrelatedDeepBoostedJetTags:probHcc',
-          'pfMassDecorrelatedDeepBoostedJetTags:probHqqqq',
-          'pfMassDecorrelatedDeepBoostedJetTags:probQCDbb',
-          'pfMassDecorrelatedDeepBoostedJetTags:probQCDcc',
-          'pfMassDecorrelatedDeepBoostedJetTags:probQCDb',
-          'pfMassDecorrelatedDeepBoostedJetTags:probQCDc',
-          'pfMassDecorrelatedDeepBoostedJetTags:probQCDothers',
-           # meta taggers
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:TvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ccvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHccvsQCD',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:bbvscc',
-          'pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:ZHbbvsZHcc',
-
-      ]
+   btagDiscriminators = pfDeepBoostedJetTagsAll
    )
 
 from Configuration.EventContent.EventContent_cff import MINIAODSIMEventContent