diff --git a/CMakeLists.txt b/CMakeLists.txt
index e333cab7b37c5466067f1cd5f05c9385e5fa120c..c0d953142ff6c039b095dae41cf4a6f15a99b008 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,8 @@ add_subdirectory(cmake/modules)
 add_subdirectory(python)
 
 add_subdirectory(test)
-add_subdirectory(bin)
-add_subdirectory(applications)
+#add_subdirectory(bin)
+#add_subdirectory(applications)
 
 # finalize the dune project, e.g. generating config.h etc.
 finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
diff --git a/python/dune/codegen/loopy/symbolic.py b/python/dune/codegen/loopy/symbolic.py
index 799c7d6040e2e7d9e40c296d73c391aeb43cc6f3..c5eef223d46ea37d85ad9ada5acfcfe90f5e5587 100644
--- a/python/dune/codegen/loopy/symbolic.py
+++ b/python/dune/codegen/loopy/symbolic.py
@@ -122,6 +122,7 @@ lp.type_inference.TypeInferenceMapper.map_vectorized_sumfact_kernel = needs_reso
 
 # FusedMultiplyAdd node
 lp.symbolic.IdentityMapper.map_fused_multiply_add = identity_map_fused_multiply_add
+lp.symbolic.SubstitutionMapper.map_fused_multiply_add = lp.symbolic.SubstitutionMapper.map_variable
 lp.symbolic.WalkMapper.map_fused_multiply_add = walk_map_fused_multiply_add
 lp.symbolic.StringifyMapper.map_fused_multiply_add = stringify_map_fused_multiply_add
 lp.symbolic.DependencyMapper.map_fused_multiply_add = dependency_map_fused_multiply_add
diff --git a/test/blockstructured/poisson/poisson_matrix_free.mini b/test/blockstructured/poisson/poisson_matrix_free.mini
index 514ab95b79ea5febb48da6d4a610c9abbb4d5ba4..1651025749ee8d83efeb3366b544908a160d9c9e 100644
--- a/test/blockstructured/poisson/poisson_matrix_free.mini
+++ b/test/blockstructured/poisson/poisson_matrix_free.mini
@@ -13,6 +13,7 @@ compare_l2errorsquared = 1e-7
 
 [formcompiler.r]
 matrix_free = 1
+generate_jacobians = 0
 blockstructured = 1
 number_of_blocks = 4
 geometry_mixins = blockstructured_equidistant
diff --git a/test/poisson/CMakeLists.txt b/test/poisson/CMakeLists.txt
index 5eeae1a434b4051470540c44d766360d904b4fdd..1d448bd2bff8d6b7c4c11419dc34ce618cd8acf1 100644
--- a/test/poisson/CMakeLists.txt
+++ b/test/poisson/CMakeLists.txt
@@ -81,6 +81,13 @@ dune_add_formcompiler_system_test(UFLFILE poisson_dg_quadrilateral.ufl
         INIFILE poisson_dg_axiparallel.mini
         )
 
+
+# 10. Poisson Test Case with a full permeability tensor
+dune_add_formcompiler_system_test(UFLFILE poisson_tensor_inv.ufl
+        BASENAME poisson_tensor_inv
+        INIFILE poisson_tensor_inv.mini
+        )
+
 # the reference vtk file
 add_executable(poisson_dg_ref reference_main.cc)
 set_target_properties(poisson_dg_ref PROPERTIES EXCLUDE_FROM_ALL 1)
diff --git a/test/poisson/poisson_dg_quadrilateral.ufl b/test/poisson/poisson_dg_quadrilateral.ufl
index 7387894341f25221d412ae967717a3bfca8788f4..902069a0fca97fa64e1e22e6e79eeff444eb37da 100644
--- a/test/poisson/poisson_dg_quadrilateral.ufl
+++ b/test/poisson/poisson_dg_quadrilateral.ufl
@@ -1,4 +1,4 @@
-cell = "quadrilateral"
+generate_jacobian_kernelscell = "quadrilateral"
 degree = 1
 dim = 2