diff --git a/v2.5/toolkit/check/fnlo-tk-cppnormtest.pl.in b/v2.5/toolkit/check/fnlo-tk-cppnormtest.pl.in
index 0e0bb7e708d90c39f331a967d6194f2da325ed64..59f26611bf5f855734f25d83f855310fac0f0d8d 100755
--- a/v2.5/toolkit/check/fnlo-tk-cppnormtest.pl.in
+++ b/v2.5/toolkit/check/fnlo-tk-cppnormtest.pl.in
@@ -39,7 +39,7 @@ $ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cppnormtest: Ungzipping test table ${tabgz} failed: $ret, aborted!\n";}
# Evaluate, keep only result lines
-$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ GRV norm _ 5 2 0.1185 _ | grep \"Calculate my cross sections\" -B1 -A19 > cppnormtest.log";
+$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ GRV norm _ _ 5 2 0.1185 _ | grep \"Calculate my cross sections\" -B1 -A19 > cppnormtest.log";
print "Executing command: $cmd\n";
$ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cppnormtest: Evaluating test table ${tabfl} failed: $ret, aborted!\n";}
diff --git a/v2.5/toolkit/check/fnlo-tk-cppscalestest.pl.in b/v2.5/toolkit/check/fnlo-tk-cppscalestest.pl.in
index 70a24cbea712eaf0ff11baf86a4237464272eef4..2a753dbf9919b8295d5c20c312fb6d1a1f6d4655 100755
--- a/v2.5/toolkit/check/fnlo-tk-cppscalestest.pl.in
+++ b/v2.5/toolkit/check/fnlo-tk-cppscalestest.pl.in
@@ -38,7 +38,7 @@ $ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cppscalestest: Ungzipping test table ${tabgz} failed: $ret, aborted!\n";}
# Evaluate, keep only result lines
-$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo 7 GRV _ _ 5 2 0.1185 _ | grep \"Calculate my cross sections\" -B1 -A95 > cppscalestest.log";
+$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo 7 GRV _ _ _ 5 2 0.1185 _ | grep \"Calculate my cross sections\" -B1 -A95 > cppscalestest.log";
print "Executing command: $cmd\n";
$ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cppscalestest: Evaluating test table ${tabfl} failed: $ret, aborted!\n";}
diff --git a/v2.5/toolkit/check/fnlo-tk-cpptest2.pl.in b/v2.5/toolkit/check/fnlo-tk-cpptest2.pl.in
index 8afc694ce754e00f942517654cc951d8fb42caaa..75a0c4225b60a68b9c57e869c12806d15bd74d3d 100755
--- a/v2.5/toolkit/check/fnlo-tk-cpptest2.pl.in
+++ b/v2.5/toolkit/check/fnlo-tk-cpptest2.pl.in
@@ -38,7 +38,7 @@ $ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cpptest2: Ungzipping test table ${tabgz} failed: $ret, aborted!\n";}
# Evaluate, keep only result lines
-$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ GRV _ _ 5 2 0.1185 _ | tail -4 > cpptest2.log";
+$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ GRV _ _ _ 5 2 0.1185 _ | tail -4 > cpptest2.log";
print "Executing command: $cmd\n";
$ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-cpptest2: Evaluating test table ${tabfl} failed: $ret, aborted!\n";}
diff --git a/v2.5/toolkit/check/fnlo-tk-rundecastest2.pl.in b/v2.5/toolkit/check/fnlo-tk-rundecastest2.pl.in
index 5ce4906c967d106921ec2d5b626ef1c074a6df53..9ebe283928fb7de1f7bf0745a92408a2b93e8400 100755
--- a/v2.5/toolkit/check/fnlo-tk-rundecastest2.pl.in
+++ b/v2.5/toolkit/check/fnlo-tk-rundecastest2.pl.in
@@ -38,7 +38,7 @@ $ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-rundecastest2: Ungzipping test table ${tabgz} failed: $ret, aborted!\n";}
# Evaluate, keep only result lines
-$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ RUNDEC _ _ 5 2 0.1185 _ | tail -4 > rundecastest2.log";
+$cmd = "../src/fnlo-tk-cppread ${tabfl} CT10nlo _ RUNDEC _ _ _ 5 2 0.1185 _ | tail -4 > rundecastest2.log";
print "Executing command: $cmd\n";
$ret = system("$cmd");
if ( $ret ) {die "fnlo-tk-rundecastest2: Evaluating test table ${tabfl} failed: $ret, aborted!\n";}
diff --git a/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-born-2jet_stat.log b/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-born-2jet_stat.log
index 2e375907f8aad60d31c04c8d684129b57d1552fa..6b1e7559fc6d278fed287d58dbe1c9838ecd1855 100644
--- a/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-born-2jet_stat.log
+++ b/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-born-2jet_stat.log
@@ -20,11 +20,11 @@
# fnlo-tk-statunc: Evaluating uncertainties
##################################################################################
#=================================================================================
- # Relative Statistical Uncertainties
+ # Relative statistical uncertainties (ST)
#---------------------------------------------------------------------------------
- # bin cross section lower uncertainty upper uncertainty
+ # bin cross_section lower_uncertainty upper_uncertainty
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 1 8.01592840236E+05 -1.50893932747E-04 1.50893932747E-04
+ 1 8.01592840232E+05 -1.50893932641E-04 1.50893932641E-04
2 2.57832436144E+05 -1.19157110976E-04 1.19157110976E-04
3 6.90358759335E+04 -4.78717475807E-05 4.78717475807E-05
4 1.82106011329E+04 -6.97352258793E-05 6.97352258793E-05
diff --git a/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-nlo-2jet_stat.log b/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-nlo-2jet_stat.log
index 043d9f4b3ffa5e94e689513aaa5cd269b0a23d1d..4aad1985b006d40241ca9e44f88084dc479bc0e4 100644
--- a/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-nlo-2jet_stat.log
+++ b/v2.5/toolkit/data/check/InclusiveNJets_fnr0001midpHT_I723509_v23_fix-hhc-nlo-2jet_stat.log
@@ -20,11 +20,11 @@
# fnlo-tk-statunc: Evaluating uncertainties
##################################################################################
#=================================================================================
- # Relative Statistical Uncertainties
+ # Relative statistical uncertainties (ST)
#---------------------------------------------------------------------------------
- # bin cross section lower uncertainty upper uncertainty
+ # bin cross_section lower_uncertainty upper_uncertainty
#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 1 8.09746517361E+05 -8.17808102264E-03 8.17808102264E-03
+ 1 8.09746517341E+05 -8.17808101875E-03 8.17808101875E-03
2 2.51514173302E+05 -1.53654282706E-02 1.53654282706E-02
3 6.91227317135E+04 -1.05434381826E-03 1.05434381826E-03
4 1.81863410722E+04 -3.40903038434E-03 3.40903038434E-03