diff --git a/.travis.script.bash b/.travis.script.bash
index ae717cad9ee7468e451ade7f5d243a9222357abc..82579525536bf5dd448bde598b83e64ff588effc 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -12,9 +12,9 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
 if [ x"${TESTS}" == x ] ; then
-    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries
+    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries
 else
-    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries_builder_${TESTS}
+    ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries_builder_${TESTS}
 fi
 
 source ${OPTS}
@@ -22,7 +22,7 @@ CTEST="ctest -V --timeout ${DXT_TEST_TIMEOUT:-300} -j ${DXT_TEST_PROCS:-2}"
 
 if [ x"${TESTS}" == x ] ; then
     ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST}
-    ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 headercheck
+    ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
 else
     # with binning headercheck is included in building tests
     ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST} -L "^builder_${TESTS}$"
diff --git a/.travis.test_python.bash b/.travis.test_python.bash
index 98ac35a0ee26ebac5bb4cae582074ee45d965524..264c4b430535201cd6ff7b58e9908fabfba1aaa8 100755
--- a/.travis.test_python.bash
+++ b/.travis.test_python.bash
@@ -11,8 +11,7 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
 
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
 ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v bindings
-
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_python
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
 
 # ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 2d429ea845598585d6d6f356517b4ffea3f23071..49004583b9b068c87f03478c41384118b2cc359f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,24 +66,6 @@ jobs:
   - stage: test_cpp
     env: DOCKER_TAG=gcc_full TESTS=3
     
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=0
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=1
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=2
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_istl_no_disc TESTS=3
-    
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=0
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=1
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=2
-  - stage: test_cpp
-    env: DOCKER_TAG=gcc_no_disc TESTS=3
-    
   - stage: test_cpp
     env: DOCKER_TAG=clang_full TESTS=0
   - stage: test_cpp
@@ -98,16 +80,6 @@ jobs:
     script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
     # overwrite other global/matrix settings
     after_script: true
-  - stage: test_python
-    env: DOCKER_TAG=gcc_no_istl_no_disc
-    script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
-    # overwrite other global/matrix settings
-    after_script: true
-  - stage: test_python
-    env: DOCKER_TAG=gcc_no_disc
-    script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
-    # overwrite other global/matrix settings
-    after_script: true
   - stage: test_python
     env: DOCKER_TAG=clang_full
     script: ${DOCKER_RUN} /root/src/dune-xt-functions/.travis.test_python.bash
diff --git a/dune.module b/dune.module
index ad76d9254de4da3df503c41e22d6344fb60b8e42..af76e71ca42456a92518a289c141418f741495cf 100644
--- a/dune.module
+++ b/dune.module
@@ -12,5 +12,4 @@
 Module: dune-xt-functions
 Version: 2.5.0-dev
 Maintainer: dune-xt-dev@listserv.uni-muenster.de
-Depends: dune-common (>= 2.5) dune-testtools (>= 2.5) dune-geometry (>= 2.5) dune-grid (>= 2.5) dune-xt-common (>=2.5) dune-xt-grid (>= 2.5)
-Suggests: dune-fem dune-pdelab dune-xt-la (>= 2.5)
+Depends: dune-common (>= 2.5) dune-testtools (>= 2.5) dune-geometry (>= 2.5) dune-grid (>= 2.5) dune-xt-common (>=2.5) dune-xt-grid (>= 2.5) dune-xt-la (>= 2.5)
diff --git a/dune/xt/functions/affine.hh b/dune/xt/functions/affine.hh
index a91450f2a486bb27b1bde22d96683b4550ea4e15..9aa3b9321481c0d76befd94f639bd8f98528c4e3 100644
--- a/dune/xt/functions/affine.hh
+++ b/dune/xt/functions/affine.hh
@@ -129,19 +129,6 @@ public:
 
   AffineFunctionBase(const ThisType& other) = default;
 
-// if HAVE_DUNE_FEM is true, GlobalFunctionInterface is derived from Fem::Function which has a deleted copy assignment
-// operator
-#if HAVE_DUNE_FEM
-  ThisType& operator=(const ThisType& other)
-  {
-    A_ = other.A_;
-    b_ = other.b_;
-    name_ = other.name_;
-    b_zero_ = other.b_zero_;
-    return *this;
-  }
-#endif
-
   const std::vector<MatrixType>& A() const
   {
     return A_;
diff --git a/dune/xt/functions/femadapter.hh b/dune/xt/functions/femadapter.hh
deleted file mode 100644
index 939d77f419acfe90c731fad5fe84a1b2caac2ccc..0000000000000000000000000000000000000000
--- a/dune/xt/functions/femadapter.hh
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is part of the dune-xt-functions project:
-//   https://github.com/dune-community/dune-xt-functions
-// Copyright 2009-2018 dune-xt-functions developers and contributors. All rights reserved.
-// License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
-//      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
-//          with "runtime exception" (http://www.dune-project.org/license.html)
-// Authors:
-//   Felix Schindler (2014 - 2017)
-//   Rene Milk       (2013 - 2018)
-//   Tobias Leibner  (2014, 2017)
-
-#ifndef DUNE_XT_FUNCTIONS_FEMADAPTER
-#define DUNE_XT_FUNCTIONS_FEMADAPTER
-
-#include <dune/xt/common/memory.hh>
-
-#include <dune/xt/functions/interfaces.hh>
-
-#if HAVE_DUNE_FEM
-
-namespace Dune {
-namespace XT {
-namespace Functions {
-
-
-template <class DiscreteFunctionType>
-class FemAdapterFunction
-    : public LocalizableFunctionInterface<typename DiscreteFunctionType::EntityType,
-                                          typename DiscreteFunctionType::DomainFieldType,
-                                          DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                          typename DiscreteFunctionType::RangeFieldType,
-                                          DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                          1>
-{
-  typedef LocalizableFunctionInterface<typename DiscreteFunctionType::EntityType,
-                                       typename DiscreteFunctionType::DomainFieldType,
-                                       DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                       typename DiscreteFunctionType::RangeFieldType,
-                                       DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                       1>
-      BaseType;
-  typedef FemAdapterFunction<DiscreteFunctionType> ThisType;
-
-  class Localfunction : public LocalfunctionInterface<typename DiscreteFunctionType::EntityType,
-                                                      typename DiscreteFunctionType::DomainFieldType,
-                                                      DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                                      typename DiscreteFunctionType::RangeFieldType,
-                                                      DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                                      1>
-  {
-    typedef LocalfunctionInterface<typename DiscreteFunctionType::EntityType,
-                                   typename DiscreteFunctionType::DomainFieldType,
-                                   DiscreteFunctionType::DiscreteFunctionSpaceType::dimDomain,
-                                   typename DiscreteFunctionType::RangeFieldType,
-                                   DiscreteFunctionType::DiscreteFunctionSpaceType::dimRange,
-                                   1>
-        BaseType;
-
-  public:
-    typedef typename BaseType::EntityType EntityType;
-
-    typedef typename BaseType::DomainType DomainType;
-    typedef typename BaseType::RangeType RangeType;
-    typedef typename BaseType::JacobianRangeType JacobianRangeType;
-
-    Localfunction(const DiscreteFunctionType& df, const EntityType& ent)
-      : BaseType(ent)
-      , wrapped_localfunction_(df.localFunction(ent))
-    {
-    }
-
-    Localfunction(const Localfunction& /*other*/) = delete;
-
-    Localfunction& operator=(const Localfunction& /*other*/) = delete;
-
-    virtual size_t order(const XT::Common::Parameter& /*mu*/ = {}) const override
-    {
-      // being a dune-fem datatype, the wrapped funcitons _really_ do not process the mu
-      return wrapped_localfunction_.order();
-    }
-
-    virtual void evaluate(const DomainType& xx, RangeType& ret, const Common::Parameter& /*mu*/ = {}) const override
-    {
-      wrapped_localfunction_.evaluate(xx, ret);
-    }
-
-    virtual void
-    jacobian(const DomainType& xx, JacobianRangeType& ret, const Common::Parameter& /*mu*/ = {}) const override
-    {
-      wrapped_localfunction_.jacobian(xx, ret);
-    }
-
-  private:
-    typedef typename DiscreteFunctionType::LocalFunctionType WrappedLocalfunctionType;
-    WrappedLocalfunctionType wrapped_localfunction_;
-  }; // class Localfunction
-
-public:
-  typedef typename BaseType::EntityType EntityType;
-  typedef typename BaseType::LocalfunctionType LocalfunctionType;
-
-  FemAdapterFunction(const DiscreteFunctionType& df)
-    : df_(df)
-  {
-  }
-
-  static std::string static_id()
-  {
-    return BaseType::static_id() + ".femadapter";
-  }
-
-  virtual ThisType* copy() const override
-  {
-    return new ThisType(*this);
-  }
-
-  virtual std::string type() const override
-  {
-    return BaseType::static_id() + ".femadapter";
-  }
-
-  virtual std::string name() const override
-  {
-    return df_.name();
-  }
-
-  //! this intentionally hides
-  virtual std::unique_ptr<LocalfunctionType> local_function(const EntityType& entity) const
-  {
-    return Common::make_unique<Localfunction>(df_, entity);
-  } // ... local_function(...)
-
-private:
-  const DiscreteFunctionType& df_;
-}; // class CheckerboardFunction
-
-
-} // namespace Functions
-} // namespace XT
-} // namespace Dune
-
-#endif // if HAVE_DUNE_FEM
-
-#endif // DUNE_XT_FUNCTIONS_FEMADAPTER
diff --git a/dune/xt/functions/interfaces.lib.hh b/dune/xt/functions/interfaces.lib.hh
index 65b09bd5de3720907f6c63714039442ed9da56e1..677673468ad37851015b8b3902c4f96b6da05937 100644
--- a/dune/xt/functions/interfaces.lib.hh
+++ b/dune/xt/functions/interfaces.lib.hh
@@ -16,7 +16,6 @@
 #if DUNE_XT_WITH_PYTHON_BINDINGS
 
 
-#if HAVE_DUNE_FEM
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, _t, _b, _R, _r, _rC)                           \
   _p void Dune::XT::Functions::LocalizableFunctionInterface<                                                           \
       typename _G::template Codim<0>::Entity,                                                                          \
@@ -31,9 +30,6 @@
                       const std::string,                                                                               \
                       const bool,                                                                                      \
                       const VTK::OutputType) const
-#else
-#define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, _t, _b, _R, _r, _rC)
-#endif
 
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, _t, _b, _R, _r, _rC)                                        \
   _p void Dune::XT::Functions::LocalizableFunctionInterface<typename _G::template Codim<0>::Entity,                    \
@@ -50,10 +46,10 @@
 
 #if HAVE_DUNE_FEM
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_PART(_p, _G, _R, _r, _rC)                                           \
-  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, adaptive_leaf, part, _R, _r, _rC);                                \
+  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, adaptive_leaf, view, _R, _r, _rC);                                \
   _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, leaf, part, _R, _r, _rC);                                         \
   _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE(_p, _G, level, part, _R, _r, _rC);                                        \
-  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, dd_subdomain, part, _R, _r, _rC)
+  _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_DD_SUBDOMAIN(_p, _G, dd_subdomain, view, _R, _r, _rC)
 #else
 #define _DUNE_XT_FUNCTIONS_INTERFACE_LIB_VISUALIZE_PART(_p, _G, _R, _r, _rC)
 #endif
diff --git a/dune/xt/functions/test/builder_definitions.cmake b/dune/xt/functions/test/builder_definitions.cmake
index 0d3b2bb61914821cef32877022b090e69d223e56..4d1d97c38771fca46e32543ce6217b2923455e34 100644
--- a/dune/xt/functions/test/builder_definitions.cmake
+++ b/dune/xt/functions/test/builder_definitions.cmake
@@ -1,5 +1,5 @@
 set(DXT_BIN_COUNT "4" CACHE STRING "number of bins for test targets" )
