diff --git a/src/lbm/srt/AdvectionDiffusionSweep.impl.h b/src/lbm/srt/AdvectionDiffusionSweep.impl.h
index 872af2cdc94f0a6e109cb763cb4e6d9cbaf8cdee..996996eb9bfae30c511182f4475ffdc1ecfd91fe 100644
--- a/src/lbm/srt/AdvectionDiffusionSweep.impl.h
+++ b/src/lbm/srt/AdvectionDiffusionSweep.impl.h
@@ -42,6 +42,13 @@
 namespace walberla {
 namespace lbm {
 
+template< typename LM_AdvDiff, typename VelocityAdapter_T, typename FlagField_T, typename VectorField_T, class Enable = void >
+class AdvectionDiffusionSweep
+{
+	static_assert(never_true<LM_AdvDiff>::value, "Instantiating 'lbm::AdvectionDiffusionSweep' failed");
+};
+
+
 
 template< typename LM_AdvDiff, typename VelocityAdapter_T, typename FlagField_T, typename VectorField_T >
 class AdvectionDiffusionSweep< LM_AdvDiff, VelocityAdapter_T, FlagField_T, VectorField_T,
diff --git a/tests/python_coupling/FieldExportTest.cpp b/tests/python_coupling/FieldExportTest.cpp
index adca434d8a6fc9849ac4a26e3d2f7e934e65e635..119b599a6cf26b3a48deb209e416ab3aeab614d7 100644
--- a/tests/python_coupling/FieldExportTest.cpp
+++ b/tests/python_coupling/FieldExportTest.cpp
@@ -95,18 +95,18 @@ int main( int argc, char ** argv )
       auto vec3Field = blockIt->getData<GhostLayerField<Vector3<int>,1 > >( vec3FieldID );
 
       {
-         forAllCells2(scaIt, sca2Field, vecIt, vec2Field) {
+         WALBERLA_FOR_ALL_CELLS(scaIt, sca2Field, vecIt, vec2Field,
             WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]);
             WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]);
-         }
+			)
       }
 
       {
-         forAllCells2(scaIt, sca3Field, vecIt, vec3Field) {
+		  WALBERLA_FOR_ALL_CELLS(scaIt, sca3Field, vecIt, vec3Field,
             WALBERLA_ASSERT_EQUAL(scaIt[0], (*vecIt)[0]);
             WALBERLA_ASSERT_EQUAL(scaIt[1], (*vecIt)[1]);
             WALBERLA_ASSERT_EQUAL(scaIt[2], (*vecIt)[2]);
-         }
+			)
       }
    }