diff --git a/test/jsonFiles/BdeltapmunuQCD.json b/test/jsonFiles/BdeltapmunuQCD.json
index 68313b5..09965d7 100644
--- a/test/jsonFiles/BdeltapmunuQCD.json
+++ b/test/jsonFiles/BdeltapmunuQCD.json
@@ -1,17 +1,17 @@
 {
     "parent" : "B-",
     "daughters" : ["Delta+", "anti-p-", "mu-", "anti-nu_mu"],
-    "model" : "BToDiBaryonlnupQCD",
-    "parameters" : [67.7, -280.0, -187.3, -840.1, -10.1, -157.0, 7.0e6],
+    "models" : ["BToDiBaryonlnupQCD"],
+    "parameters" : [[67.7, -280.0, -187.3, -840.1, -10.1, -157.0, 7.0e6]],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "mass", "title" : "mPP", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.5},
 	{"variable" : "mass", "title" : "mMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
 	{"variable" : "psumsq", "title" : "qSqMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
 	{"variable" : "coshel", "title" : "cosThetaB", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "coshel", "title" : "cosThetaL", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
     ],
     "outfile" : "BDeltapmunuQCD.root",
     "reference" : "RefBDeltapmunuQCD.root"
 }
diff --git a/test/jsonFiles/BppmunuQCD.json b/test/jsonFiles/BppmunuQCD.json
index 2cea582..9d28a9b 100644
--- a/test/jsonFiles/BppmunuQCD.json
+++ b/test/jsonFiles/BppmunuQCD.json
@@ -1,17 +1,17 @@
 {
     "parent" : "B-",
     "daughters" : ["p+", "anti-p-", "mu-", "anti-nu_mu"],
-    "model" : "BToDiBaryonlnupQCD",
-    "parameters" : [67.7, -280.0, -187.3, -840.1, -10.1, -157.0, 3.0e6],
+    "models" : ["BToDiBaryonlnupQCD"],
+    "parameters" : [[67.7, -280.0, -187.3, -840.1, -10.1, -157.0, 3.0e6]],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "mass", "title" : "mPP", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 1.5, "xmax" : 3.5},
 	{"variable" : "mass", "title" : "mMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 3.5},
 	{"variable" : "psumsq", "title" : "qSqMuNu", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 12.0},
 	{"variable" : "coshel", "title" : "cosThetaB", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "coshel", "title" : "cosThetaL", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
     ],
     "outfile" : "BppmunuQCD.root",
     "reference" : "RefBppmunuQCD.root"
 }
diff --git a/test/jsonFiles/EtaEEPiPi.json b/test/jsonFiles/EtaEEPiPi.json
index 434e83d..0280b45 100644
--- a/test/jsonFiles/EtaEEPiPi.json
+++ b/test/jsonFiles/EtaEEPiPi.json
@@ -1,18 +1,18 @@
 {
     "parent" : "eta'",
     "daughters" : ["e+", "e-", "pi+", "pi-"],
-    "model" : "ETA_LLPIPI",
-    "parameters" : [],
+    "models" : ["ETA_LLPIPI"],
+    "parameters" : [[]],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "mass", "title" : "mPiPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
 	{"variable" : "mass", "title" : "mLL"  , "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
 	{"variable" : "mass", "title" : "mPiL1", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
 	{"variable" : "mass", "title" : "mPiL2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
 	{"variable" : "coshel", "title" : "cosL", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "coshel", "title" : "cosPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
     ],
     "outfile" : "EtaEEPiPi.root",
     "reference" : "RefEtaEEPiPi.root"
 }
diff --git a/test/jsonFiles/EtaMuMuPiPi.json b/test/jsonFiles/EtaMuMuPiPi.json
index 42eeffe..8bb8503 100644
--- a/test/jsonFiles/EtaMuMuPiPi.json
+++ b/test/jsonFiles/EtaMuMuPiPi.json
@@ -1,18 +1,18 @@
 {
     "parent" : "eta'",
     "daughters" : ["mu+", "mu-", "pi+", "pi-"],
-    "model" : "ETA_LLPIPI",
-    "parameters" : [],
+    "models" : ["ETA_LLPIPI"],
+    "parameters" : [[]],
     "events" : 10000,
     "histograms" : [
 	{"variable" : "mass", "title" : "mPiPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0},
 	{"variable" : "mass", "title" : "mLL"  , "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.5},
 	{"variable" : "mass", "title" : "mPiL1", "d1" : 1, "d2" : 4, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
 	{"variable" : "mass", "title" : "mPiL2", "d1" : 2, "d2" : 3, "nbins" : 100, "xmin" : 0.0, "xmax" : 0.85},
 	{"variable" : "coshel", "title" : "cosL", "d1" : 1, "d2" : 2, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "coshel", "title" : "cosPi", "d1" : 3, "d2" : 4, "nbins" : 100, "xmin" : -1.0, "xmax" : 1.0},
 	{"variable" : "prob", "title" : "Prob",  "d1" : 0, "d2" : 0, "nbins" : 100, "xmin" : 0.0, "xmax" : 1.0}
     ],
     "outfile" : "EtaMuMuPiPi.root",
     "reference" : "RefEtaMuMuPiPi.root"
 }