-add_custom_target(test_binaries_builder_0 DEPENDS headercheck__dune_xt_functions.hh headercheck__dune_xt_functions_default.hh headercheck__dune_xt_functions_derived.hh headercheck__dune_xt_functions_expression_mathexpr.hh headercheck__dune_xt_functions_interfaces.lib.hh headercheck__dune_xt_functions_interfaces_global-function.hh headercheck__dune_xt_functions_interfaces_local-flux-function.hh headercheck__dune_xt_functions_interfaces_local-functions.hh headercheck__dune_xt_functions_interfaces_localizable-flux-function.hh headercheck__dune_xt_functions_interfaces_timedependent-function.hh headercheck__dune_xt_functions_random_ellipsoids.hh headercheck__dune_xt_functions_reinterpret.hh headercheck__dune_xt_functions_spe10_model2.hh headercheck__dune_xt_functions_test_functions.hh headercheck__dune_xt_functions_type_traits.hh test_ESV2007_alberta_2d_r3_rc3_0000 test_ESV2007_alberta_2d_r3_rc3_0001 test_ESV2007_alu_2d_r1_rc1_0002 test_ESV2007_alu_2d_r1_rc3_0002 test_ESV2007_alu_2d_r3_rc3_0002 test_ESV2007_alu_2d_r3_rc3_0003 test_ESV2007_alu_2d_r3_rc3_0005 test_ESV2007_ug_2d_r1_rc3_0000 test_ESV2007_ug_2d_r3_rc3_0000 test_affine_alberta_3d_r1_rc1 test_affine_alberta_3d_r3_rc3 test_affine_alu_3d_r1_rc1_0002 test_affine_flux_alu_3d_r1_rc1_0000 test_affine_flux_alu_3d_r3_rc3_0000 test_affine_flux_ug_3d_r1_rc1 test_affine_flux_ug_3d_r3_rc1 test_affine_flux_yasp_1d_r3_rc1 test_affine_flux_yasp_3d_r1_rc1 test_affine_ug_3d_r1_rc1 test_affine_ug_3d_r3_rc1 test_affine_ug_3d_r3_rc3 test_affine_yasp_3d_r3_rc1 test_affine_yasp_3d_r3_rc3 test_checkerboard_alu_3d_r1_rc1_0001 test_checkerboard_alu_3d_r1_rc3_0000 test_checkerboard_alu_3d_r3_rc1_0002 test_checkerboard_alu_3d_r3_rc3_0000 test_checkerboard_yasp_3d_r1_rc1 test_checkerboard_yasp_3d_r1_rc3 test_checkerboard_yasp_3d_r3_rc1 test_combined test_constant_alberta_1d_r1_rc1 test_constant_alberta_1d_r3_rc3 test_constant_alu_3d_r3_rc1_0001 test_constant_alu_3d_r3_rc1_0002 test_constant_yasp_1d_r1_rc1 test_constant_yasp_1d_r3_rc1 test_constant_yasp_3d_r1_rc1 test_empty test_expression_default_alberta_3d_r3_rc3 test_expression_default_alu_3d_r1_rc1_0000 test_expression_default_alu_3d_r1_rc3_0000 test_expression_default_alu_3d_r3_rc1_0000 test_expression_default_alu_3d_r3_rc3_0002 test_expression_default_ug_3d_r1_rc1 test_expression_default_ug_3d_r3_rc3 test_expression_default_yasp_1d_r3_rc1 test_expression_default_yasp_1d_r3_rc3 test_expression_default_yasp_3d_r3_rc3 test_expression_parametric_alberta_1d_r1_rc1 test_expression_parametric_alberta_3d_r1_rc1 test_expression_parametric_alu_3d_r1_rc1_0002 test_expression_parametric_yasp_3d_r1_rc1 test_functions_alberta_1d_r3_rc1 test_functions_alberta_3d_r3_rc1 test_functions_alu_3d_r1_rc1_0001 test_functions_alu_3d_r1_rc3_0000 test_functions_alu_3d_r3_rc1_0000 test_functions_ug_3d_r3_rc3 test_functions_yasp_1d_r3_rc3 test_functions_yasp_3d_r1_rc1 test_indicator_alberta_1d_r1_rc1 test_indicator_alberta_3d_r1_rc1 test_lambda_global_flux_function_ug_3d_r1_rc1 test_lambda_global_flux_function_yasp_1d_r1_rc1 test_lambda_global_function_alberta_3d_r1_rc1 test_lambda_global_function_alu_3d_r1_rc1_0000 test_lambda_global_function_alu_3d_r1_rc3_0001 test_lambda_global_function_alu_3d_r3_rc1_0000 test_lambda_global_function_alu_3d_r3_rc3_0002 test_lambda_global_function_ug_3d_r1_rc3 test_lambda_global_function_yasp_1d_r1_rc3 test_lambda_global_function_yasp_3d_r1_rc1 test_lambda_global_function_yasp_3d_r3_rc1 test_lambda_local_flux_function_alu_3d_r1_rc1_0002 test_lambda_local_flux_function_yasp_1d_r1_rc1 test_lambda_local_function_alberta_3d_r3_rc3 test_lambda_local_function_alu_3d_r3_rc1_0000 test_lambda_local_function_alu_3d_r3_rc3_0000 test_lambda_local_function_alu_3d_r3_rc3_0001 test_lambda_local_function_ug_3d_r1_rc1 test_lambda_local_function_ug_3d_r3_rc1 test_lambda_local_function_ug_3d_r3_rc3 test_spe10_alberta_3d_r3_rc3 test_spe10_alu_3d_r3_rc3_0000 test_spe10_alu_3d_r3_rc3_0001)
+add_custom_target(test_binaries_builder_0 DEPENDS headercheck__dune_xt_functions.hh headercheck__dune_xt_functions_default.hh headercheck__dune_xt_functions_interfaces.lib.hh headercheck__dune_xt_functions_interfaces_global-function.hh headercheck__dune_xt_functions_interfaces_localizable-flux-function.hh headercheck__dune_xt_functions_lambda_global-function.hh headercheck__dune_xt_functions_random_ellipsoids.hh headercheck__dune_xt_functions_reinterpret.hh headercheck__dune_xt_functions_spe10_model2.hh headercheck__dune_xt_functions_test_functions.hh test_ESV2007_alberta_2d_r3_rc3_0000 test_ESV2007_alberta_2d_r3_rc3_0001 test_ESV2007_alu_2d_r1_rc1_0002 test_ESV2007_alu_2d_r1_rc3_0002 test_ESV2007_alu_2d_r3_rc3_0002 test_ESV2007_alu_2d_r3_rc3_0003 test_ESV2007_alu_2d_r3_rc3_0005 test_ESV2007_ug_2d_r1_rc3_0000 test_ESV2007_ug_2d_r3_rc3_0000 test_affine_alberta_3d_r1_rc1 test_affine_alberta_3d_r3_rc3 test_affine_alu_3d_r1_rc1_0002 test_affine_flux_alu_3d_r1_rc1_0000 test_affine_flux_alu_3d_r3_rc3_0000 test_affine_flux_ug_3d_r1_rc1 test_affine_flux_ug_3d_r3_rc1 test_affine_flux_yasp_1d_r3_rc1 test_affine_flux_yasp_3d_r1_rc1 test_affine_ug_3d_r1_rc1 test_affine_ug_3d_r3_rc1 test_affine_ug_3d_r3_rc3 test_affine_yasp_3d_r3_rc1 test_affine_yasp_3d_r3_rc3 test_checkerboard_alu_3d_r1_rc1_0001 test_checkerboard_alu_3d_r1_rc3_0000 test_checkerboard_alu_3d_r3_rc1_0002 test_checkerboard_alu_3d_r3_rc3_0000 test_checkerboard_yasp_3d_r1_rc1 test_checkerboard_yasp_3d_r1_rc3 test_checkerboard_yasp_3d_r3_rc1 test_combined test_constant_alberta_1d_r1_rc1 test_constant_alberta_1d_r3_rc3 test_constant_alu_3d_r3_rc1_0001 test_constant_alu_3d_r3_rc1_0002 test_constant_yasp_1d_r1_rc1 test_constant_yasp_1d_r3_rc1 test_constant_yasp_3d_r1_rc1 test_empty test_expression_default_alberta_3d_r3_rc3 test_expression_default_alu_3d_r1_rc1_0000 test_expression_default_alu_3d_r1_rc3_0000 test_expression_default_alu_3d_r3_rc1_0000 test_expression_default_alu_3d_r3_rc3_0002 test_expression_default_ug_3d_r1_rc1 test_expression_default_ug_3d_r3_rc3 test_expression_default_yasp_1d_r3_rc1 test_expression_default_yasp_1d_r3_rc3 test_expression_default_yasp_3d_r3_rc3 test_expression_parametric_alberta_1d_r1_rc1 test_expression_parametric_alberta_3d_r1_rc1 test_expression_parametric_alu_3d_r1_rc1_0002 test_expression_parametric_yasp_3d_r1_rc1 test_functions_alberta_1d_r3_rc1 test_functions_alberta_3d_r3_rc1 test_functions_alu_3d_r1_rc1_0001 test_functions_alu_3d_r1_rc3_0000 test_functions_alu_3d_r3_rc1_0000 test_functions_ug_3d_r3_rc3 test_functions_yasp_1d_r3_rc3 test_functions_yasp_3d_r1_rc1 test_indicator_alberta_1d_r1_rc1 test_indicator_alberta_3d_r1_rc1 test_lambda_global_flux_function_ug_3d_r1_rc1 test_lambda_global_flux_function_yasp_1d_r1_rc1 test_lambda_global_function_alberta_3d_r1_rc1 test_lambda_global_function_alu_3d_r1_rc1_0000 test_lambda_global_function_alu_3d_r1_rc3_0001 test_lambda_global_function_alu_3d_r3_rc1_0000 test_lambda_global_function_alu_3d_r3_rc3_0002 test_lambda_global_function_ug_3d_r1_rc3 test_lambda_global_function_yasp_1d_r1_rc3 test_lambda_global_function_yasp_3d_r1_rc1 test_lambda_global_function_yasp_3d_r3_rc1 test_lambda_local_flux_function_alu_3d_r1_rc1_0002 test_lambda_local_flux_function_yasp_1d_r1_rc1 test_lambda_local_function_alberta_3d_r3_rc3 test_lambda_local_function_alu_3d_r3_rc1_0000 test_lambda_local_function_alu_3d_r3_rc3_0000 test_lambda_local_function_alu_3d_r3_rc3_0001 test_lambda_local_function_ug_3d_r1_rc1 test_lambda_local_function_ug_3d_r3_rc1 test_lambda_local_function_ug_3d_r3_rc3 test_spe10_alberta_3d_r3_rc3 test_spe10_alu_3d_r3_rc3_0000 test_spe10_alu_3d_r3_rc3_0001)
 set_tests_properties(test_ESV2007_alberta_2d_r3_rc3_0000_functions_0008 test_ESV2007_alberta_2d_r3_rc3_0000_functions_0010 test_ESV2007_alberta_2d_r3_rc3_0000_functions_0012 test_ESV2007_alberta_2d_r3_rc3_0000_functions_0014 PROPERTIES LABELS "builder_0")
 set_tests_properties(test_ESV2007_alberta_2d_r3_rc3_0001_functions_0009 test_ESV2007_alberta_2d_r3_rc3_0001_functions_0011 test_ESV2007_alberta_2d_r3_rc3_0001_functions_0013 test_ESV2007_alberta_2d_r3_rc3_0001_functions_0015 PROPERTIES LABELS "builder_0")
 set_tests_properties( PROPERTIES LABELS "builder_0")
