diff --git a/FixedOrderGen/t/CMakeLists.txt b/FixedOrderGen/t/CMakeLists.txt
index 31a98f8..cf0ed0e 100644
--- a/FixedOrderGen/t/CMakeLists.txt
+++ b/FixedOrderGen/t/CMakeLists.txt
@@ -1,284 +1,283 @@
 set(tst_dir "${CMAKE_CURRENT_SOURCE_DIR}")
 set(runcard_dir ${tst_dir}/runcards)
 
 function(add_long_test)
   set(options NONE)
   set(oneValueArgs NAME)
   set(multiValueArgs COMMAND)
   cmake_parse_arguments(TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   add_test(
     NAME ${TEST_NAME}_short
     COMMAND ${TEST_COMMAND} short
   )
   if(TEST_ALL)
     add_test(
       NAME ${TEST_NAME}
       COMMAND ${TEST_COMMAND}
     )
   endif()
 endfunction()
 
 foreach(tst W_reconstruct_enu W_2j_classify W_nj_classify)
   add_executable(test_${tst} ${tst_dir}/${tst}.cc)
   target_link_libraries(test_${tst} hejfog_lib)
   add_test(NAME ${tst}
     COMMAND test_${tst}
     WORKING_DIRECTORY ${runcard_dir}
   )
 endforeach()
 foreach(tst Z_2j_classify Z_nj_classify)
   add_executable(test_${tst} ${tst_dir}/${tst}.cc)
   target_link_libraries(test_${tst} hejfog_lib)
   add_test(NAME ${tst}
     COMMAND test_${tst}
     WORKING_DIRECTORY ${runcard_dir}
   )
 endforeach()
 # this only tests if the runcard actually works, not if the result is correct
 add_test(
   NAME main_example
   COMMAND HEJFOG ${PROJECT_SOURCE_DIR}/configFO.yml
 )
 add_test(
   NAME main_2j
   COMMAND HEJFOG ${runcard_dir}/2j.yml
 )
 add_test(
   NAME main_h2j
   COMMAND HEJFOG ${runcard_dir}/h2j.yml
 )
 add_test(
   NAME main_h2j_decay
   COMMAND HEJFOG ${runcard_dir}/h2j_decay.yml
 )
 add_test(
   NAME peakpt
   COMMAND HEJFOG ${runcard_dir}/2j_peak.yml
 )
 # special case where coupling not trivial
 add_test(
   NAME main_W4j_uno+eqqbar
   COMMAND HEJFOG ${runcard_dir}/Wp4j_uno+eqqbar.yml
 )
 
 # check that uno emission doesn't change FKL xs
 add_executable(FKL_uno FKL_uno.cc)
 target_link_libraries(FKL_uno hejfog_lib)
 add_test(
   NAME FKL_uno
-  # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20
-  COMMAND FKL_uno ${runcard_dir}/h3j_uno.yml 0.0243548 0.000119862
+  # calculated with HEJ 2.1.3
+  COMMAND FKL_uno ${runcard_dir}/h3j_uno.yml 2.482e-02 3.079e-05
 )
 # xs tests
 add_executable(xs_gen xs_gen.cc)
 target_link_libraries(xs_gen hejfog_lib)
 ## Higgs
 add_test(
   NAME xs_hqQ
   # calculated with Sherpa see #132
   COMMAND xs_gen ${runcard_dir}/hqQ.yml 1.612e-02 1.26303e-04
 )
 add_test(
   NAME xs_h2j
   COMMAND xs_gen ${runcard_dir}/h2j.yml 2.718938e 0.01428279
 )
 add_test(
   NAME xs_h3j
   COMMAND xs_gen ${runcard_dir}/h3j.yml 1.249224e 0.01264546
 )
 add_long_test(
   NAME xs_h3j_uno
   # calculated with HEJ revision 9570e3809613272ac4b8bf3236279ba23cf64d20
   COMMAND xs_gen ${runcard_dir}/h3j_uno.yml 0.00347538 3.85875e-05
 )
 add_test(
   NAME xs_h5j
   # calculated with HEJ revision eca4ab6491ac38ab422c57fbdc2e66d9f87b4fce
   COMMAND xs_gen ${runcard_dir}/h5j.yml 1.370e-02 1.464e-04
 )
 add_test(
   NAME xs_h2j_decay
   COMMAND xs_gen ${runcard_dir}/h2j_decay.yml 6.215591e-03 3.285611e-05
 )
 ## pure jets
 add_test(
   NAME xs_qQ
   # calculated with Sherpa see #132
   COMMAND xs_gen ${runcard_dir}/qQ.yml 7.354e+05 1.905e+03
 )
 add_test(
   NAME xs_2j
   # calculated with "combined" HEJ svn r3480
   COMMAND xs_gen ${runcard_dir}/2j.yml 86.42031848e06 590570
 )
 add_test(
   NAME xs_3j_uno
   # calculated with HEJ revision 59b8452accfe1462796406fa8e008c8b16b9657b
   COMMAND xs_gen ${runcard_dir}/3j_uno.yml 1.449280e+05 2.318716e+03
 )
 add_test(
   NAME xs_3j_qqbar
   # calculated with HEJ revision 9401196fba75b5d16bc33f2a309175fecaca00f1
   COMMAND xs_gen ${runcard_dir}/3j_qqbar.yml 62040 1005
 )
 add_long_test(
   NAME xs_4j_qqbar
   # calculated with HEJ revision 9401196fba75b5d16bc33f2a309175fecaca00f1
   COMMAND xs_gen ${runcard_dir}/4j_qqbar.yml 28936 550
 )
 add_test(
   NAME xs_4j
   # calculated with HEJ revision 59b8452accfe1462796406fa8e008c8b16b9657b
   COMMAND xs_gen ${runcard_dir}/4j.yml 1.042808e+06 2.137257e+04
 )
 ## W
 add_test(
   NAME xs_WqQ
   # calculated with Sherpa see #132
   COMMAND xs_gen ${runcard_dir}/WpqQ.yml 3.086e+00 4.511e-02
 )
 add_test(
   NAME xs_W2j
   # calculated with HEJ revision 449f2f6b597020e9c9e35699568edc05c827fc11+1
   COMMAND xs_gen ${runcard_dir}/Wm2j.yml 4.177443e+02 7.446928e+00
 )
 add_long_test(
   NAME xs_W3j_eqqbar
   # calculated with HEJ revision 667eb768fbefa99148bf6fe9ffb6fcd16c0f976e
   COMMAND xs_gen ${runcard_dir}/Wp3j_qqbar.yml 2.267785e+01 3.707774e-01
 )
 add_long_test(
   NAME xs_W3j_uno
   # calculated with HEJ revision 449f2f6b597020e9c9e35699568edc05c827fc11+1
   COMMAND xs_gen ${runcard_dir}/Wp3j_uno.yml 3.000955e-01 5.831799e-03
 )
 add_long_test(
   NAME xs_W4j_qqbar
   # calculated with HEJ revision e8929bea8dd53ea52f0e8efd9e235e0b10142aee
   COMMAND xs_gen ${runcard_dir}/Wp4j_qqbar.yml 1.083712e-01 3.297341e-03
 )
 ## Z
 add_long_test(
   NAME xs_Z2j
   # calculated with HEJ revision c6cf722b9ed20531422f0723f311088e0d19c396
   COMMAND xs_gen ${runcard_dir}/Z2j.yml 1.018429e+02 6.063405e-01
 )
 add_long_test(
   NAME xs_Z3j_uno
   # calculated with HEJ revision c6cf722b9ed20531422f0723f311088e0d19c396
   COMMAND xs_gen ${runcard_dir}/Z3j_uno.yml 2.743604e-02 5.593320e-04
 )
 
 # Test that sum of partons == proton
 add_executable(PSP_channel PSP_channel.cc)
 target_link_libraries(PSP_channel hejfog_lib)
 # pure jets
 add_long_test(
   NAME channel_2j
   COMMAND PSP_channel ${runcard_dir}/2j.yml
 )
 add_test(
   NAME channel_3j_qqbar
   COMMAND PSP_channel ${runcard_dir}/3j_qqbar.yml
 )
 add_long_test(
   NAME channel_3j_uno
   COMMAND PSP_channel ${runcard_dir}/3j_uno.yml
 )
 add_long_test(
   NAME channel_4j_qqbar
   COMMAND PSP_channel ${runcard_dir}/4j_qqbar.yml
 )
 # W+jets
 # pure jets
 add_long_test(
   NAME channel_W2j
   COMMAND PSP_channel ${runcard_dir}/Wm2j.yml
 )
 add_long_test(
   NAME channel_W3j_uno
   COMMAND PSP_channel ${runcard_dir}/Wp3j_uno.yml
 )
 add_long_test(
   NAME channel_W3j_eqqbar
   COMMAND PSP_channel ${runcard_dir}/Wp3j_qqbar.yml
 )
 add_long_test(
   NAME channel_W4j_qqbar
   COMMAND PSP_channel ${runcard_dir}/Wp4j_qqbar.yml
 )
 # Z+jets
 add_long_test(
   NAME channel_Z2j
   COMMAND PSP_channel ${runcard_dir}/Z2j.yml
 )
 add_long_test(
   NAME channel_Z3j_uno
   COMMAND PSP_channel ${runcard_dir}/Z3j_uno.yml
 )
 
 # Test that each subleading channel is generated consistently
 add_executable(PSP_subl PSP_subl.cc)
 target_link_libraries(PSP_subl hejfog_lib)
 add_long_test(
   NAME subl_5j
   COMMAND PSP_subl ${runcard_dir}/5j.yml
 )
 add_long_test(
   NAME subl_h5j
   COMMAND PSP_subl ${runcard_dir}/h5j.yml
 )
 add_long_test(
   NAME subl_W3j
   COMMAND PSP_subl ${runcard_dir}/Wp3j_qqbar.yml
 )
 add_long_test(
   NAME subl_W5j
   COMMAND PSP_subl ${runcard_dir}/Wm5j.yml
 )
 add_long_test(
   NAME subl_Z3j
   COMMAND PSP_subl ${runcard_dir}/Z3j_uno.yml
 )
 
 # Test that invalid choices for subleading processes cause the correct errors
 set(BOSONTYPE h)
 set(SUBLEADINGCHANNEL cqqbar)
 configure_file( ${runcard_dir}/unsupported.yml.in
                 check_unsupported_h_cqqbar.yml  @ONLY )
 set(SUBLEADINGCHANNEL eqqbar)
 configure_file( ${runcard_dir}/unsupported.yml.in
                 check_unsupported_h_eqqbar.yml  @ONLY )
 set(BOSONTYPE "e+ e-")
 set(SUBLEADINGCHANNEL cqqbar)
 configure_file( ${runcard_dir}/unsupported.yml.in
                 check_unsupported_z_cqqbar.yml  @ONLY )
 set(SUBLEADINGCHANNEL eqqbar)
 configure_file( ${runcard_dir}/unsupported.yml.in
                 check_unsupported_z_eqqbar.yml  @ONLY )
 
 add_test(
   NAME check_unsupported_h_cqqbar
   COMMAND HEJFOG check_unsupported_h_cqqbar.yml
 )
 add_test(
   NAME check_unsupported_h_eqqbar
   COMMAND HEJFOG check_unsupported_h_eqqbar.yml
 )
 add_test(
   NAME check_unsupported_z_cqqbar
   COMMAND HEJFOG check_unsupported_z_cqqbar.yml
 )
 add_test(
   NAME check_unsupported_z_eqqbar
   COMMAND HEJFOG check_unsupported_z_eqqbar.yml
 )
 set_tests_properties(
     check_unsupported_h_cqqbar
     check_unsupported_h_eqqbar
     check_unsupported_z_cqqbar
     check_unsupported_z_eqqbar
   PROPERTIES
     PASS_REGULAR_EXPRESSION ".*Invalid subleading channels for given process"
 )
-