@@ -86,7 +86,7 @@ set_tests_properties(test_lambda_local_function_ug_3d_r3_rc3_lambda_local_functi
 set_tests_properties(test_spe10_alberta_3d_r3_rc3_spe10_0001 PROPERTIES LABELS "builder_0")
 set_tests_properties(test_spe10_alu_3d_r3_rc3_0000_spe10_0002 PROPERTIES LABELS "builder_0")
 set_tests_properties(test_spe10_alu_3d_r3_rc3_0001_spe10_0003 PROPERTIES LABELS "builder_0")
-add_custom_target(test_binaries_builder_1 DEPENDS headercheck__dune_xt_functions_checkerboard.lib.hh headercheck__dune_xt_functions_combined.hh headercheck__dune_xt_functions_constant.hh headercheck__dune_xt_functions_constant.lib.hh headercheck__dune_xt_functions_expression.hh headercheck__dune_xt_functions_flattop.hh headercheck__dune_xt_functions_lambda_local-flux-function.hh headercheck__dune_xt_functions_lambda_local-function.hh headercheck__dune_xt_functions_spe10_model1.hh headercheck__dune_xt_functions_spe10_model1.lib.hh test_ESV2007_alberta_2d_r1_rc1_0000 test_ESV2007_alberta_2d_r1_rc1_0001 test_ESV2007_alberta_2d_r3_rc1_0001 test_ESV2007_alu_2d_r1_rc1_0004 test_ESV2007_alu_2d_r1_rc3_0001 test_ESV2007_alu_2d_r1_rc3_0003 test_ESV2007_alu_2d_r3_rc1_0001 test_ESV2007_alu_2d_r3_rc1_0002 test_ESV2007_alu_2d_r3_rc1_0003 test_ESV2007_alu_2d_r3_rc1_0005 test_ESV2007_ug_2d_r3_rc1_0001 test_ESV2007_yasp_2d_r1_rc1_0000 test_ESV2007_yasp_2d_r1_rc3_0001 test_ESV2007_yasp_2d_r3_rc3_0000 test_affine_alberta_1d_r1_rc1 test_affine_alberta_1d_r1_rc3 test_affine_alberta_1d_r3_rc1 test_affine_alberta_3d_r1_rc3 test_affine_alu_3d_r1_rc1_0000 test_affine_alu_3d_r1_rc3_0002 test_affine_alu_3d_r3_rc1_0001 test_affine_alu_3d_r3_rc3_0000 test_affine_flux_alberta_1d_r1_rc1 test_affine_flux_alberta_1d_r3_rc3 test_affine_flux_alberta_3d_r1_rc3 test_affine_flux_alu_3d_r3_rc1_0002 test_affine_flux_alu_3d_r3_rc3_0001 test_affine_flux_yasp_1d_r3_rc3 test_affine_yasp_1d_r3_rc3 test_checkerboard_alberta_1d_r3_rc3 test_checkerboard_alberta_3d_r1_rc1 test_checkerboard_alberta_3d_r3_rc1 test_checkerboard_alberta_3d_r3_rc3 test_checkerboard_alu_3d_r1_rc1_0000 test_checkerboard_alu_3d_r1_rc3_0001 test_checkerboard_alu_3d_r3_rc1_0000 test_checkerboard_alu_3d_r3_rc3_0002 test_checkerboard_ug_3d_r1_rc3 test_checkerboard_yasp_1d_r1_rc1 test_constant_alberta_1d_r3_rc1 test_constant_alberta_3d_r1_rc1 test_constant_alberta_3d_r1_rc3 test_constant_alberta_3d_r3_rc1 test_constant_alu_3d_r1_rc1_0000 test_constant_alu_3d_r1_rc1_0002 test_constant_alu_3d_r1_rc3_0001 test_constant_yasp_1d_r3_rc3 test_constant_yasp_3d_r3_rc1 test_constant_yasp_3d_r3_rc3 test_expression_default_alberta_1d_r1_rc1 test_expression_default_alberta_1d_r3_rc1 test_expression_default_alu_3d_r1_rc1_0001 test_expression_default_alu_3d_r1_rc1_0002 test_expression_default_alu_3d_r1_rc3_0001 test_expression_default_alu_3d_r1_rc3_0002 test_expression_default_alu_3d_r3_rc3_0000 test_expression_default_yasp_3d_r1_rc3 test_expression_parametric_alu_3d_r1_rc1_0000 test_functions_alu_3d_r1_rc1_0002 test_functions_alu_3d_r1_rc3_0002 test_functions_alu_3d_r3_rc3_0002 test_functions_ug_3d_r1_rc3 test_functions_yasp_1d_r3_rc1 test_indicator_alu_3d_r1_rc1_0001 test_indicator_alu_3d_r1_rc1_0002 test_indicator_ug_3d_r1_rc1 test_lambda_global_flux_function_alberta_3d_r1_rc1 test_lambda_global_flux_function_alu_3d_r1_rc1_0000 test_lambda_global_flux_function_alu_3d_r1_rc1_0001 test_lambda_global_function_alberta_1d_r1_rc1 test_lambda_global_function_alu_3d_r1_rc1_0002 test_lambda_global_function_alu_3d_r3_rc1_0002 test_lambda_global_function_alu_3d_r3_rc3_0000 test_lambda_global_function_alu_3d_r3_rc3_0001 test_lambda_global_function_ug_3d_r1_rc1 test_lambda_global_function_yasp_1d_r3_rc1 test_lambda_local_flux_function_alberta_3d_r1_rc1 test_lambda_local_function_alberta_1d_r3_rc3 test_lambda_local_function_alberta_3d_r3_rc1 test_lambda_local_function_alu_3d_r1_rc3_0002 test_lambda_local_function_alu_3d_r3_rc1_0002 test_lambda_local_function_yasp_1d_r1_rc1 test_lambda_local_function_yasp_1d_r1_rc3 test_lambda_local_function_yasp_3d_r1_rc1 test_spe10_alu_3d_r3_rc3_0002 test_spe10_yasp_3d_r3_rc3)
+add_custom_target(test_binaries_builder_1 DEPENDS headercheck__dune_xt_functions_checkerboard.lib.hh headercheck__dune_xt_functions_constant.lib.hh headercheck__dune_xt_functions_derived.hh headercheck__dune_xt_functions_expression.hh headercheck__dune_xt_functions_expression_base.hh headercheck__dune_xt_functions_flattop.hh headercheck__dune_xt_functions_lambda_global-flux-function.hh headercheck__dune_xt_functions_lambda_local-function.hh headercheck__dune_xt_functions_spe10_model1.hh headercheck__dune_xt_functions_spe10_model1.lib.hh test_ESV2007_alberta_2d_r1_rc1_0000 test_ESV2007_alberta_2d_r1_rc1_0001 test_ESV2007_alberta_2d_r3_rc1_0001 test_ESV2007_alu_2d_r1_rc1_0004 test_ESV2007_alu_2d_r1_rc3_0001 test_ESV2007_alu_2d_r1_rc3_0003 test_ESV2007_alu_2d_r3_rc1_0001 test_ESV2007_alu_2d_r3_rc1_0002 test_ESV2007_alu_2d_r3_rc1_0003 test_ESV2007_alu_2d_r3_rc1_0005 test_ESV2007_ug_2d_r3_rc1_0001 test_ESV2007_yasp_2d_r1_rc1_0000 test_ESV2007_yasp_2d_r1_rc3_0001 test_ESV2007_yasp_2d_r3_rc3_0000 test_affine_alberta_1d_r1_rc1 test_affine_alberta_1d_r1_rc3 test_affine_alberta_1d_r3_rc1 test_affine_alberta_3d_r1_rc3 test_affine_alu_3d_r1_rc1_0000 test_affine_alu_3d_r1_rc3_0002 test_affine_alu_3d_r3_rc1_0001 test_affine_alu_3d_r3_rc3_0000 test_affine_flux_alberta_1d_r1_rc1 test_affine_flux_alberta_1d_r3_rc3 test_affine_flux_alberta_3d_r1_rc3 test_affine_flux_alu_3d_r3_rc1_0002 test_affine_flux_alu_3d_r3_rc3_0001 test_affine_flux_yasp_1d_r3_rc3 test_affine_yasp_1d_r3_rc3 test_checkerboard_alberta_1d_r3_rc3 test_checkerboard_alberta_3d_r1_rc1 test_checkerboard_alberta_3d_r3_rc1 test_checkerboard_alberta_3d_r3_rc3 test_checkerboard_alu_3d_r1_rc1_0000 test_checkerboard_alu_3d_r1_rc3_0001 test_checkerboard_alu_3d_r3_rc1_0000 test_checkerboard_alu_3d_r3_rc3_0002 test_checkerboard_ug_3d_r1_rc3 test_checkerboard_yasp_1d_r1_rc1 test_constant_alberta_1d_r3_rc1 test_constant_alberta_3d_r1_rc1 test_constant_alberta_3d_r1_rc3 test_constant_alberta_3d_r3_rc1 test_constant_alu_3d_r1_rc1_0000 test_constant_alu_3d_r1_rc1_0002 test_constant_alu_3d_r1_rc3_0001 test_constant_yasp_1d_r3_rc3 test_constant_yasp_3d_r3_rc1 test_constant_yasp_3d_r3_rc3 test_expression_default_alberta_1d_r1_rc1 test_expression_default_alberta_1d_r3_rc1 test_expression_default_alu_3d_r1_rc1_0001 test_expression_default_alu_3d_r1_rc1_0002 test_expression_default_alu_3d_r1_rc3_0001 test_expression_default_alu_3d_r1_rc3_0002 test_expression_default_alu_3d_r3_rc3_0000 test_expression_default_yasp_3d_r1_rc3 test_expression_parametric_alu_3d_r1_rc1_0000 test_functions_alu_3d_r1_rc1_0002 test_functions_alu_3d_r1_rc3_0002 test_functions_alu_3d_r3_rc3_0002 test_functions_ug_3d_r1_rc3 test_functions_yasp_1d_r3_rc1 test_indicator_alu_3d_r1_rc1_0001 test_indicator_alu_3d_r1_rc1_0002 test_indicator_ug_3d_r1_rc1 test_lambda_global_flux_function_alberta_3d_r1_rc1 test_lambda_global_flux_function_alu_3d_r1_rc1_0000 test_lambda_global_flux_function_alu_3d_r1_rc1_0001 test_lambda_global_function_alberta_1d_r1_rc1 test_lambda_global_function_alu_3d_r1_rc1_0002 test_lambda_global_function_alu_3d_r3_rc1_0002 test_lambda_global_function_alu_3d_r3_rc3_0000 test_lambda_global_function_alu_3d_r3_rc3_0001 test_lambda_global_function_ug_3d_r1_rc1 test_lambda_global_function_yasp_1d_r3_rc1 test_lambda_local_flux_function_alberta_3d_r1_rc1 test_lambda_local_function_alberta_1d_r3_rc3 test_lambda_local_function_alberta_3d_r3_rc1 test_lambda_local_function_alu_3d_r1_rc3_0002 test_lambda_local_function_alu_3d_r3_rc1_0002 test_lambda_local_function_yasp_1d_r1_rc1 test_lambda_local_function_yasp_1d_r1_rc3 test_lambda_local_function_yasp_3d_r1_rc1 test_spe10_alu_3d_r3_rc3_0002 test_spe10_yasp_3d_r3_rc3)
 set_tests_properties( PROPERTIES LABELS "builder_1")
 set_tests_properties( PROPERTIES LABELS "builder_1")
 set_tests_properties( PROPERTIES LABELS "builder_1")
@@ -173,7 +173,7 @@ set_tests_properties(test_lambda_local_function_yasp_1d_r1_rc3_lambda_local_func
 set_tests_properties(test_lambda_local_function_yasp_3d_r1_rc1_lambda_local_function_0004 PROPERTIES LABELS "builder_1")
 set_tests_properties(test_spe10_alu_3d_r3_rc3_0002_spe10_0004 PROPERTIES LABELS "builder_1")
 set_tests_properties(test_spe10_yasp_3d_r3_rc3_spe10_0000 PROPERTIES LABELS "builder_1")
-add_custom_target(test_binaries_builder_2 DEPENDS headercheck__dune_xt_functions_ESV2007.hh headercheck__dune_xt_functions_checkerboard.hh headercheck__dune_xt_functions_composition.hh headercheck__dune_xt_functions_expression.lib.hh headercheck__dune_xt_functions_expression_base.hh headercheck__dune_xt_functions_expression_default.hh headercheck__dune_xt_functions_global.hh headercheck__dune_xt_functions_interfaces_global-flux-function.hh headercheck__dune_xt_functions_interfaces_localizable-function.hh headercheck__dune_xt_functions_transformed.hh test_ESV2007_alberta_2d_r1_rc3_0000 test_ESV2007_alu_2d_r1_rc1_0000 test_ESV2007_alu_2d_r1_rc1_0001 test_ESV2007_alu_2d_r3_rc1_0000 test_ESV2007_alu_2d_r3_rc3_0000 test_ESV2007_alu_2d_r3_rc3_0004 test_ESV2007_ug_2d_r1_rc1_0000 test_ESV2007_ug_2d_r1_rc1_0001 test_ESV2007_ug_2d_r1_rc3_0001 test_ESV2007_ug_2d_r3_rc1_0000 test_ESV2007_yasp_2d_r1_rc1_0001 test_ESV2007_yasp_2d_r1_rc3_0000 test_affine_alberta_3d_r3_rc1 test_affine_alu_3d_r1_rc1_0001 test_affine_alu_3d_r3_rc1_0000 test_affine_alu_3d_r3_rc1_0002 test_affine_flux_alberta_1d_r1_rc3 test_affine_flux_alberta_3d_r3_rc3 test_affine_flux_alu_3d_r1_rc3_0000 test_affine_flux_alu_3d_r1_rc3_0002 test_affine_flux_alu_3d_r3_rc1_0000 test_affine_flux_alu_3d_r3_rc1_0001 test_affine_flux_ug_3d_r1_rc3 test_affine_flux_yasp_1d_r1_rc1 test_affine_flux_yasp_1d_r1_rc3 test_affine_flux_yasp_3d_r1_rc3 test_affine_flux_yasp_3d_r3_rc1 test_affine_flux_yasp_3d_r3_rc3 test_affine_ug_3d_r1_rc3 test_affine_yasp_3d_r1_rc1 test_checkerboard_alberta_1d_r1_rc1 test_checkerboard_alberta_1d_r1_rc3 test_checkerboard_alberta_3d_r1_rc3 test_checkerboard_alu_3d_r1_rc1_0002 test_checkerboard_alu_3d_r1_rc3_0002 test_checkerboard_alu_3d_r3_rc1_0001 test_checkerboard_ug_3d_r1_rc1 test_checkerboard_ug_3d_r3_rc1 test_checkerboard_yasp_1d_r1_rc3 test_constant_alberta_1d_r1_rc3 test_constant_alberta_3d_r3_rc3 test_constant_alu_3d_r3_rc1_0000 test_constant_alu_3d_r3_rc3_0000 test_constant_ug_3d_r1_rc1 test_constant_ug_3d_r1_rc3 test_constant_ug_3d_r3_rc1 test_constant_yasp_1d_r1_rc3 test_expression_default_alberta_1d_r1_rc3 test_expression_default_alberta_3d_r1_rc1 test_expression_default_alberta_3d_r3_rc1 test_expression_default_alu_3d_r3_rc1_0001 test_expression_default_alu_3d_r3_rc3_0001 test_expression_default_ug_3d_r1_rc3 test_expression_default_ug_3d_r3_rc1 test_expression_parametric_alu_3d_r1_rc1_0001 test_expression_parametric_yasp_1d_r1_rc1 test_functions_alberta_3d_r3_rc3 test_functions_alu_3d_r1_rc3_0001 test_functions_alu_3d_r3_rc1_0001 test_functions_alu_3d_r3_rc3_0000 test_functions_ug_3d_r1_rc1 test_functions_ug_3d_r3_rc1 test_functions_yasp_1d_r1_rc1 test_functions_yasp_3d_r3_rc1 test_functions_yasp_3d_r3_rc3 test_indicator_alu_3d_r1_rc1_0000 test_lambda_global_flux_function_alberta_1d_r1_rc1 test_lambda_global_function_alberta_1d_r1_rc3 test_lambda_global_function_alberta_1d_r3_rc1 test_lambda_global_function_alberta_3d_r1_rc3 test_lambda_global_function_alberta_3d_r3_rc3 test_lambda_global_function_alu_3d_r1_rc3_0000 test_lambda_global_function_alu_3d_r1_rc3_0002 test_lambda_global_function_ug_3d_r3_rc1 test_lambda_global_function_yasp_1d_r3_rc3 test_lambda_local_flux_function_alu_3d_r1_rc1_0000 test_lambda_local_flux_function_alu_3d_r1_rc1_0001 test_lambda_local_function_alberta_1d_r1_rc3 test_lambda_local_function_alberta_3d_r1_rc1 test_lambda_local_function_alberta_3d_r1_rc3 test_lambda_local_function_alu_3d_r1_rc1_0000 test_lambda_local_function_alu_3d_r1_rc1_0002 test_lambda_local_function_alu_3d_r3_rc1_0001 test_lambda_local_function_ug_3d_r1_rc3 test_lambda_local_function_yasp_3d_r1_rc3 test_lambda_local_function_yasp_3d_r3_rc1)
+add_custom_target(test_binaries_builder_2 DEPENDS headercheck__dune_xt_functions_ESV2007.hh headercheck__dune_xt_functions_checkerboard.hh headercheck__dune_xt_functions_composition.hh headercheck__dune_xt_functions_expression.lib.hh headercheck__dune_xt_functions_expression_mathexpr.hh headercheck__dune_xt_functions_global.hh headercheck__dune_xt_functions_interfaces_global-flux-function.hh headercheck__dune_xt_functions_interfaces_local-flux-function.hh headercheck__dune_xt_functions_interfaces_local-functions.hh headercheck__dune_xt_functions_interfaces_localizable-function.hh headercheck__dune_xt_functions_interfaces_timedependent-function.hh headercheck__dune_xt_functions_lambda_local-flux-function.hh headercheck__dune_xt_functions_transformed.hh headercheck__dune_xt_functions_type_traits.hh test_ESV2007_alberta_2d_r1_rc3_0000 test_ESV2007_alu_2d_r1_rc1_0000 test_ESV2007_alu_2d_r1_rc1_0001 test_ESV2007_alu_2d_r3_rc1_0000 test_ESV2007_alu_2d_r3_rc3_0000 test_ESV2007_alu_2d_r3_rc3_0004 test_ESV2007_ug_2d_r1_rc1_0000 test_ESV2007_ug_2d_r1_rc1_0001 test_ESV2007_ug_2d_r1_rc3_0001 test_ESV2007_ug_2d_r3_rc1_0000 test_ESV2007_yasp_2d_r1_rc1_0001 test_ESV2007_yasp_2d_r1_rc3_0000 test_affine_alberta_3d_r3_rc1 test_affine_alu_3d_r1_rc1_0001 test_affine_alu_3d_r3_rc1_0000 test_affine_alu_3d_r3_rc1_0002 test_affine_flux_alberta_1d_r1_rc3 test_affine_flux_alberta_3d_r3_rc3 test_affine_flux_alu_3d_r1_rc3_0000 test_affine_flux_alu_3d_r1_rc3_0002 test_affine_flux_alu_3d_r3_rc1_0000 test_affine_flux_alu_3d_r3_rc1_0001 test_affine_flux_ug_3d_r1_rc3 test_affine_flux_yasp_1d_r1_rc1 test_affine_flux_yasp_1d_r1_rc3 test_affine_flux_yasp_3d_r1_rc3 test_affine_flux_yasp_3d_r3_rc1 test_affine_flux_yasp_3d_r3_rc3 test_affine_ug_3d_r1_rc3 test_affine_yasp_3d_r1_rc1 test_checkerboard_alberta_1d_r1_rc1 test_checkerboard_alberta_1d_r1_rc3 test_checkerboard_alberta_3d_r1_rc3 test_checkerboard_alu_3d_r1_rc1_0002 test_checkerboard_alu_3d_r1_rc3_0002 test_checkerboard_alu_3d_r3_rc1_0001 test_checkerboard_ug_3d_r1_rc1 test_checkerboard_ug_3d_r3_rc1 test_checkerboard_yasp_1d_r1_rc3 test_constant_alberta_1d_r1_rc3 test_constant_alberta_3d_r3_rc3 test_constant_alu_3d_r3_rc1_0000 test_constant_alu_3d_r3_rc3_0000 test_constant_ug_3d_r1_rc1 test_constant_ug_3d_r1_rc3 test_constant_ug_3d_r3_rc1 test_constant_yasp_1d_r1_rc3 test_expression_default_alberta_1d_r1_rc3 test_expression_default_alberta_3d_r1_rc1 test_expression_default_alberta_3d_r3_rc1 test_expression_default_alu_3d_r3_rc1_0001 test_expression_default_alu_3d_r3_rc3_0001 test_expression_default_ug_3d_r1_rc3 test_expression_default_ug_3d_r3_rc1 test_expression_parametric_alu_3d_r1_rc1_0001 test_expression_parametric_yasp_1d_r1_rc1 test_functions_alberta_3d_r3_rc3 test_functions_alu_3d_r1_rc3_0001 test_functions_alu_3d_r3_rc1_0001 test_functions_alu_3d_r3_rc3_0000 test_functions_ug_3d_r1_rc1 test_functions_ug_3d_r3_rc1 test_functions_yasp_1d_r1_rc1 test_functions_yasp_3d_r3_rc1 test_functions_yasp_3d_r3_rc3 test_indicator_alu_3d_r1_rc1_0000 test_lambda_global_flux_function_alberta_1d_r1_rc1 test_lambda_global_function_alberta_1d_r1_rc3 test_lambda_global_function_alberta_1d_r3_rc1 test_lambda_global_function_alberta_3d_r1_rc3 test_lambda_global_function_alberta_3d_r3_rc3 test_lambda_global_function_alu_3d_r1_rc3_0000 test_lambda_global_function_alu_3d_r1_rc3_0002 test_lambda_global_function_ug_3d_r3_rc1 test_lambda_global_function_yasp_1d_r3_rc3 test_lambda_local_flux_function_alu_3d_r1_rc1_0000 test_lambda_local_flux_function_alu_3d_r1_rc1_0001 test_lambda_local_function_alberta_1d_r1_rc3 test_lambda_local_function_alberta_3d_r1_rc1 test_lambda_local_function_alberta_3d_r1_rc3 test_lambda_local_function_alu_3d_r1_rc1_0000 test_lambda_local_function_alu_3d_r1_rc1_0002 test_lambda_local_function_alu_3d_r3_rc1_0001 test_lambda_local_function_ug_3d_r1_rc3 test_lambda_local_function_yasp_3d_r1_rc3 test_lambda_local_function_yasp_3d_r3_rc1)
 set_tests_properties( PROPERTIES LABELS "builder_2")
 set_tests_properties( PROPERTIES LABELS "builder_2")
 set_tests_properties( PROPERTIES LABELS "builder_2")
@@ -260,7 +260,7 @@ set_tests_properties(test_lambda_local_function_alu_3d_r3_rc1_0001_lambda_local_
 set_tests_properties(test_lambda_local_function_ug_3d_r1_rc3_lambda_local_function_0029 PROPERTIES LABELS "builder_2")
 set_tests_properties(test_lambda_local_function_yasp_3d_r1_rc3_lambda_local_function_0005 PROPERTIES LABELS "builder_2")
 set_tests_properties(test_lambda_local_function_yasp_3d_r3_rc1_lambda_local_function_0006 PROPERTIES LABELS "builder_2")
-add_custom_target(test_binaries_builder_3 DEPENDS headercheck__dune_xt_functions_affine.hh headercheck__dune_xt_functions_expression_parametric.hh headercheck__dune_xt_functions_expression_timedependent.hh headercheck__dune_xt_functions_femadapter.hh headercheck__dune_xt_functions_indicator.hh headercheck__dune_xt_functions_interfaces.hh headercheck__dune_xt_functions_lambda_global-flux-function.hh headercheck__dune_xt_functions_lambda_global-function.hh headercheck__dune_xt_functions_sliced.hh headercheck__dune_xt_functions_spe10_model2.lib.hh test_ESV2007_alberta_2d_r1_rc3_0001 test_ESV2007_alberta_2d_r3_rc1_0000 test_ESV2007_alu_2d_r1_rc1_0003 test_ESV2007_alu_2d_r1_rc1_0005 test_ESV2007_alu_2d_r1_rc3_0000 test_ESV2007_alu_2d_r1_rc3_0004 test_ESV2007_alu_2d_r1_rc3_0005 test_ESV2007_alu_2d_r3_rc1_0004 test_ESV2007_alu_2d_r3_rc3_0001 test_ESV2007_ug_2d_r3_rc3_0001 test_ESV2007_yasp_2d_r3_rc1_0000 test_ESV2007_yasp_2d_r3_rc1_0001 test_ESV2007_yasp_2d_r3_rc3_0001 test_affine_alberta_1d_r3_rc3 test_affine_alu_3d_r1_rc3_0000 test_affine_alu_3d_r1_rc3_0001 test_affine_alu_3d_r3_rc3_0001 test_affine_alu_3d_r3_rc3_0002 test_affine_flux_alberta_1d_r3_rc1 test_affine_flux_alberta_3d_r1_rc1 test_affine_flux_alberta_3d_r3_rc1 test_affine_flux_alu_3d_r1_rc1_0001 test_affine_flux_alu_3d_r1_rc1_0002 test_affine_flux_alu_3d_r1_rc3_0001 test_affine_flux_alu_3d_r3_rc3_0002 test_affine_flux_ug_3d_r3_rc3 test_affine_yasp_1d_r1_rc1 test_affine_yasp_1d_r1_rc3 test_affine_yasp_1d_r3_rc1 test_affine_yasp_3d_r1_rc3 test_checkerboard_alberta_1d_r3_rc1 test_checkerboard_alu_3d_r3_rc3_0001 test_checkerboard_ug_3d_r3_rc3 test_checkerboard_yasp_1d_r3_rc1 test_checkerboard_yasp_1d_r3_rc3 test_checkerboard_yasp_3d_r3_rc3 test_constant_alu_3d_r1_rc1_0001 test_constant_alu_3d_r1_rc3_0000 test_constant_alu_3d_r1_rc3_0002 test_constant_alu_3d_r3_rc3_0001 test_constant_alu_3d_r3_rc3_0002 test_constant_ug_3d_r3_rc3 test_constant_yasp_3d_r1_rc3 test_expression_default_alberta_1d_r3_rc3 test_expression_default_alberta_3d_r1_rc3 test_expression_default_alu_3d_r3_rc1_0002 test_expression_default_yasp_1d_r1_rc1 test_expression_default_yasp_1d_r1_rc3 test_expression_default_yasp_3d_r1_rc1 test_expression_default_yasp_3d_r3_rc1 test_expression_parametric_ug_3d_r1_rc1 test_flattop test_functions_alberta_1d_r1_rc1 test_functions_alberta_1d_r1_rc3 test_functions_alberta_1d_r3_rc3 test_functions_alberta_3d_r1_rc1 test_functions_alberta_3d_r1_rc3 test_functions_alu_3d_r1_rc1_0000 test_functions_alu_3d_r3_rc1_0002 test_functions_alu_3d_r3_rc3_0001 test_functions_yasp_1d_r1_rc3 test_functions_yasp_3d_r1_rc3 test_indicator_yasp_1d_r1_rc1 test_indicator_yasp_3d_r1_rc1 test_lambda_global_flux_function_alu_3d_r1_rc1_0002 test_lambda_global_flux_function_yasp_3d_r1_rc1 test_lambda_global_function_alberta_1d_r3_rc3 test_lambda_global_function_alberta_3d_r3_rc1 test_lambda_global_function_alu_3d_r1_rc1_0001 test_lambda_global_function_alu_3d_r3_rc1_0001 test_lambda_global_function_ug_3d_r3_rc3 test_lambda_global_function_yasp_1d_r1_rc1 test_lambda_global_function_yasp_3d_r1_rc3 test_lambda_global_function_yasp_3d_r3_rc3 test_lambda_local_flux_function_alberta_1d_r1_rc1 test_lambda_local_flux_function_ug_3d_r1_rc1 test_lambda_local_flux_function_yasp_3d_r1_rc1 test_lambda_local_function_alberta_1d_r1_rc1 test_lambda_local_function_alberta_1d_r3_rc1 test_lambda_local_function_alu_3d_r1_rc1_0001 test_lambda_local_function_alu_3d_r1_rc3_0000 test_lambda_local_function_alu_3d_r1_rc3_0001 test_lambda_local_function_alu_3d_r3_rc3_0002 test_lambda_local_function_yasp_1d_r3_rc1 test_lambda_local_function_yasp_1d_r3_rc3 test_lambda_local_function_yasp_3d_r3_rc3)
+add_custom_target(test_binaries_builder_3 DEPENDS headercheck__dune_xt_functions_affine.hh headercheck__dune_xt_functions_combined.hh headercheck__dune_xt_functions_constant.hh headercheck__dune_xt_functions_expression_default.hh headercheck__dune_xt_functions_expression_parametric.hh headercheck__dune_xt_functions_expression_timedependent.hh headercheck__dune_xt_functions_indicator.hh headercheck__dune_xt_functions_interfaces.hh headercheck__dune_xt_functions_sliced.hh headercheck__dune_xt_functions_spe10_model2.lib.hh test_ESV2007_alberta_2d_r1_rc3_0001 test_ESV2007_alberta_2d_r3_rc1_0000 test_ESV2007_alu_2d_r1_rc1_0003 test_ESV2007_alu_2d_r1_rc1_0005 test_ESV2007_alu_2d_r1_rc3_0000 test_ESV2007_alu_2d_r1_rc3_0004 test_ESV2007_alu_2d_r1_rc3_0005 test_ESV2007_alu_2d_r3_rc1_0004 test_ESV2007_alu_2d_r3_rc3_0001 test_ESV2007_ug_2d_r3_rc3_0001 test_ESV2007_yasp_2d_r3_rc1_0000 test_ESV2007_yasp_2d_r3_rc1_0001 test_ESV2007_yasp_2d_r3_rc3_0001 test_affine_alberta_1d_r3_rc3 test_affine_alu_3d_r1_rc3_0000 test_affine_alu_3d_r1_rc3_0001 test_affine_alu_3d_r3_rc3_0001 test_affine_alu_3d_r3_rc3_0002 test_affine_flux_alberta_1d_r3_rc1 test_affine_flux_alberta_3d_r1_rc1 test_affine_flux_alberta_3d_r3_rc1 test_affine_flux_alu_3d_r1_rc1_0001 test_affine_flux_alu_3d_r1_rc1_0002 test_affine_flux_alu_3d_r1_rc3_0001 test_affine_flux_alu_3d_r3_rc3_0002 test_affine_flux_ug_3d_r3_rc3 test_affine_yasp_1d_r1_rc1 test_affine_yasp_1d_r1_rc3 test_affine_yasp_1d_r3_rc1 test_affine_yasp_3d_r1_rc3 test_checkerboard_alberta_1d_r3_rc1 test_checkerboard_alu_3d_r3_rc3_0001 test_checkerboard_ug_3d_r3_rc3 test_checkerboard_yasp_1d_r3_rc1 test_checkerboard_yasp_1d_r3_rc3 test_checkerboard_yasp_3d_r3_rc3 test_constant_alu_3d_r1_rc1_0001 test_constant_alu_3d_r1_rc3_0000 test_constant_alu_3d_r1_rc3_0002 test_constant_alu_3d_r3_rc3_0001 test_constant_alu_3d_r3_rc3_0002 test_constant_ug_3d_r3_rc3 test_constant_yasp_3d_r1_rc3 test_expression_default_alberta_1d_r3_rc3 test_expression_default_alberta_3d_r1_rc3 test_expression_default_alu_3d_r3_rc1_0002 test_expression_default_yasp_1d_r1_rc1 test_expression_default_yasp_1d_r1_rc3 test_expression_default_yasp_3d_r1_rc1 test_expression_default_yasp_3d_r3_rc1 test_expression_parametric_ug_3d_r1_rc1 test_flattop test_functions_alberta_1d_r1_rc1 test_functions_alberta_1d_r1_rc3 test_functions_alberta_1d_r3_rc3 test_functions_alberta_3d_r1_rc1 test_functions_alberta_3d_r1_rc3 test_functions_alu_3d_r1_rc1_0000 test_functions_alu_3d_r3_rc1_0002 test_functions_alu_3d_r3_rc3_0001 test_functions_yasp_1d_r1_rc3 test_functions_yasp_3d_r1_rc3 test_indicator_yasp_1d_r1_rc1 test_indicator_yasp_3d_r1_rc1 test_lambda_global_flux_function_alu_3d_r1_rc1_0002 test_lambda_global_flux_function_yasp_3d_r1_rc1 test_lambda_global_function_alberta_1d_r3_rc3 test_lambda_global_function_alberta_3d_r3_rc1 test_lambda_global_function_alu_3d_r1_rc1_0001 test_lambda_global_function_alu_3d_r3_rc1_0001 test_lambda_global_function_ug_3d_r3_rc3 test_lambda_global_function_yasp_1d_r1_rc1 test_lambda_global_function_yasp_3d_r1_rc3 test_lambda_global_function_yasp_3d_r3_rc3 test_lambda_local_flux_function_alberta_1d_r1_rc1 test_lambda_local_flux_function_ug_3d_r1_rc1 test_lambda_local_flux_function_yasp_3d_r1_rc1 test_lambda_local_function_alberta_1d_r1_rc1 test_lambda_local_function_alberta_1d_r3_rc1 test_lambda_local_function_alu_3d_r1_rc1_0001 test_lambda_local_function_alu_3d_r1_rc3_0000 test_lambda_local_function_alu_3d_r1_rc3_0001 test_lambda_local_function_alu_3d_r3_rc3_0002 test_lambda_local_function_yasp_1d_r3_rc1 test_lambda_local_function_yasp_1d_r3_rc3 test_lambda_local_function_yasp_3d_r3_rc3)
 set_tests_properties( PROPERTIES LABELS "builder_3")
 set_tests_properties( PROPERTIES LABELS "builder_3")
 set_tests_properties( PROPERTIES LABELS "builder_3")
diff --git a/dune/xt/functions/test/compiles_totals.pickle b/dune/xt/functions/test/compiles_totals.pickle
index d4baa4af45209c596374c6598991690aa8a7e6cd..9b6f0e363c853209017412cf48c4a07a21aba80e 100644
--- a/dune/xt/functions/test/compiles_totals.pickle
+++ b/dune/xt/functions/test/compiles_totals.pickle
@@ -1 +1 @@
-{"headercheck__dune_xt_functions.hh": 16.241724729537964, "headercheck__dune_xt_functions_ESV2007.hh": 16.0704026222229, "headercheck__dune_xt_functions_affine.hh": 15.883133172988892, "headercheck__dune_xt_functions_checkerboard.hh": 14.998265981674194, "headercheck__dune_xt_functions_checkerboard.lib.hh": 14.99802041053772, "headercheck__dune_xt_functions_combined.hh": 13.920309066772461, "headercheck__dune_xt_functions_composition.hh": 14.370139837265015, "headercheck__dune_xt_functions_constant.hh": 14.208020448684692, "headercheck__dune_xt_functions_constant.lib.hh": 14.554871797561646, "headercheck__dune_xt_functions_default.hh": 14.461893796920776, "headercheck__dune_xt_functions_derived.hh": 14.195849657058716, "headercheck__dune_xt_functions_expression.hh": 14.42836880683899, "headercheck__dune_xt_functions_expression.lib.hh": 14.266146898269653, "headercheck__dune_xt_functions_expression_base.hh": 12.358200788497925, "headercheck__dune_xt_functions_expression_default.hh": 14.135015726089478, "headercheck__dune_xt_functions_expression_mathexpr.hh": 0.20808911323547363, "headercheck__dune_xt_functions_expression_parametric.hh": 14.801995754241943, "headercheck__dune_xt_functions_expression_timedependent.hh": 14.998777151107788, "headercheck__dune_xt_functions_femadapter.hh": 14.247370481491089, "headercheck__dune_xt_functions_flattop.hh": 14.736860752105713, "headercheck__dune_xt_functions_global.hh": 14.58231258392334, "headercheck__dune_xt_functions_indicator.hh": 14.631361722946167, "headercheck__dune_xt_functions_interfaces.hh": 13.78875470161438, "headercheck__dune_xt_functions_interfaces.lib.hh": 14.769604206085205, "headercheck__dune_xt_functions_interfaces_global-flux-function.hh": 14.014091968536377, "headercheck__dune_xt_functions_interfaces_global-function.hh": 14.006222248077393, "headercheck__dune_xt_functions_interfaces_local-flux-function.hh": 0.8829734325408936, "headercheck__dune_xt_functions_interfaces_local-functions.hh": 0.8359079360961914, "headercheck__dune_xt_functions_interfaces_localizable-flux-function.hh": 4.973330497741699, "headercheck__dune_xt_functions_interfaces_localizable-function.hh": 14.767172574996948, "headercheck__dune_xt_functions_interfaces_timedependent-function.hh": 0.4081296920776367, "headercheck__dune_xt_functions_lambda_global-flux-function.hh": 14.02744746208191, "headercheck__dune_xt_functions_lambda_global-function.hh": 14.107506513595581, "headercheck__dune_xt_functions_lambda_local-flux-function.hh": 14.088654041290283, "headercheck__dune_xt_functions_lambda_local-function.hh": 14.35732388496399, "headercheck__dune_xt_functions_random_ellipsoids.hh": 14.424696207046509, "headercheck__dune_xt_functions_reinterpret.hh": 14.24850869178772, "headercheck__dune_xt_functions_sliced.hh": 14.415859460830688, "headercheck__dune_xt_functions_spe10_model1.hh": 15.163993120193481, "headercheck__dune_xt_functions_spe10_model1.lib.hh": 15.093560695648193, "headercheck__dune_xt_functions_spe10_model2.hh": 14.681490659713745, "headercheck__dune_xt_functions_spe10_model2.lib.hh": 14.527162313461304, "headercheck__dune_xt_functions_test_functions.hh": 15.057421684265137, "headercheck__dune_xt_functions_transformed.hh": 14.44952654838562, "headercheck__dune_xt_functions_type_traits.hh": 0.5667543411254883, "test_ESV2007_alberta_2d_r1_rc1_0000": 19.178597450256348, "test_ESV2007_alberta_2d_r1_rc1_0001": 18.71595287322998, "test_ESV2007_alberta_2d_r1_rc3_0000": 18.40274930000305, "test_ESV2007_alberta_2d_r1_rc3_0001": 18.195591688156128, "test_ESV2007_alberta_2d_r3_rc1_0000": 18.562506675720215, "test_ESV2007_alberta_2d_r3_rc1_0001": 18.775753498077393, "test_ESV2007_alberta_2d_r3_rc3_0000": 18.6678569316864, "test_ESV2007_alberta_2d_r3_rc3_0001": 19.453309297561646, "test_ESV2007_alu_2d_r1_rc1_0000": 19.06919836997986, "test_ESV2007_alu_2d_r1_rc1_0001": 18.6005961894989, "test_ESV2007_alu_2d_r1_rc1_0002": 18.740579843521118, "test_ESV2007_alu_2d_r1_rc1_0003": 18.3555965423584, "test_ESV2007_alu_2d_r1_rc1_0004": 18.958868265151978, "test_ESV2007_alu_2d_r1_rc1_0005": 18.632730960845947, "test_ESV2007_alu_2d_r1_rc3_0000": 18.838760375976562, "test_ESV2007_alu_2d_r1_rc3_0001": 18.561805963516235, "test_ESV2007_alu_2d_r1_rc3_0002": 19.197441577911377, "test_ESV2007_alu_2d_r1_rc3_0003": 19.0230073928833, "test_ESV2007_alu_2d_r1_rc3_0004": 20.366140604019165, "test_ESV2007_alu_2d_r1_rc3_0005": 18.402732133865356, "test_ESV2007_alu_2d_r3_rc1_0000": 18.473624229431152, "test_ESV2007_alu_2d_r3_rc1_0001": 18.45931339263916, "test_ESV2007_alu_2d_r3_rc1_0002": 21.4192054271698, "test_ESV2007_alu_2d_r3_rc1_0003": 18.319889783859253, "test_ESV2007_alu_2d_r3_rc1_0004": 18.483448028564453, "test_ESV2007_alu_2d_r3_rc1_0005": 18.4133517742157, "test_ESV2007_alu_2d_r3_rc3_0000": 18.34104895591736, "test_ESV2007_alu_2d_r3_rc3_0001": 18.98324680328369, "test_ESV2007_alu_2d_r3_rc3_0002": 18.694230794906616, "test_ESV2007_alu_2d_r3_rc3_0003": 18.486987352371216, "test_ESV2007_alu_2d_r3_rc3_0004": 18.51877522468567, "test_ESV2007_alu_2d_r3_rc3_0005": 20.000213384628296, "test_ESV2007_ug_2d_r1_rc1_0000": 20.08075737953186, "test_ESV2007_ug_2d_r1_rc1_0001": 18.70044207572937, "test_ESV2007_ug_2d_r1_rc3_0000": 18.38076639175415, "test_ESV2007_ug_2d_r1_rc3_0001": 20.85814142227173, "test_ESV2007_ug_2d_r3_rc1_0000": 19.069656372070312, "test_ESV2007_ug_2d_r3_rc1_0001": 18.4194495677948, "test_ESV2007_ug_2d_r3_rc3_0000": 18.56152868270874, "test_ESV2007_ug_2d_r3_rc3_0001": 19.014454126358032, "test_ESV2007_yasp_2d_r1_rc1_0000": 19.648821592330933, "test_ESV2007_yasp_2d_r1_rc1_0001": 18.27252459526062, "test_ESV2007_yasp_2d_r1_rc3_0000": 18.657320737838745, "test_ESV2007_yasp_2d_r1_rc3_0001": 20.905447959899902, "test_ESV2007_yasp_2d_r3_rc1_0000": 18.631490468978882, "test_ESV2007_yasp_2d_r3_rc1_0001": 18.558809757232666, "test_ESV2007_yasp_2d_r3_rc3_0000": 18.323267221450806, "test_ESV2007_yasp_2d_r3_rc3_0001": 18.382316827774048, "test_affine_alberta_1d_r1_rc1": 18.624942779541016, "test_affine_alberta_1d_r1_rc3": 18.53340768814087, "test_affine_alberta_1d_r3_rc1": 18.75702476501465, "test_affine_alberta_1d_r3_rc3": 20.021541595458984, "test_affine_alberta_3d_r1_rc1": 18.665305852890015, "test_affine_alberta_3d_r1_rc3": 18.513201475143433, "test_affine_alberta_3d_r3_rc1": 18.48502469062805, "test_affine_alberta_3d_r3_rc3": 18.399650812149048, "test_affine_alu_3d_r1_rc1_0000": 19.857494354248047, "test_affine_alu_3d_r1_rc1_0001": 20.60525369644165, "test_affine_alu_3d_r1_rc1_0002": 19.805213451385498, "test_affine_alu_3d_r1_rc3_0000": 20.369495391845703, "test_affine_alu_3d_r1_rc3_0001": 19.99630856513977, "test_affine_alu_3d_r1_rc3_0002": 20.56482768058777, "test_affine_alu_3d_r3_rc1_0000": 19.945916175842285, "test_affine_alu_3d_r3_rc1_0001": 20.535198211669922, "test_affine_alu_3d_r3_rc1_0002": 19.849605560302734, "test_affine_alu_3d_r3_rc3_0000": 22.137914657592773, "test_affine_alu_3d_r3_rc3_0001": 19.8328857421875, "test_affine_alu_3d_r3_rc3_0002": 20.061294317245483, "test_affine_flux_alberta_1d_r1_rc1": 20.328513383865356, "test_affine_flux_alberta_1d_r1_rc3": 18.483765125274658, "test_affine_flux_alberta_1d_r3_rc1": 18.4508376121521, "test_affine_flux_alberta_1d_r3_rc3": 18.563189029693604, "test_affine_flux_alberta_3d_r1_rc1": 19.937565088272095, "test_affine_flux_alberta_3d_r1_rc3": 18.458643436431885, "test_affine_flux_alberta_3d_r3_rc1": 18.730786561965942, "test_affine_flux_alberta_3d_r3_rc3": 18.565754413604736, "test_affine_flux_alu_3d_r1_rc1_0000": 20.139604091644287, "test_affine_flux_alu_3d_r1_rc1_0001": 20.543426752090454, "test_affine_flux_alu_3d_r1_rc1_0002": 19.873218297958374, "test_affine_flux_alu_3d_r1_rc3_0000": 20.051109552383423, "test_affine_flux_alu_3d_r1_rc3_0001": 24.395267248153687, "test_affine_flux_alu_3d_r1_rc3_0002": 20.22020435333252, "test_affine_flux_alu_3d_r3_rc1_0000": 20.15493655204773, "test_affine_flux_alu_3d_r3_rc1_0001": 19.84022808074951, "test_affine_flux_alu_3d_r3_rc1_0002": 20.76576256752014, "test_affine_flux_alu_3d_r3_rc3_0000": 20.382133722305298, "test_affine_flux_alu_3d_r3_rc3_0001": 21.151514768600464, "test_affine_flux_alu_3d_r3_rc3_0002": 20.925946712493896, "test_affine_flux_ug_3d_r1_rc1": 18.220412492752075, "test_affine_flux_ug_3d_r1_rc3": 18.84640073776245, "test_affine_flux_ug_3d_r3_rc1": 18.471907138824463, "test_affine_flux_ug_3d_r3_rc3": 18.567293405532837, "test_affine_flux_yasp_1d_r1_rc1": 18.435280084609985, "test_affine_flux_yasp_1d_r1_rc3": 18.778965950012207, "test_affine_flux_yasp_1d_r3_rc1": 18.625422954559326, "test_affine_flux_yasp_1d_r3_rc3": 18.477375268936157, "test_affine_flux_yasp_3d_r1_rc1": 18.504106044769287, "test_affine_flux_yasp_3d_r1_rc3": 19.454813718795776, "test_affine_flux_yasp_3d_r3_rc1": 18.686487197875977, "test_affine_flux_yasp_3d_r3_rc3": 18.450435876846313, "test_affine_ug_3d_r1_rc1": 21.27034878730774, "test_affine_ug_3d_r1_rc3": 18.244067192077637, "test_affine_ug_3d_r3_rc1": 18.31607413291931, "test_affine_ug_3d_r3_rc3": 19.147991180419922, "test_affine_yasp_1d_r1_rc1": 18.412199020385742, "test_affine_yasp_1d_r1_rc3": 18.816879987716675, "test_affine_yasp_1d_r3_rc1": 18.995217084884644, "test_affine_yasp_1d_r3_rc3": 19.136648893356323, "test_affine_yasp_3d_r1_rc1": 18.296331644058228, "test_affine_yasp_3d_r1_rc3": 18.27570390701294, "test_affine_yasp_3d_r3_rc1": 18.585538148880005, "test_affine_yasp_3d_r3_rc3": 18.40417194366455, "test_checkerboard_alberta_1d_r1_rc1": 18.753613471984863, "test_checkerboard_alberta_1d_r1_rc3": 19.718555688858032, "test_checkerboard_alberta_1d_r3_rc1": 18.722749948501587, "test_checkerboard_alberta_1d_r3_rc3": 18.808003664016724, "test_checkerboard_alberta_3d_r1_rc1": 18.735315561294556, "test_checkerboard_alberta_3d_r1_rc3": 18.812005758285522, "test_checkerboard_alberta_3d_r3_rc1": 19.376331090927124, "test_checkerboard_alberta_3d_r3_rc3": 20.3900203704834, "test_checkerboard_alu_3d_r1_rc1_0000": 20.005327224731445, "test_checkerboard_alu_3d_r1_rc1_0001": 20.01672101020813, "test_checkerboard_alu_3d_r1_rc1_0002": 21.274577379226685, "test_checkerboard_alu_3d_r1_rc3_0000": 20.51077628135681, "test_checkerboard_alu_3d_r1_rc3_0001": 20.058132886886597, "test_checkerboard_alu_3d_r1_rc3_0002": 20.57078981399536, "test_checkerboard_alu_3d_r3_rc1_0000": 20.466120958328247, "test_checkerboard_alu_3d_r3_rc1_0001": 20.805516481399536, "test_checkerboard_alu_3d_r3_rc1_0002": 20.485238552093506, "test_checkerboard_alu_3d_r3_rc3_0000": 20.569202184677124, "test_checkerboard_alu_3d_r3_rc3_0001": 20.56943655014038, "test_checkerboard_alu_3d_r3_rc3_0002": 20.103439807891846, "test_checkerboard_ug_3d_r1_rc1": 20.468873500823975, "test_checkerboard_ug_3d_r1_rc3": 20.596320390701294, "test_checkerboard_ug_3d_r3_rc1": 19.993597745895386, "test_checkerboard_ug_3d_r3_rc3": 20.49160671234131, "test_checkerboard_yasp_1d_r1_rc1": 21.768465757369995, "test_checkerboard_yasp_1d_r1_rc3": 21.878625631332397, "test_checkerboard_yasp_1d_r3_rc1": 19.03018355369568, "test_checkerboard_yasp_1d_r3_rc3": 18.766409635543823, "test_checkerboard_yasp_3d_r1_rc1": 18.813339948654175, "test_checkerboard_yasp_3d_r1_rc3": 19.899660110473633, "test_checkerboard_yasp_3d_r3_rc1": 19.691938161849976, "test_checkerboard_yasp_3d_r3_rc3": 19.297251224517822, "test_combined": 26.02592945098877, "test_constant_alberta_1d_r1_rc1": 17.094038009643555, "test_constant_alberta_1d_r1_rc3": 17.576340436935425, "test_constant_alberta_1d_r3_rc1": 17.04628276824951, "test_constant_alberta_1d_r3_rc3": 17.134525299072266, "test_constant_alberta_3d_r1_rc1": 18.05313539505005, "test_constant_alberta_3d_r1_rc3": 17.14574933052063, "test_constant_alberta_3d_r3_rc1": 16.918819665908813, "test_constant_alberta_3d_r3_rc3": 17.119665145874023, "test_constant_alu_3d_r1_rc1_0000": 20.08522319793701, "test_constant_alu_3d_r1_rc1_0001": 17.27144956588745, "test_constant_alu_3d_r1_rc1_0002": 17.23574686050415, "test_constant_alu_3d_r1_rc3_0000": 17.482845067977905, "test_constant_alu_3d_r1_rc3_0001": 17.1039035320282, "test_constant_alu_3d_r1_rc3_0002": 17.37702703475952, "test_constant_alu_3d_r3_rc1_0000": 17.954166650772095, "test_constant_alu_3d_r3_rc1_0001": 18.473609447479248, "test_constant_alu_3d_r3_rc1_0002": 17.0549955368042, "test_constant_alu_3d_r3_rc3_0000": 17.480862140655518, "test_constant_alu_3d_r3_rc3_0001": 18.798429012298584, "test_constant_alu_3d_r3_rc3_0002": 17.120957612991333, "test_constant_ug_3d_r1_rc1": 17.064798831939697, "test_constant_ug_3d_r1_rc3": 17.269043445587158, "test_constant_ug_3d_r3_rc1": 17.420432090759277, "test_constant_ug_3d_r3_rc3": 17.561042547225952, "test_constant_yasp_1d_r1_rc1": 18.014742136001587, "test_constant_yasp_1d_r1_rc3": 18.12042474746704, "test_constant_yasp_1d_r3_rc1": 20.266605377197266, "test_constant_yasp_1d_r3_rc3": 18.232828378677368, "test_constant_yasp_3d_r1_rc1": 17.235671758651733, "test_constant_yasp_3d_r1_rc3": 17.19625449180603, "test_constant_yasp_3d_r3_rc1": 17.451977729797363, "test_constant_yasp_3d_r3_rc3": 17.32913088798523, "test_empty": 16.079071760177612, "test_expression_default_alberta_1d_r1_rc1": 18.263118505477905, "test_expression_default_alberta_1d_r1_rc3": 18.549551248550415, "test_expression_default_alberta_1d_r3_rc1": 21.41700530052185, "test_expression_default_alberta_1d_r3_rc3": 18.276604413986206, "test_expression_default_alberta_3d_r1_rc1": 19.254730701446533, "test_expression_default_alberta_3d_r1_rc3": 18.690196752548218, "test_expression_default_alberta_3d_r3_rc1": 18.360896348953247, "test_expression_default_alberta_3d_r3_rc3": 21.001927137374878, "test_expression_default_alu_3d_r1_rc1_0000": 18.83172917366028, "test_expression_default_alu_3d_r1_rc1_0001": 19.632460594177246, "test_expression_default_alu_3d_r1_rc1_0002": 21.064167022705078, "test_expression_default_alu_3d_r1_rc3_0000": 18.806495189666748, "test_expression_default_alu_3d_r1_rc3_0001": 18.406678199768066, "test_expression_default_alu_3d_r1_rc3_0002": 18.072860956192017, "test_expression_default_alu_3d_r3_rc1_0000": 19.45250391960144, "test_expression_default_alu_3d_r3_rc1_0001": 19.036407709121704, "test_expression_default_alu_3d_r3_rc1_0002": 18.356473445892334, "test_expression_default_alu_3d_r3_rc3_0000": 18.681460857391357, "test_expression_default_alu_3d_r3_rc3_0001": 18.07203221321106, "test_expression_default_alu_3d_r3_rc3_0002": 18.423197746276855, "test_expression_default_ug_3d_r1_rc1": 18.34494376182556, "test_expression_default_ug_3d_r1_rc3": 18.013826847076416, "test_expression_default_ug_3d_r3_rc1": 18.35629177093506, "test_expression_default_ug_3d_r3_rc3": 18.989110231399536, "test_expression_default_yasp_1d_r1_rc1": 18.073102712631226, "test_expression_default_yasp_1d_r1_rc3": 17.989795207977295, "test_expression_default_yasp_1d_r3_rc1": 18.060887575149536, "test_expression_default_yasp_1d_r3_rc3": 18.273865461349487, "test_expression_default_yasp_3d_r1_rc1": 18.248963594436646, "test_expression_default_yasp_3d_r1_rc3": 17.94398021697998, "test_expression_default_yasp_3d_r3_rc1": 18.452487468719482, "test_expression_default_yasp_3d_r3_rc3": 19.061495780944824, "test_expression_parametric_alberta_1d_r1_rc1": 19.204541444778442, "test_expression_parametric_alberta_3d_r1_rc1": 20.90292763710022, "test_expression_parametric_alu_3d_r1_rc1_0000": 29.00003981590271, "test_expression_parametric_alu_3d_r1_rc1_0001": 26.96547508239746, "test_expression_parametric_alu_3d_r1_rc1_0002": 27.066059589385986, "test_expression_parametric_ug_3d_r1_rc1": 20.669278383255005, "test_expression_parametric_yasp_1d_r1_rc1": 18.997971773147583, "test_expression_parametric_yasp_3d_r1_rc1": 22.30035090446472, "test_flattop": 27.608917951583862, "test_functions_alberta_1d_r1_rc1": 21.114784717559814, "test_functions_alberta_1d_r1_rc3": 21.01030206680298, "test_functions_alberta_1d_r3_rc1": 21.09175705909729, "test_functions_alberta_1d_r3_rc3": 21.40331196784973, "test_functions_alberta_3d_r1_rc1": 22.426992893218994, "test_functions_alberta_3d_r1_rc3": 22.738091945648193, "test_functions_alberta_3d_r3_rc1": 20.785479307174683, "test_functions_alberta_3d_r3_rc3": 20.455530405044556, "test_functions_alu_3d_r1_rc1_0000": 22.282484531402588, "test_functions_alu_3d_r1_rc1_0001": 22.167702674865723, "test_functions_alu_3d_r1_rc1_0002": 26.093852996826172, "test_functions_alu_3d_r1_rc3_0000": 21.770424842834473, "test_functions_alu_3d_r1_rc3_0001": 21.7331280708313, "test_functions_alu_3d_r1_rc3_0002": 21.971495628356934, "test_functions_alu_3d_r3_rc1_0000": 21.974807024002075, "test_functions_alu_3d_r3_rc1_0001": 22.035661935806274, "test_functions_alu_3d_r3_rc1_0002": 21.53220510482788, "test_functions_alu_3d_r3_rc3_0000": 25.14601230621338, "test_functions_alu_3d_r3_rc3_0001": 21.778015851974487, "test_functions_alu_3d_r3_rc3_0002": 22.42915964126587, "test_functions_ug_3d_r1_rc1": 22.296344995498657, "test_functions_ug_3d_r1_rc3": 22.672362804412842, "test_functions_ug_3d_r3_rc1": 21.51437544822693, "test_functions_ug_3d_r3_rc3": 22.598135471343994, "test_functions_yasp_1d_r1_rc1": 21.263728380203247, "test_functions_yasp_1d_r1_rc3": 20.660491466522217, "test_functions_yasp_1d_r3_rc1": 20.985987424850464, "test_functions_yasp_1d_r3_rc3": 21.50996232032776, "test_functions_yasp_3d_r1_rc1": 23.251285314559937, "test_functions_yasp_3d_r1_rc3": 21.019334077835083, "test_functions_yasp_3d_r3_rc1": 21.019885778427124, "test_functions_yasp_3d_r3_rc3": 20.999614238739014, "test_indicator_alberta_1d_r1_rc1": 18.19898557662964, "test_indicator_alberta_3d_r1_rc1": 18.526633501052856, "test_indicator_alu_3d_r1_rc1_0000": 19.190847635269165, "test_indicator_alu_3d_r1_rc1_0001": 18.65059185028076, "test_indicator_alu_3d_r1_rc1_0002": 18.935564517974854, "test_indicator_ug_3d_r1_rc1": 19.303451776504517, "test_indicator_yasp_1d_r1_rc1": 17.91905641555786, "test_indicator_yasp_3d_r1_rc1": 18.47655963897705, "test_lambda_global_flux_function_alberta_1d_r1_rc1": 19.71386218070984, "test_lambda_global_flux_function_alberta_3d_r1_rc1": 23.845843076705933, "test_lambda_global_flux_function_alu_3d_r1_rc1_0000": 27.12923812866211, "test_lambda_global_flux_function_alu_3d_r1_rc1_0001": 26.899558782577515, "test_lambda_global_flux_function_alu_3d_r1_rc1_0002": 26.767258644104004, "test_lambda_global_flux_function_ug_3d_r1_rc1": 20.34222984313965, "test_lambda_global_flux_function_yasp_1d_r1_rc1": 21.17764186859131, "test_lambda_global_flux_function_yasp_3d_r1_rc1": 20.21225929260254, "test_lambda_global_function_alberta_1d_r1_rc1": 16.554109573364258, "test_lambda_global_function_alberta_1d_r1_rc3": 16.527742624282837, "test_lambda_global_function_alberta_1d_r3_rc1": 16.572184085845947, "test_lambda_global_function_alberta_1d_r3_rc3": 17.08496642112732, "test_lambda_global_function_alberta_3d_r1_rc1": 16.506139039993286, "test_lambda_global_function_alberta_3d_r1_rc3": 16.469588041305542, "test_lambda_global_function_alberta_3d_r3_rc1": 16.4826397895813, "test_lambda_global_function_alberta_3d_r3_rc3": 16.922993659973145, "test_lambda_global_function_alu_3d_r1_rc1_0000": 16.861034631729126, "test_lambda_global_function_alu_3d_r1_rc1_0001": 16.59978461265564, "test_lambda_global_function_alu_3d_r1_rc1_0002": 16.61959719657898, "test_lambda_global_function_alu_3d_r1_rc3_0000": 16.651610374450684, "test_lambda_global_function_alu_3d_r1_rc3_0001": 19.021191835403442, "test_lambda_global_function_alu_3d_r1_rc3_0002": 17.187358617782593, "test_lambda_global_function_alu_3d_r3_rc1_0000": 16.589468240737915, "test_lambda_global_function_alu_3d_r3_rc1_0001": 16.511296033859253, "test_lambda_global_function_alu_3d_r3_rc1_0002": 16.674526929855347, "test_lambda_global_function_alu_3d_r3_rc3_0000": 16.505088329315186, "test_lambda_global_function_alu_3d_r3_rc3_0001": 17.871268272399902, "test_lambda_global_function_alu_3d_r3_rc3_0002": 16.87092351913452, "test_lambda_global_function_ug_3d_r1_rc1": 16.49480152130127, "test_lambda_global_function_ug_3d_r1_rc3": 16.624858856201172, "test_lambda_global_function_ug_3d_r3_rc1": 16.86823010444641, "test_lambda_global_function_ug_3d_r3_rc3": 16.998570203781128, "test_lambda_global_function_yasp_1d_r1_rc1": 16.72396492958069, "test_lambda_global_function_yasp_1d_r1_rc3": 17.45966076850891, "test_lambda_global_function_yasp_1d_r3_rc1": 16.769001483917236, "test_lambda_global_function_yasp_1d_r3_rc3": 16.534157752990723, "test_lambda_global_function_yasp_3d_r1_rc1": 17.370596170425415, "test_lambda_global_function_yasp_3d_r1_rc3": 16.561802625656128, "test_lambda_global_function_yasp_3d_r3_rc1": 16.574744939804077, "test_lambda_global_function_yasp_3d_r3_rc3": 16.708879709243774, "test_lambda_local_flux_function_alberta_1d_r1_rc1": 19.70447087287903, "test_lambda_local_flux_function_alberta_3d_r1_rc1": 20.288437843322754, "test_lambda_local_flux_function_alu_3d_r1_rc1_0000": 27.22477412223816, "test_lambda_local_flux_function_alu_3d_r1_rc1_0001": 26.77414035797119, "test_lambda_local_flux_function_alu_3d_r1_rc1_0002": 26.88183283805847, "test_lambda_local_flux_function_ug_3d_r1_rc1": 20.215343236923218, "test_lambda_local_flux_function_yasp_1d_r1_rc1": 19.326310396194458, "test_lambda_local_flux_function_yasp_3d_r1_rc1": 19.309234142303467, "test_lambda_local_function_alberta_1d_r1_rc1": 19.482234001159668, "test_lambda_local_function_alberta_1d_r1_rc3": 19.491390466690063, "test_lambda_local_function_alberta_1d_r3_rc1": 19.737709760665894, "test_lambda_local_function_alberta_1d_r3_rc3": 19.049132585525513, "test_lambda_local_function_alberta_3d_r1_rc1": 20.29612970352173, "test_lambda_local_function_alberta_3d_r1_rc3": 22.54290270805359, "test_lambda_local_function_alberta_3d_r3_rc1": 19.807548999786377, "test_lambda_local_function_alberta_3d_r3_rc3": 20.5995774269104, "test_lambda_local_function_alu_3d_r1_rc1_0000": 26.285258769989014, "test_lambda_local_function_alu_3d_r1_rc1_0001": 27.248192310333252, "test_lambda_local_function_alu_3d_r1_rc1_0002": 27.70791506767273, "test_lambda_local_function_alu_3d_r1_rc3_0000": 26.31389856338501, "test_lambda_local_function_alu_3d_r1_rc3_0001": 27.047832250595093, "test_lambda_local_function_alu_3d_r1_rc3_0002": 26.248119354248047, "test_lambda_local_function_alu_3d_r3_rc1_0000": 26.332953691482544, "test_lambda_local_function_alu_3d_r3_rc1_0001": 26.2433123588562, "test_lambda_local_function_alu_3d_r3_rc1_0002": 26.683884143829346, "test_lambda_local_function_alu_3d_r3_rc3_0000": 30.253638982772827, "test_lambda_local_function_alu_3d_r3_rc3_0001": 26.242444038391113, "test_lambda_local_function_alu_3d_r3_rc3_0002": 26.225865364074707, "test_lambda_local_function_ug_3d_r1_rc1": 19.75720238685608, "test_lambda_local_function_ug_3d_r1_rc3": 20.51409649848938, "test_lambda_local_function_ug_3d_r3_rc1": 20.04006028175354, "test_lambda_local_function_ug_3d_r3_rc3": 19.906145811080933, "test_lambda_local_function_yasp_1d_r1_rc1": 19.931835889816284, "test_lambda_local_function_yasp_1d_r1_rc3": 19.267087697982788, "test_lambda_local_function_yasp_1d_r3_rc1": 19.485828161239624, "test_lambda_local_function_yasp_1d_r3_rc3": 19.157115936279297, "test_lambda_local_function_yasp_3d_r1_rc1": 19.787895679473877, "test_lambda_local_function_yasp_3d_r1_rc3": 19.33585786819458, "test_lambda_local_function_yasp_3d_r3_rc1": 18.777853965759277, "test_lambda_local_function_yasp_3d_r3_rc3": 21.99708318710327, "test_spe10_alberta_3d_r3_rc3": 17.835134983062744, "test_spe10_alu_3d_r3_rc3_0000": 18.447022438049316, "test_spe10_alu_3d_r3_rc3_0001": 17.8853919506073, "test_spe10_alu_3d_r3_rc3_0002": 18.336849689483643, "test_spe10_yasp_3d_r3_rc3": 18.08585214614868}
\ No newline at end of file
+{"headercheck__dune_xt_functions.hh": 16.241724729537964, "headercheck__dune_xt_functions_ESV2007.hh": 16.0704026222229, "headercheck__dune_xt_functions_affine.hh": 15.883133172988892, "headercheck__dune_xt_functions_checkerboard.hh": 14.998265981674194, "headercheck__dune_xt_functions_checkerboard.lib.hh": 14.99802041053772, "headercheck__dune_xt_functions_combined.hh": 13.920309066772461, "headercheck__dune_xt_functions_composition.hh": 14.370139837265015, "headercheck__dune_xt_functions_constant.hh": 14.208020448684692, "headercheck__dune_xt_functions_constant.lib.hh": 14.554871797561646, "headercheck__dune_xt_functions_default.hh": 14.461893796920776, "headercheck__dune_xt_functions_derived.hh": 14.195849657058716, "headercheck__dune_xt_functions_expression.hh": 14.42836880683899, "headercheck__dune_xt_functions_expression.lib.hh": 14.266146898269653, "headercheck__dune_xt_functions_expression_base.hh": 12.358200788497925, "headercheck__dune_xt_functions_expression_default.hh": 14.135015726089478, "headercheck__dune_xt_functions_expression_mathexpr.hh": 0.20808911323547363, "headercheck__dune_xt_functions_expression_parametric.hh": 14.801995754241943, "headercheck__dune_xt_functions_expression_timedependent.hh": 14.998777151107788, "headercheck__dune_xt_functions_flattop.hh": 14.736860752105713, "headercheck__dune_xt_functions_global.hh": 14.58231258392334, "headercheck__dune_xt_functions_indicator.hh": 14.631361722946167, "headercheck__dune_xt_functions_interfaces.hh": 13.78875470161438, "headercheck__dune_xt_functions_interfaces.lib.hh": 14.769604206085205, "headercheck__dune_xt_functions_interfaces_global-flux-function.hh": 14.014091968536377, "headercheck__dune_xt_functions_interfaces_global-function.hh": 14.006222248077393, "headercheck__dune_xt_functions_interfaces_local-flux-function.hh": 0.8829734325408936, "headercheck__dune_xt_functions_interfaces_local-functions.hh": 0.8359079360961914, "headercheck__dune_xt_functions_interfaces_localizable-flux-function.hh": 4.973330497741699, "headercheck__dune_xt_functions_interfaces_localizable-function.hh": 14.767172574996948, "headercheck__dune_xt_functions_interfaces_timedependent-function.hh": 0.4081296920776367, "headercheck__dune_xt_functions_lambda_global-flux-function.hh": 14.02744746208191, "headercheck__dune_xt_functions_lambda_global-function.hh": 14.107506513595581, "headercheck__dune_xt_functions_lambda_local-flux-function.hh": 14.088654041290283, "headercheck__dune_xt_functions_lambda_local-function.hh": 14.35732388496399, "headercheck__dune_xt_functions_random_ellipsoids.hh": 14.424696207046509, "headercheck__dune_xt_functions_reinterpret.hh": 14.24850869178772, "headercheck__dune_xt_functions_sliced.hh": 14.415859460830688, "headercheck__dune_xt_functions_spe10_model1.hh": 15.163993120193481, "headercheck__dune_xt_functions_spe10_model1.lib.hh": 15.093560695648193, "headercheck__dune_xt_functions_spe10_model2.hh": 14.681490659713745, "headercheck__dune_xt_functions_spe10_model2.lib.hh": 14.527162313461304, "headercheck__dune_xt_functions_test_functions.hh": 15.057421684265137, "headercheck__dune_xt_functions_transformed.hh": 14.44952654838562, "headercheck__dune_xt_functions_type_traits.hh": 0.5667543411254883, "test_ESV2007_alberta_2d_r1_rc1_0000": 19.178597450256348, "test_ESV2007_alberta_2d_r1_rc1_0001": 18.71595287322998, "test_ESV2007_alberta_2d_r1_rc3_0000": 18.40274930000305, "test_ESV2007_alberta_2d_r1_rc3_0001": 18.195591688156128, "test_ESV2007_alberta_2d_r3_rc1_0000": 18.562506675720215, "test_ESV2007_alberta_2d_r3_rc1_0001": 18.775753498077393, "test_ESV2007_alberta_2d_r3_rc3_0000": 18.6678569316864, "test_ESV2007_alberta_2d_r3_rc3_0001": 19.453309297561646, "test_ESV2007_alu_2d_r1_rc1_0000": 19.06919836997986, "test_ESV2007_alu_2d_r1_rc1_0001": 18.6005961894989, "test_ESV2007_alu_2d_r1_rc1_0002": 18.740579843521118, "test_ESV2007_alu_2d_r1_rc1_0003": 18.3555965423584, "test_ESV2007_alu_2d_r1_rc1_0004": 18.958868265151978, "test_ESV2007_alu_2d_r1_rc1_0005": 18.632730960845947, "test_ESV2007_alu_2d_r1_rc3_0000": 18.838760375976562, "test_ESV2007_alu_2d_r1_rc3_0001": 18.561805963516235, "test_ESV2007_alu_2d_r1_rc3_0002": 19.197441577911377, "test_ESV2007_alu_2d_r1_rc3_0003": 19.0230073928833, "test_ESV2007_alu_2d_r1_rc3_0004": 20.366140604019165, "test_ESV2007_alu_2d_r1_rc3_0005": 18.402732133865356, "test_ESV2007_alu_2d_r3_rc1_0000": 18.473624229431152, "test_ESV2007_alu_2d_r3_rc1_0001": 18.45931339263916, "test_ESV2007_alu_2d_r3_rc1_0002": 21.4192054271698, "test_ESV2007_alu_2d_r3_rc1_0003": 18.319889783859253, "test_ESV2007_alu_2d_r3_rc1_0004": 18.483448028564453, "test_ESV2007_alu_2d_r3_rc1_0005": 18.4133517742157, "test_ESV2007_alu_2d_r3_rc3_0000": 18.34104895591736, "test_ESV2007_alu_2d_r3_rc3_0001": 18.98324680328369, "test_ESV2007_alu_2d_r3_rc3_0002": 18.694230794906616, "test_ESV2007_alu_2d_r3_rc3_0003": 18.486987352371216, "test_ESV2007_alu_2d_r3_rc3_0004": 18.51877522468567, "test_ESV2007_alu_2d_r3_rc3_0005": 20.000213384628296, "test_ESV2007_ug_2d_r1_rc1_0000": 20.08075737953186, "test_ESV2007_ug_2d_r1_rc1_0001": 18.70044207572937, "test_ESV2007_ug_2d_r1_rc3_0000": 18.38076639175415, "test_ESV2007_ug_2d_r1_rc3_0001": 20.85814142227173, "test_ESV2007_ug_2d_r3_rc1_0000": 19.069656372070312, "test_ESV2007_ug_2d_r3_rc1_0001": 18.4194495677948, "test_ESV2007_ug_2d_r3_rc3_0000": 18.56152868270874, "test_ESV2007_ug_2d_r3_rc3_0001": 19.014454126358032, "test_ESV2007_yasp_2d_r1_rc1_0000": 19.648821592330933, "test_ESV2007_yasp_2d_r1_rc1_0001": 18.27252459526062, "test_ESV2007_yasp_2d_r1_rc3_0000": 18.657320737838745, "test_ESV2007_yasp_2d_r1_rc3_0001": 20.905447959899902, "test_ESV2007_yasp_2d_r3_rc1_0000": 18.631490468978882, "test_ESV2007_yasp_2d_r3_rc1_0001": 18.558809757232666, "test_ESV2007_yasp_2d_r3_rc3_0000": 18.323267221450806, "test_ESV2007_yasp_2d_r3_rc3_0001": 18.382316827774048, "test_affine_alberta_1d_r1_rc1": 18.624942779541016, "test_affine_alberta_1d_r1_rc3": 18.53340768814087, "test_affine_alberta_1d_r3_rc1": 18.75702476501465, "test_affine_alberta_1d_r3_rc3": 20.021541595458984, "test_affine_alberta_3d_r1_rc1": 18.665305852890015, "test_affine_alberta_3d_r1_rc3": 18.513201475143433, "test_affine_alberta_3d_r3_rc1": 18.48502469062805, "test_affine_alberta_3d_r3_rc3": 18.399650812149048, "test_affine_alu_3d_r1_rc1_0000": 19.857494354248047, "test_affine_alu_3d_r1_rc1_0001": 20.60525369644165, "test_affine_alu_3d_r1_rc1_0002": 19.805213451385498, "test_affine_alu_3d_r1_rc3_0000": 20.369495391845703, "test_affine_alu_3d_r1_rc3_0001": 19.99630856513977, "test_affine_alu_3d_r1_rc3_0002": 20.56482768058777, "test_affine_alu_3d_r3_rc1_0000": 19.945916175842285, "test_affine_alu_3d_r3_rc1_0001": 20.535198211669922, "test_affine_alu_3d_r3_rc1_0002": 19.849605560302734, "test_affine_alu_3d_r3_rc3_0000": 22.137914657592773, "test_affine_alu_3d_r3_rc3_0001": 19.8328857421875, "test_affine_alu_3d_r3_rc3_0002": 20.061294317245483, "test_affine_flux_alberta_1d_r1_rc1": 20.328513383865356, "test_affine_flux_alberta_1d_r1_rc3": 18.483765125274658, "test_affine_flux_alberta_1d_r3_rc1": 18.4508376121521, "test_affine_flux_alberta_1d_r3_rc3": 18.563189029693604, "test_affine_flux_alberta_3d_r1_rc1": 19.937565088272095, "test_affine_flux_alberta_3d_r1_rc3": 18.458643436431885, "test_affine_flux_alberta_3d_r3_rc1": 18.730786561965942, "test_affine_flux_alberta_3d_r3_rc3": 18.565754413604736, "test_affine_flux_alu_3d_r1_rc1_0000": 20.139604091644287, "test_affine_flux_alu_3d_r1_rc1_0001": 20.543426752090454, "test_affine_flux_alu_3d_r1_rc1_0002": 19.873218297958374, "test_affine_flux_alu_3d_r1_rc3_0000": 20.051109552383423, "test_affine_flux_alu_3d_r1_rc3_0001": 24.395267248153687, "test_affine_flux_alu_3d_r1_rc3_0002": 20.22020435333252, "test_affine_flux_alu_3d_r3_rc1_0000": 20.15493655204773, "test_affine_flux_alu_3d_r3_rc1_0001": 19.84022808074951, "test_affine_flux_alu_3d_r3_rc1_0002": 20.76576256752014, "test_affine_flux_alu_3d_r3_rc3_0000": 20.382133722305298, "test_affine_flux_alu_3d_r3_rc3_0001": 21.151514768600464, "test_affine_flux_alu_3d_r3_rc3_0002": 20.925946712493896, "test_affine_flux_ug_3d_r1_rc1": 18.220412492752075, "test_affine_flux_ug_3d_r1_rc3": 18.84640073776245, "test_affine_flux_ug_3d_r3_rc1": 18.471907138824463, "test_affine_flux_ug_3d_r3_rc3": 18.567293405532837, "test_affine_flux_yasp_1d_r1_rc1": 18.435280084609985, "test_affine_flux_yasp_1d_r1_rc3": 18.778965950012207, "test_affine_flux_yasp_1d_r3_rc1": 18.625422954559326, "test_affine_flux_yasp_1d_r3_rc3": 18.477375268936157, "test_affine_flux_yasp_3d_r1_rc1": 18.504106044769287, "test_affine_flux_yasp_3d_r1_rc3": 19.454813718795776, "test_affine_flux_yasp_3d_r3_rc1": 18.686487197875977, "test_affine_flux_yasp_3d_r3_rc3": 18.450435876846313, "test_affine_ug_3d_r1_rc1": 21.27034878730774, "test_affine_ug_3d_r1_rc3": 18.244067192077637, "test_affine_ug_3d_r3_rc1": 18.31607413291931, "test_affine_ug_3d_r3_rc3": 19.147991180419922, "test_affine_yasp_1d_r1_rc1": 18.412199020385742, "test_affine_yasp_1d_r1_rc3": 18.816879987716675, "test_affine_yasp_1d_r3_rc1": 18.995217084884644, "test_affine_yasp_1d_r3_rc3": 19.136648893356323, "test_affine_yasp_3d_r1_rc1": 18.296331644058228, "test_affine_yasp_3d_r1_rc3": 18.27570390701294, "test_affine_yasp_3d_r3_rc1": 18.585538148880005, "test_affine_yasp_3d_r3_rc3": 18.40417194366455, "test_checkerboard_alberta_1d_r1_rc1": 18.753613471984863, "test_checkerboard_alberta_1d_r1_rc3": 19.718555688858032, "test_checkerboard_alberta_1d_r3_rc1": 18.722749948501587, "test_checkerboard_alberta_1d_r3_rc3": 18.808003664016724, "test_checkerboard_alberta_3d_r1_rc1": 18.735315561294556, "test_checkerboard_alberta_3d_r1_rc3": 18.812005758285522, "test_checkerboard_alberta_3d_r3_rc1": 19.376331090927124, "test_checkerboard_alberta_3d_r3_rc3": 20.3900203704834, "test_checkerboard_alu_3d_r1_rc1_0000": 20.005327224731445, "test_checkerboard_alu_3d_r1_rc1_0001": 20.01672101020813, "test_checkerboard_alu_3d_r1_rc1_0002": 21.274577379226685, "test_checkerboard_alu_3d_r1_rc3_0000": 20.51077628135681, "test_checkerboard_alu_3d_r1_rc3_0001": 20.058132886886597, "test_checkerboard_alu_3d_r1_rc3_0002": 20.57078981399536, "test_checkerboard_alu_3d_r3_rc1_0000": 20.466120958328247, "test_checkerboard_alu_3d_r3_rc1_0001": 20.805516481399536, "test_checkerboard_alu_3d_r3_rc1_0002": 20.485238552093506, "test_checkerboard_alu_3d_r3_rc3_0000": 20.569202184677124, "test_checkerboard_alu_3d_r3_rc3_0001": 20.56943655014038, "test_checkerboard_alu_3d_r3_rc3_0002": 20.103439807891846, "test_checkerboard_ug_3d_r1_rc1": 20.468873500823975, "test_checkerboard_ug_3d_r1_rc3": 20.596320390701294, "test_checkerboard_ug_3d_r3_rc1": 19.993597745895386, "test_checkerboard_ug_3d_r3_rc3": 20.49160671234131, "test_checkerboard_yasp_1d_r1_rc1": 21.768465757369995, "test_checkerboard_yasp_1d_r1_rc3": 21.878625631332397, "test_checkerboard_yasp_1d_r3_rc1": 19.03018355369568, "test_checkerboard_yasp_1d_r3_rc3": 18.766409635543823, "test_checkerboard_yasp_3d_r1_rc1": 18.813339948654175, "test_checkerboard_yasp_3d_r1_rc3": 19.899660110473633, "test_checkerboard_yasp_3d_r3_rc1": 19.691938161849976, "test_checkerboard_yasp_3d_r3_rc3": 19.297251224517822, "test_combined": 26.02592945098877, "test_constant_alberta_1d_r1_rc1": 17.094038009643555, "test_constant_alberta_1d_r1_rc3": 17.576340436935425, "test_constant_alberta_1d_r3_rc1": 17.04628276824951, "test_constant_alberta_1d_r3_rc3": 17.134525299072266, "test_constant_alberta_3d_r1_rc1": 18.05313539505005, "test_constant_alberta_3d_r1_rc3": 17.14574933052063, "test_constant_alberta_3d_r3_rc1": 16.918819665908813, "test_constant_alberta_3d_r3_rc3": 17.119665145874023, "test_constant_alu_3d_r1_rc1_0000": 20.08522319793701, "test_constant_alu_3d_r1_rc1_0001": 17.27144956588745, "test_constant_alu_3d_r1_rc1_0002": 17.23574686050415, "test_constant_alu_3d_r1_rc3_0000": 17.482845067977905, "test_constant_alu_3d_r1_rc3_0001": 17.1039035320282, "test_constant_alu_3d_r1_rc3_0002": 17.37702703475952, "test_constant_alu_3d_r3_rc1_0000": 17.954166650772095, "test_constant_alu_3d_r3_rc1_0001": 18.473609447479248, "test_constant_alu_3d_r3_rc1_0002": 17.0549955368042, "test_constant_alu_3d_r3_rc3_0000": 17.480862140655518, "test_constant_alu_3d_r3_rc3_0001": 18.798429012298584, "test_constant_alu_3d_r3_rc3_0002": 17.120957612991333, "test_constant_ug_3d_r1_rc1": 17.064798831939697, "test_constant_ug_3d_r1_rc3": 17.269043445587158, "test_constant_ug_3d_r3_rc1": 17.420432090759277, "test_constant_ug_3d_r3_rc3": 17.561042547225952, "test_constant_yasp_1d_r1_rc1": 18.014742136001587, "test_constant_yasp_1d_r1_rc3": 18.12042474746704, "test_constant_yasp_1d_r3_rc1": 20.266605377197266, "test_constant_yasp_1d_r3_rc3": 18.232828378677368, "test_constant_yasp_3d_r1_rc1": 17.235671758651733, "test_constant_yasp_3d_r1_rc3": 17.19625449180603, "test_constant_yasp_3d_r3_rc1": 17.451977729797363, "test_constant_yasp_3d_r3_rc3": 17.32913088798523, "test_empty": 16.079071760177612, "test_expression_default_alberta_1d_r1_rc1": 18.263118505477905, "test_expression_default_alberta_1d_r1_rc3": 18.549551248550415, "test_expression_default_alberta_1d_r3_rc1": 21.41700530052185, "test_expression_default_alberta_1d_r3_rc3": 18.276604413986206, "test_expression_default_alberta_3d_r1_rc1": 19.254730701446533, "test_expression_default_alberta_3d_r1_rc3": 18.690196752548218, "test_expression_default_alberta_3d_r3_rc1": 18.360896348953247, "test_expression_default_alberta_3d_r3_rc3": 21.001927137374878, "test_expression_default_alu_3d_r1_rc1_0000": 18.83172917366028, "test_expression_default_alu_3d_r1_rc1_0001": 19.632460594177246, "test_expression_default_alu_3d_r1_rc1_0002": 21.064167022705078, "test_expression_default_alu_3d_r1_rc3_0000": 18.806495189666748, "test_expression_default_alu_3d_r1_rc3_0001": 18.406678199768066, "test_expression_default_alu_3d_r1_rc3_0002": 18.072860956192017, "test_expression_default_alu_3d_r3_rc1_0000": 19.45250391960144, "test_expression_default_alu_3d_r3_rc1_0001": 19.036407709121704, "test_expression_default_alu_3d_r3_rc1_0002": 18.356473445892334, "test_expression_default_alu_3d_r3_rc3_0000": 18.681460857391357, "test_expression_default_alu_3d_r3_rc3_0001": 18.07203221321106, "test_expression_default_alu_3d_r3_rc3_0002": 18.423197746276855, "test_expression_default_ug_3d_r1_rc1": 18.34494376182556, "test_expression_default_ug_3d_r1_rc3": 18.013826847076416, "test_expression_default_ug_3d_r3_rc1": 18.35629177093506, "test_expression_default_ug_3d_r3_rc3": 18.989110231399536, "test_expression_default_yasp_1d_r1_rc1": 18.073102712631226, "test_expression_default_yasp_1d_r1_rc3": 17.989795207977295, "test_expression_default_yasp_1d_r3_rc1": 18.060887575149536, "test_expression_default_yasp_1d_r3_rc3": 18.273865461349487, "test_expression_default_yasp_3d_r1_rc1": 18.248963594436646, "test_expression_default_yasp_3d_r1_rc3": 17.94398021697998, "test_expression_default_yasp_3d_r3_rc1": 18.452487468719482, "test_expression_default_yasp_3d_r3_rc3": 19.061495780944824, "test_expression_parametric_alberta_1d_r1_rc1": 19.204541444778442, "test_expression_parametric_alberta_3d_r1_rc1": 20.90292763710022, "test_expression_parametric_alu_3d_r1_rc1_0000": 29.00003981590271, "test_expression_parametric_alu_3d_r1_rc1_0001": 26.96547508239746, "test_expression_parametric_alu_3d_r1_rc1_0002": 27.066059589385986, "test_expression_parametric_ug_3d_r1_rc1": 20.669278383255005, "test_expression_parametric_yasp_1d_r1_rc1": 18.997971773147583, "test_expression_parametric_yasp_3d_r1_rc1": 22.30035090446472, "test_flattop": 27.608917951583862, "test_functions_alberta_1d_r1_rc1": 21.114784717559814, "test_functions_alberta_1d_r1_rc3": 21.01030206680298, "test_functions_alberta_1d_r3_rc1": 21.09175705909729, "test_functions_alberta_1d_r3_rc3": 21.40331196784973, "test_functions_alberta_3d_r1_rc1": 22.426992893218994, "test_functions_alberta_3d_r1_rc3": 22.738091945648193, "test_functions_alberta_3d_r3_rc1": 20.785479307174683, "test_functions_alberta_3d_r3_rc3": 20.455530405044556, "test_functions_alu_3d_r1_rc1_0000": 22.282484531402588, "test_functions_alu_3d_r1_rc1_0001": 22.167702674865723, "test_functions_alu_3d_r1_rc1_0002": 26.093852996826172, "test_functions_alu_3d_r1_rc3_0000": 21.770424842834473, "test_functions_alu_3d_r1_rc3_0001": 21.7331280708313, "test_functions_alu_3d_r1_rc3_0002": 21.971495628356934, "test_functions_alu_3d_r3_rc1_0000": 21.974807024002075, "test_functions_alu_3d_r3_rc1_0001": 22.035661935806274, "test_functions_alu_3d_r3_rc1_0002": 21.53220510482788, "test_functions_alu_3d_r3_rc3_0000": 25.14601230621338, "test_functions_alu_3d_r3_rc3_0001": 21.778015851974487, "test_functions_alu_3d_r3_rc3_0002": 22.42915964126587, "test_functions_ug_3d_r1_rc1": 22.296344995498657, "test_functions_ug_3d_r1_rc3": 22.672362804412842, "test_functions_ug_3d_r3_rc1": 21.51437544822693, "test_functions_ug_3d_r3_rc3": 22.598135471343994, "test_functions_yasp_1d_r1_rc1": 21.263728380203247, "test_functions_yasp_1d_r1_rc3": 20.660491466522217, "test_functions_yasp_1d_r3_rc1": 20.985987424850464, "test_functions_yasp_1d_r3_rc3": 21.50996232032776, "test_functions_yasp_3d_r1_rc1": 23.251285314559937, "test_functions_yasp_3d_r1_rc3": 21.019334077835083, "test_functions_yasp_3d_r3_rc1": 21.019885778427124, "test_functions_yasp_3d_r3_rc3": 20.999614238739014, "test_indicator_alberta_1d_r1_rc1": 18.19898557662964, "test_indicator_alberta_3d_r1_rc1": 18.526633501052856, "test_indicator_alu_3d_r1_rc1_0000": 19.190847635269165, "test_indicator_alu_3d_r1_rc1_0001": 18.65059185028076, "test_indicator_alu_3d_r1_rc1_0002": 18.935564517974854, "test_indicator_ug_3d_r1_rc1": 19.303451776504517, "test_indicator_yasp_1d_r1_rc1": 17.91905641555786, "test_indicator_yasp_3d_r1_rc1": 18.47655963897705, "test_lambda_global_flux_function_alberta_1d_r1_rc1": 19.71386218070984, "test_lambda_global_flux_function_alberta_3d_r1_rc1": 23.845843076705933, "test_lambda_global_flux_function_alu_3d_r1_rc1_0000": 27.12923812866211, "test_lambda_global_flux_function_alu_3d_r1_rc1_0001": 26.899558782577515, "test_lambda_global_flux_function_alu_3d_r1_rc1_0002": 26.767258644104004, "test_lambda_global_flux_function_ug_3d_r1_rc1": 20.34222984313965, "test_lambda_global_flux_function_yasp_1d_r1_rc1": 21.17764186859131, "test_lambda_global_flux_function_yasp_3d_r1_rc1": 20.21225929260254, "test_lambda_global_function_alberta_1d_r1_rc1": 16.554109573364258, "test_lambda_global_function_alberta_1d_r1_rc3": 16.527742624282837, "test_lambda_global_function_alberta_1d_r3_rc1": 16.572184085845947, "test_lambda_global_function_alberta_1d_r3_rc3": 17.08496642112732, "test_lambda_global_function_alberta_3d_r1_rc1": 16.506139039993286, "test_lambda_global_function_alberta_3d_r1_rc3": 16.469588041305542, "test_lambda_global_function_alberta_3d_r3_rc1": 16.4826397895813, "test_lambda_global_function_alberta_3d_r3_rc3": 16.922993659973145, "test_lambda_global_function_alu_3d_r1_rc1_0000": 16.861034631729126, "test_lambda_global_function_alu_3d_r1_rc1_0001": 16.59978461265564, "test_lambda_global_function_alu_3d_r1_rc1_0002": 16.61959719657898, "test_lambda_global_function_alu_3d_r1_rc3_0000": 16.651610374450684, "test_lambda_global_function_alu_3d_r1_rc3_0001": 19.021191835403442, "test_lambda_global_function_alu_3d_r1_rc3_0002": 17.187358617782593, "test_lambda_global_function_alu_3d_r3_rc1_0000": 16.589468240737915, "test_lambda_global_function_alu_3d_r3_rc1_0001": 16.511296033859253, "test_lambda_global_function_alu_3d_r3_rc1_0002": 16.674526929855347, "test_lambda_global_function_alu_3d_r3_rc3_0000": 16.505088329315186, "test_lambda_global_function_alu_3d_r3_rc3_0001": 17.871268272399902, "test_lambda_global_function_alu_3d_r3_rc3_0002": 16.87092351913452, "test_lambda_global_function_ug_3d_r1_rc1": 16.49480152130127, "test_lambda_global_function_ug_3d_r1_rc3": 16.624858856201172, "test_lambda_global_function_ug_3d_r3_rc1": 16.86823010444641, "test_lambda_global_function_ug_3d_r3_rc3": 16.998570203781128, "test_lambda_global_function_yasp_1d_r1_rc1": 16.72396492958069, "test_lambda_global_function_yasp_1d_r1_rc3": 17.45966076850891, "test_lambda_global_function_yasp_1d_r3_rc1": 16.769001483917236, "test_lambda_global_function_yasp_1d_r3_rc3": 16.534157752990723, "test_lambda_global_function_yasp_3d_r1_rc1": 17.370596170425415, "test_lambda_global_function_yasp_3d_r1_rc3": 16.561802625656128, "test_lambda_global_function_yasp_3d_r3_rc1": 16.574744939804077, "test_lambda_global_function_yasp_3d_r3_rc3": 16.708879709243774, "test_lambda_local_flux_function_alberta_1d_r1_rc1": 19.70447087287903, "test_lambda_local_flux_function_alberta_3d_r1_rc1": 20.288437843322754, "test_lambda_local_flux_function_alu_3d_r1_rc1_0000": 27.22477412223816, "test_lambda_local_flux_function_alu_3d_r1_rc1_0001": 26.77414035797119, "test_lambda_local_flux_function_alu_3d_r1_rc1_0002": 26.88183283805847, "test_lambda_local_flux_function_ug_3d_r1_rc1": 20.215343236923218, "test_lambda_local_flux_function_yasp_1d_r1_rc1": 19.326310396194458, "test_lambda_local_flux_function_yasp_3d_r1_rc1": 19.309234142303467, "test_lambda_local_function_alberta_1d_r1_rc1": 19.482234001159668, "test_lambda_local_function_alberta_1d_r1_rc3": 19.491390466690063, "test_lambda_local_function_alberta_1d_r3_rc1": 19.737709760665894, "test_lambda_local_function_alberta_1d_r3_rc3": 19.049132585525513, "test_lambda_local_function_alberta_3d_r1_rc1": 20.29612970352173, "test_lambda_local_function_alberta_3d_r1_rc3": 22.54290270805359, "test_lambda_local_function_alberta_3d_r3_rc1": 19.807548999786377, "test_lambda_local_function_alberta_3d_r3_rc3": 20.5995774269104, "test_lambda_local_function_alu_3d_r1_rc1_0000": 26.285258769989014, "test_lambda_local_function_alu_3d_r1_rc1_0001": 27.248192310333252, "test_lambda_local_function_alu_3d_r1_rc1_0002": 27.70791506767273, "test_lambda_local_function_alu_3d_r1_rc3_0000": 26.31389856338501, "test_lambda_local_function_alu_3d_r1_rc3_0001": 27.047832250595093, "test_lambda_local_function_alu_3d_r1_rc3_0002": 26.248119354248047, "test_lambda_local_function_alu_3d_r3_rc1_0000": 26.332953691482544, "test_lambda_local_function_alu_3d_r3_rc1_0001": 26.2433123588562, "test_lambda_local_function_alu_3d_r3_rc1_0002": 26.683884143829346, "test_lambda_local_function_alu_3d_r3_rc3_0000": 30.253638982772827, "test_lambda_local_function_alu_3d_r3_rc3_0001": 26.242444038391113, "test_lambda_local_function_alu_3d_r3_rc3_0002": 26.225865364074707, "test_lambda_local_function_ug_3d_r1_rc1": 19.75720238685608, "test_lambda_local_function_ug_3d_r1_rc3": 20.51409649848938, "test_lambda_local_function_ug_3d_r3_rc1": 20.04006028175354, "test_lambda_local_function_ug_3d_r3_rc3": 19.906145811080933, "test_lambda_local_function_yasp_1d_r1_rc1": 19.931835889816284, "test_lambda_local_function_yasp_1d_r1_rc3": 19.267087697982788, "test_lambda_local_function_yasp_1d_r3_rc1": 19.485828161239624, "test_lambda_local_function_yasp_1d_r3_rc3": 19.157115936279297, "test_lambda_local_function_yasp_3d_r1_rc1": 19.787895679473877, "test_lambda_local_function_yasp_3d_r1_rc3": 19.33585786819458, "test_lambda_local_function_yasp_3d_r3_rc1": 18.777853965759277, "test_lambda_local_function_yasp_3d_r3_rc3": 21.99708318710327, "test_spe10_alberta_3d_r3_rc3": 17.835134983062744, "test_spe10_alu_3d_r3_rc3_0000": 18.447022438049316, "test_spe10_alu_3d_r3_rc3_0001": 17.8853919506073, "test_spe10_alu_3d_r3_rc3_0002": 18.336849689483643, "test_spe10_yasp_3d_r3_rc3": 18.08585214614868}
\ No newline at end of file
diff --git a/python/dune/xt/functions/ESV2007.bindings.hh b/python/dune/xt/functions/ESV2007.bindings.hh
index ee926aea585d03955f1a2d32642a2769004c73df..fd3758a148cd9cf248031c197d93e2cb061c9364 100644
--- a/python/dune/xt/functions/ESV2007.bindings.hh
+++ b/python/dune/xt/functions/ESV2007.bindings.hh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
 #define DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -92,7 +91,6 @@ class CutoffFunction
             "poincare_constant"_a = 1.0 / (M_PIl * M_PIl),
             "name"_a = type_single_diffusion::static_id(),
             py::keep_alive<0, 2>());
-#if HAVE_DUNE_FEM
       m.def(std::string(make_name + "_single_diffusion_to_1x1").c_str(),
             [](const Grid::GridProvider<G, XT::Grid::DD::SubdomainGrid<G>>& /*grid*/,
                const ScalarFunction& diffusion,
@@ -103,8 +101,6 @@ class CutoffFunction
             "poincare_constant"_a = 1.0 / (M_PIl * M_PIl),
             "name"_a = type_single_diffusion::static_id(),
             py::keep_alive<0, 2>());
-#endif // HAVE_DUNE_FEM
-
       m.def(std::string(make_name + "_diffusion_factor_and_tensor_to_1x1").c_str(),
             [](const Grid::GridProvider<G>& /*grid*/,
                const ScalarFunction& diffusion_factor,
@@ -118,7 +114,6 @@ class CutoffFunction
             "name"_a = type::static_id(),
             py::keep_alive<0, 2>(),
             py::keep_alive<0, 3>());
-#if HAVE_DUNE_FEM
       m.def(std::string(make_name + "_diffusion_factor_and_tensor_to_1x1").c_str(),
             [](const Grid::GridProvider<G, XT::Grid::DD::SubdomainGrid<G>>& /*grid*/,
                const ScalarFunction& diffusion_factor,
@@ -132,7 +127,6 @@ class CutoffFunction
             "name"_a = type::static_id(),
             py::keep_alive<0, 2>(),
             py::keep_alive<0, 3>());
-#endif // HAVE_DUNE_FEM
     }
   }; // struct helper<true, ...>
 
@@ -158,5 +152,4 @@ public:
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
diff --git a/python/dune/xt/functions/bindings.cc b/python/dune/xt/functions/bindings.cc
index 5a714c0fface0c7f470962b73e312709cb50a64c..99773fbb21507925789ff97e4be125231e2dd85a 100644
--- a/python/dune/xt/functions/bindings.cc
+++ b/python/dune/xt/functions/bindings.cc
@@ -10,17 +10,11 @@
 
 #include "config.h"
 
-#if HAVE_DUNE_PYBINDXI
-
 #include <string>
 #include <vector>
 
 #include <dune/common/parallel/mpihelper.hh>
 
-#if HAVE_DUNE_FEM
-#include <dune/fem/misc/mpimanager.hh>
-#endif
-
 #include <dune/pybindxi/pybind11.h>
 #include <dune/pybindxi/stl.h>
 
@@ -38,238 +32,88 @@
 template <class G>
 void addbind_for_Grid(pybind11::module& m)
 {
+  using namespace Dune::XT::Functions;
   const auto grid_id = Dune::XT::Grid::bindings::grid_name<G>::value();
+  const auto diff = internal::Combination::difference;
+  const auto sum = internal::Combination::sum;
+  const auto prod = internal::Combination::product;
+  const auto g_dim = G::dimension;
+
+  auto i_1_1 = bind_LocalizableFunctionInterface<G, 1, 1>(m, grid_id);
+  auto i_2_1 = bind_LocalizableFunctionInterface<G, 2, 1>(m, grid_id);
+  auto i_3_1 = bind_LocalizableFunctionInterface<G, 3, 1>(m, grid_id);
+  auto i_4_1 = bind_LocalizableFunctionInterface<G, 4, 1>(m, grid_id);
+  //! this generates multiple binds for the same type
+  //! auto i_d_d = bind_LocalizableFunctionInterface<G, g_dim, g_dim>(m, grid_id);
+  auto i_d_d = bind_LocalizableFunctionInterface<G, 2, 2>(m, grid_id);
+
+  bind_combined_LocalizableFunction<G, g_dim, diff, 1, 1, 1, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, diff, 1, 1, 1, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, diff, 2, 1, 2, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, diff, 2, 1, 2, 1>(i_2_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, diff, 3, 1, 3, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, diff, 3, 1, 3, 1>(i_3_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, diff, 4, 1, 4, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, diff, 4, 1, 4, 1>(i_4_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, diff, 2, 2, 2, 2>(m, grid_id);
+  //  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, diff, g_dim, g_dim, g_dim, g_dim>(i_d_d);
+
+
+  bind_combined_LocalizableFunction<G, g_dim, sum, 1, 1, 1, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, sum, 1, 1, 1, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, sum, 2, 1, 2, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, sum, 2, 1, 2, 1>(i_2_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, sum, 3, 1, 3, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, sum, 3, 1, 3, 1>(i_3_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, sum, 4, 1, 4, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, sum, 4, 1, 4, 1>(i_4_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, sum, 2, 2, 2, 2>(m, grid_id);
+  //  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, sum, g_dim, g_dim, g_dim, g_dim>(i_d_d);
 
-  auto i_1_1 = Dune::XT::Functions::bind_LocalizableFunctionInterface<G, 1, 1>(m, grid_id);
-  auto i_2_1 = Dune::XT::Functions::bind_LocalizableFunctionInterface<G, 2, 1>(m, grid_id);
-  auto i_3_1 = Dune::XT::Functions::bind_LocalizableFunctionInterface<G, 3, 1>(m, grid_id);
-  auto i_4_1 = Dune::XT::Functions::bind_LocalizableFunctionInterface<G, 4, 1>(m, grid_id);
-
-  auto i_d_d = Dune::XT::Functions::bind_LocalizableFunctionInterface<G, G::dimension, G::dimension>(m, grid_id);
-
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::difference,
-                                                         1,
-                                                         1,
-                                                         1,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::difference,
-                                                       1,
-                                                       1,
-                                                       1,
-                                                       1>(i_1_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::difference,
-                                                         2,
-                                                         1,
-                                                         2,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::difference,
-                                                       2,
-                                                       1,
-                                                       2,
-                                                       1>(i_2_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::difference,
-                                                         3,
-                                                         1,
-                                                         3,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::difference,
-                                                       3,
-                                                       1,
-                                                       3,
-                                                       1>(i_3_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::difference,
-                                                         4,
-                                                         1,
-                                                         4,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::difference,
-                                                       4,
-                                                       1,
-                                                       4,
-                                                       1>(i_4_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::difference,
-                                                         2,
-                                                         2,
-                                                         2,
-                                                         2>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::difference,
-                                                       G::dimension,
-                                                       G::dimension,
-                                                       G::dimension,
-                                                       G::dimension>(i_d_d);
-
-
-  Dune::XT::Functions::
-      bind_combined_LocalizableFunction<G, G::dimension, Dune::XT::Functions::internal::Combination::sum, 1, 1, 1, 1>(
-          m, grid_id);
-  Dune::XT::Functions::addbind_LocalizableFunctionInterface_combined_op<G,
-                                                                        G::dimension,
-                                                                        Dune::XT::Functions::internal::Combination::sum,
-                                                                        1,
-                                                                        1,
-                                                                        1,
-                                                                        1>(i_1_1);
-  Dune::XT::Functions::
-      bind_combined_LocalizableFunction<G, G::dimension, Dune::XT::Functions::internal::Combination::sum, 2, 1, 2, 1>(
-          m, grid_id);
-  Dune::XT::Functions::addbind_LocalizableFunctionInterface_combined_op<G,
-                                                                        G::dimension,
-                                                                        Dune::XT::Functions::internal::Combination::sum,
-                                                                        2,
-                                                                        1,
-                                                                        2,
-                                                                        1>(i_2_1);
-  Dune::XT::Functions::
-      bind_combined_LocalizableFunction<G, G::dimension, Dune::XT::Functions::internal::Combination::sum, 3, 1, 3, 1>(
-          m, grid_id);
-  Dune::XT::Functions::addbind_LocalizableFunctionInterface_combined_op<G,
-                                                                        G::dimension,
-                                                                        Dune::XT::Functions::internal::Combination::sum,
-                                                                        3,
-                                                                        1,
-                                                                        3,
-                                                                        1>(i_3_1);
-  Dune::XT::Functions::
-      bind_combined_LocalizableFunction<G, G::dimension, Dune::XT::Functions::internal::Combination::sum, 4, 1, 4, 1>(
-          m, grid_id);
-  Dune::XT::Functions::addbind_LocalizableFunctionInterface_combined_op<G,
-                                                                        G::dimension,
-                                                                        Dune::XT::Functions::internal::Combination::sum,
-                                                                        4,
-                                                                        1,
-                                                                        4,
-                                                                        1>(i_4_1);
-  Dune::XT::Functions::
-      bind_combined_LocalizableFunction<G, G::dimension, Dune::XT::Functions::internal::Combination::sum, 2, 2, 2, 2>(
-          m, grid_id);
-  Dune::XT::Functions::addbind_LocalizableFunctionInterface_combined_op<G,
-                                                                        G::dimension,
-                                                                        Dune::XT::Functions::internal::Combination::sum,
-                                                                        G::dimension,
-                                                                        G::dimension,
-                                                                        G::dimension,
-                                                                        G::dimension>(i_d_d);
-
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::product,
-                                                         1,
-                                                         1,
-                                                         1,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::product,
-                                                       1,
-                                                       1,
-                                                       1,
-                                                       1>(i_1_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::product,
-                                                         1,
-                                                         1,
-                                                         2,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::product,
-                                                       1,
-                                                       1,
-                                                       2,
-                                                       1>(i_1_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::product,
-                                                         1,
-                                                         1,
-                                                         3,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::product,
-                                                       1,
-                                                       1,
-                                                       3,
-                                                       1>(i_1_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::product,
-                                                         1,
-                                                         1,
-                                                         4,
-                                                         1>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::product,
-                                                       1,
-                                                       1,
-                                                       4,
-                                                       1>(i_1_1);
-  Dune::XT::Functions::bind_combined_LocalizableFunction<G,
-                                                         G::dimension,
-                                                         Dune::XT::Functions::internal::Combination::product,
-                                                         1,
-                                                         1,
-                                                         2,
-                                                         2>(m, grid_id);
-  Dune::XT::Functions::
-      addbind_LocalizableFunctionInterface_combined_op<G,
-                                                       G::dimension,
-                                                       Dune::XT::Functions::internal::Combination::product,
-                                                       1,
-                                                       1,
-                                                       2,
-                                                       2>(i_1_1);
-
-  Dune::XT::Functions::bind_ConstantFunction<G, G::dimension, 1, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ConstantFunction<G, G::dimension, 2, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ConstantFunction<G, G::dimension, 3, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ConstantFunction<G, G::dimension, 4, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ConstantFunction<G, G::dimension, 2, 2>(m, grid_id);
-
-  Dune::XT::Functions::bind_CheckerboardFunction<G, G::dimension, 1, 1>(m, grid_id);
-  //  Dune::XT::Functions::bind_CheckerboardFunction<G, G::dimension, 2, 1>(m, grid_id);
-  //  Dune::XT::Functions::bind_CheckerboardFunction<G, G::dimension, 3, 1>(m, grid_id);
-  //  Dune::XT::Functions::bind_CheckerboardFunction<G, G::dimension, 4, 1>(m, grid_id);
-
-  Dune::XT::Functions::bindings::ESV2007::CutoffFunction<G>::bind(m);
-
-  Dune::XT::Functions::bind_ExpressionFunction<G, G::dimension, 1, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ExpressionFunction<G, G::dimension, 2, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ExpressionFunction<G, G::dimension, 3, 1>(m, grid_id);
-  Dune::XT::Functions::bind_ExpressionFunction<G, G::dimension, 4, 1>(m, grid_id);
-
-  Dune::XT::Functions::bind_Spe10Model1Function<G, G::dimension, 1, 1>(m, grid_id);
+
+  bind_combined_LocalizableFunction<G, g_dim, prod, 1, 1, 1, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, prod, 1, 1, 1, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, prod, 1, 1, 2, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, prod, 1, 1, 2, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, prod, 1, 1, 3, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, prod, 1, 1, 3, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, prod, 1, 1, 4, 1>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, prod, 1, 1, 4, 1>(i_1_1);
+
+  bind_combined_LocalizableFunction<G, g_dim, prod, 1, 1, 2, 2>(m, grid_id);
+  addbind_LocalizableFunctionInterface_combined_op<G, g_dim, prod, 1, 1, 2, 2>(i_1_1);
+
+
+  bind_ConstantFunction<G, g_dim, 1, 1>(m, grid_id);
+  bind_ConstantFunction<G, g_dim, 2, 1>(m, grid_id);
+  bind_ConstantFunction<G, g_dim, 3, 1>(m, grid_id);
+  bind_ConstantFunction<G, g_dim, 4, 1>(m, grid_id);
+  bind_ConstantFunction<G, g_dim, 2, 2>(m, grid_id);
+
+  bind_CheckerboardFunction<G, g_dim, 1, 1>(m, grid_id);
+  //  bind_CheckerboardFunction<G, g_dim, 2, 1>(m, grid_id);
+  //  bind_CheckerboardFunction<G, g_dim, 3, 1>(m, grid_id);
+  //  bind_CheckerboardFunction<G, g_dim, 4, 1>(m, grid_id);
+
+  bindings::ESV2007::CutoffFunction<G>::bind(m);
+
+  bind_ExpressionFunction<G, g_dim, 1, 1>(m, grid_id);
+  bind_ExpressionFunction<G, g_dim, 2, 1>(m, grid_id);
+  bind_ExpressionFunction<G, g_dim, 3, 1>(m, grid_id);
+  bind_ExpressionFunction<G, g_dim, 4, 1>(m, grid_id);
+
+  bind_Spe10Model1Function<G, g_dim, 1, 1>(m, grid_id);
 } // ... addbind_for_Grid(...)
 
 
@@ -297,52 +141,6 @@ PYBIND11_PLUGIN(_functions)
   //  addbind_for_Grid<Dune::AlbertaGrid<2, 2>>(m, "2d_simplex_albertagrid");
   //#endif
 
-  m.def("_init_mpi",
-        [](const std::vector<std::string>& args) {
-          int argc = Dune::XT::Common::numeric_cast<int>(args.size());
-          char** argv = Dune::XT::Common::vector_to_main_args(args);
-          Dune::MPIHelper::instance(argc, argv);
-#if HAVE_DUNE_FEM
-          Dune::Fem::MPIManager::initialize(argc, argv);
-#endif
-        },
-        "args"_a = std::vector<std::string>());
-
-  m.def("_init_logger",
-        [](const ssize_t max_info_level,
-           const ssize_t max_debug_level,
-           const bool enable_warnings,
-           const bool enable_colors,
-           const std::string& info_color,
-           const std::string& debug_color,
-           const std::string& warning_color) {
-          Dune::XT::Common::TimedLogger().create(
-              max_info_level, max_debug_level, enable_warnings, enable_colors, info_color, debug_color, warning_color);
-        },
-        "max_info_level"_a = std::numeric_limits<ssize_t>::max(),
-        "max_debug_level"_a = std::numeric_limits<ssize_t>::max(),
-        "enable_warnings"_a = true,
-        "enable_colors"_a = true,
-        "info_color"_a = "blue",
-        "debug_color"_a = "darkgray",
-        "warning_color"_a = "red");
-
-  m.def("_test_logger",
-        [](const bool info, const bool debug, const bool warning) {
-          auto logger = Dune::XT::Common::TimedLogger().get("dune.xt.functions");
-          if (info)
-            logger.info() << "info logging works!" << std::endl;
-          if (debug)
-            logger.debug() << "debug logging works!" << std::endl;
-          if (warning)
-            logger.warn() << "warning logging works!" << std::endl;
-        },
-        "info"_a = true,
-        "debug"_a = true,
-        "warning"_a = true);
-
+  Dune::XT::Common::bindings::add_initialization(m, "dune.xt.functions");
   return m.ptr();
 }
-
-
-#endif // HAVE_DUNE_PYBINDXI
diff --git a/python/dune/xt/functions/checkerboard.pbh b/python/dune/xt/functions/checkerboard.pbh
index e7d78b7fef122657a6d4c1b8490f8e8bb235cd07..a6570003db68384a64c2bcdc6f341458e94853c5 100644
--- a/python/dune/xt/functions/checkerboard.pbh
+++ b/python/dune/xt/functions/checkerboard.pbh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
 #define DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -112,5 +111,4 @@ bind_CheckerboardFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
diff --git a/python/dune/xt/functions/constant.pbh b/python/dune/xt/functions/constant.pbh
index 18d8ed640ccbffeff5acc2d546f3acae883f4deb..05de82ab240e6ae89954d3b10d0ab30d12a79dbc 100644
--- a/python/dune/xt/functions/constant.pbh
+++ b/python/dune/xt/functions/constant.pbh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_PBH
 #define DUNE_XT_FUNCTIONS_CONSTANT_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -107,5 +106,4 @@ bind_ConstantFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_CONSTANT_PBH
diff --git a/python/dune/xt/functions/expression.pbh b/python/dune/xt/functions/expression.pbh
index b4d0b6fda4cb6988ccc92c40f721966d32bf15ee..3c41496435f1110fe300073d8989f72a15cd46d2 100644
--- a/python/dune/xt/functions/expression.pbh
+++ b/python/dune/xt/functions/expression.pbh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PBH
 #define DUNE_XT_FUNCTIONS_EXPRESSION_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 #include <dune/pybindxi/stl.h>
@@ -187,5 +186,4 @@ bind_ExpressionFunction(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_EXPRESSION_PBH
diff --git a/python/dune/xt/functions/interfaces.pbh b/python/dune/xt/functions/interfaces.pbh
index f4043ada8d54c4fb0951217ef8e83bdfe15352a8..421121a9ba21ce9ec9a2ee6b1199ab4b3ebbd539 100644
--- a/python/dune/xt/functions/interfaces.pbh
+++ b/python/dune/xt/functions/interfaces.pbh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACE_PBH
 #define DUNE_XT_FUNCTIONS_INTERFACE_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 #include <dune/pybindxi/operators.h>
@@ -222,7 +221,6 @@ bind_LocalizableFunctionInterface(pybind11::module& m, const std::string& grid_i
         "level"_a = -1,
         "path"_a,
         "subsampling"_a = true);
-#if HAVE_DUNE_FEM
   c.def("visualize",
         [](const C& self,
            const Grid::GridProvider<G, Grid::DD::SubdomainGrid<G>>& dd_grid_provider,
@@ -261,7 +259,6 @@ bind_LocalizableFunctionInterface(pybind11::module& m, const std::string& grid_i
         "level_or_subdomain"_a = -1,
         "path"_a,
         "subsampling"_a = true);
-#endif // HAVE_DUNE_FEM
 
   internal::Divergence<G>::addbind(m, c);
 
@@ -347,5 +344,4 @@ void addbind_LocalizableFunctionInterface_combined_op(C& c)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_INTERFACE_PBH
diff --git a/python/dune/xt/functions/spe10.pbh b/python/dune/xt/functions/spe10.pbh
index 08678580b183eea4944c1bba5451a296401ff5d3..c53b40682f041f46767e9073fe9c2e6fd0092df6 100644
--- a/python/dune/xt/functions/spe10.pbh
+++ b/python/dune/xt/functions/spe10.pbh
@@ -10,7 +10,6 @@
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_PBH
 #define DUNE_XT_FUNCTIONS_SPE10_PBH
-#if HAVE_DUNE_PYBINDXI
 
 #include <dune/pybindxi/pybind11.h>
 
@@ -123,5 +122,4 @@ bind_Spe10Model1Function(pybind11::module& m, const std::string& grid_id)
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_DUNE_PYBINDXI
 #endif // DUNE_XT_FUNCTIONS_SPE10_PBH