diff --git a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
index ea83552cba47f36c087390010e77d0fac41934d1..c25adf479425be4ee7625c98cab2a3bf7557ce03 100644
--- a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
+++ b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
@@ -31,7 +31,7 @@
 #include <functional>
 #include <memory>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using namespace walberla::timing;
 
@@ -248,3 +248,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/01_BlocksAndFields.cpp b/apps/tutorials/basics/01_BlocksAndFields.cpp
index 8b54bf73752b99036b0fa302479e05e6e7ba55a3..670d557d634480a5203fdc46a8fd0cbf21c3e6dd 100644
--- a/apps/tutorials/basics/01_BlocksAndFields.cpp
+++ b/apps/tutorials/basics/01_BlocksAndFields.cpp
@@ -24,7 +24,7 @@
 #include "gui/Gui.h"
 #include "timeloop/SweepTimeloop.h"
 
-using namespace walberla;
+namespace walberla {
 
 Field<real_t, 1>* createFields(IBlock* const block, StructuredBlockStorage * const storage) {
    return new Field<real_t,1>(storage->getNumberOfXCells(*block),
@@ -53,3 +53,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/02_Sweeps.cpp b/apps/tutorials/basics/02_Sweeps.cpp
index 95c0cf1abc238e0015c9d2cc7fd175946e8894bc..24bdffce6fed3de325e6dbd50cad52043049907a 100644
--- a/apps/tutorials/basics/02_Sweeps.cpp
+++ b/apps/tutorials/basics/02_Sweeps.cpp
@@ -27,7 +27,7 @@
 #include <functional>
 
 
-using namespace walberla;
+namespace walberla {
 
 // some arbitrary value for our bogus algorithm
 const int ARBITRARY_VALUE = 424242;
@@ -138,3 +138,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/03_GameOfLife.cpp b/apps/tutorials/basics/03_GameOfLife.cpp
index b2ad74da077c84e74ae4f177b000af076e143d75..92cc1146bdedf42b85c5481c0bc6166a401701cb 100644
--- a/apps/tutorials/basics/03_GameOfLife.cpp
+++ b/apps/tutorials/basics/03_GameOfLife.cpp
@@ -37,7 +37,7 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 
 class GameOfLifeSweep
@@ -217,3 +217,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/01_BasicLBM.cpp b/apps/tutorials/lbm/01_BasicLBM.cpp
index 0b5b4cb3b0e5f9ad3d33e8ed9629896e353d3479..0633ec00126f66ecc8ab4d6bbce258b8757d63e5 100644
--- a/apps/tutorials/lbm/01_BasicLBM.cpp
+++ b/apps/tutorials/lbm/01_BasicLBM.cpp
@@ -31,7 +31,7 @@
 
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef lbm::D2Q9< lbm::collision_model::SRT >  LatticeModel_T;
 typedef LatticeModel_T::Stencil                 Stencil_T;
@@ -120,3 +120,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
index 29cc925d16145df3574b0e83e570b45c8177f796..8478a086a52b3b22e2b8ea52ee179d8e84ee91af 100644
--- a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
+++ b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
@@ -30,7 +30,7 @@
 
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef lbm::D2Q9< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant >  LatticeModel_T;
 
@@ -641,3 +641,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
index bf86b74385c214639c0502ff4fadd741e39da90a..6327603fbddaaecb8e7ae71f277f645ee3cfa870 100644
--- a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
+++ b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
@@ -57,8 +57,7 @@
 // USING //
 ///////////
 
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
 
 //////////////
 // TYPEDEFS //
@@ -416,3 +415,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/01_SolvingPDE.cpp b/apps/tutorials/pde/01_SolvingPDE.cpp
index 9b059484d578881036ea75e9763122cfe93434df..261a44b4d01583cb0c548483b51e63b6a9dc8a6b 100644
--- a/apps/tutorials/pde/01_SolvingPDE.cpp
+++ b/apps/tutorials/pde/01_SolvingPDE.cpp
@@ -36,7 +36,7 @@
 #include <vector>
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef GhostLayerField<real_t,1> ScalarField;
 typedef stencil::D2Q5 Stencil_T;
@@ -296,3 +296,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   walberla::main(argc, argv);
+}
diff --git a/apps/tutorials/pde/02_HeatEquation.cpp b/apps/tutorials/pde/02_HeatEquation.cpp
index f4f42560b041a3c2983ac9950184377153e95bbc..0f4e00285c1ce5c13149fea3199240d0096d4c72 100644
--- a/apps/tutorials/pde/02_HeatEquation.cpp
+++ b/apps/tutorials/pde/02_HeatEquation.cpp
@@ -39,7 +39,7 @@
 #include <cmath>
 
 
-using namespace walberla;
+namespace walberla {
 
 
 typedef GhostLayerField<real_t,1> ScalarField;
@@ -250,3 +250,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
index b34e3bbd341f0530c0f68371609de96b6a554484..40e60a05162b0201794ed4adad1ed67fcbf309f5 100644
--- a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
+++ b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
@@ -40,7 +40,7 @@
 #include <cmath>
 
 
-using namespace walberla;
+namespace walberla {
 
 
 typedef GhostLayerField<real_t,1> ScalarField;
@@ -347,3 +347,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index c33b26d4b55b1fc40c29827685c10443a2db8ab2..27507f9ed18df19943c08a350254ac7feb47f7dc 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -27,7 +27,7 @@
 #include <core/logging/Logging.h>
 //! [Includes]
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 //! [BodyTypeTuple]
@@ -161,3 +161,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cpp b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
index f0e4edc205c368ad609c2683a652defcadc8f5f7..2e0ed571fb831be83584b7ff6b6e2d6c9aa70923 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cpp
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
@@ -35,7 +35,7 @@
 
 #include <functional>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using namespace walberla::timing;
 using namespace walberla::pe::raytracing;
@@ -294,3 +294,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/blockforest/DeterministicCreation.cpp b/tests/blockforest/DeterministicCreation.cpp
index b50dc5344cb3586c8e9b0ed38e68fa11f51b355d..d43582255c6899d8ec15d585d8de7bcce198908e 100644
--- a/tests/blockforest/DeterministicCreation.cpp
+++ b/tests/blockforest/DeterministicCreation.cpp
@@ -24,7 +24,7 @@
 #include "core/logging/Logging.h"
 #include "core/mpi/Environment.h"
 
-using namespace walberla;
+namespace walberla{
 
 void TwoBlockForestsTest()
 {
@@ -75,3 +75,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char** argv )
+{
+   return walberla::main(argc,argv);
+}
\ No newline at end of file
diff --git a/tests/blockforest/SaveLoadTest.cpp b/tests/blockforest/SaveLoadTest.cpp
index 11ab5d06b78ee4ad4e860056f77b9e79d7b5a701..677d7531cf4254694cb98189021014f9c344ec9f 100644
--- a/tests/blockforest/SaveLoadTest.cpp
+++ b/tests/blockforest/SaveLoadTest.cpp
@@ -26,7 +26,7 @@
 
 #include "core/debug/TestSubsystem.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::blockforest;
 
 void blockForestSaveLoadTest(const BlockForest::FileIOMode ioMode, const bool broadcast)
@@ -120,3 +120,10 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc,argv);
+}
diff --git a/tests/blockforest/communication/GhostLayerCommTest.cpp b/tests/blockforest/communication/GhostLayerCommTest.cpp
index 72e307c725af25bd0772f603148d211d0d093a3c..df97936c4f95c3eb98c0ab167c38186c93ebfd5b 100644
--- a/tests/blockforest/communication/GhostLayerCommTest.cpp
+++ b/tests/blockforest/communication/GhostLayerCommTest.cpp
@@ -40,7 +40,7 @@
 #include <iostream>
 
 
-using namespace walberla;
+namespace walberla {
 namespace wlb = walberla;
 
 typedef GhostLayerField<real_t,19> PdfField;
@@ -269,8 +269,14 @@ int main(int argc, char **argv)
 
 
    timeLoop.run();
+
+   return EXIT_SUCCESS;
+}
 }
 
+int main(int argc, char **argv) {
+  return walberla::main(argc, argv);
+}
 
 
 
diff --git a/tests/core/mpi/ProbeVsExtraMessage.cpp b/tests/core/mpi/ProbeVsExtraMessage.cpp
index d05f2c8750b6d6e6fe9895912a590d1774b63c51..a6d3377437c4df849bac98d4a3631065dd355d12 100644
--- a/tests/core/mpi/ProbeVsExtraMessage.cpp
+++ b/tests/core/mpi/ProbeVsExtraMessage.cpp
@@ -30,7 +30,7 @@
 #include <iostream>
 #include <sstream>
 
-using namespace walberla;
+namespace walberla {
 
 int getProcToReceiveFrom()
 {
@@ -208,3 +208,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/core/timing/SweepTimeloopTimerReduction.cpp b/tests/core/timing/SweepTimeloopTimerReduction.cpp
index f05b224e1f164b5991f8deb44370c450c05a6e0e..7fcc4f17fe05ca2cf82cf45a20b787f5a5d6f0d1 100644
--- a/tests/core/timing/SweepTimeloopTimerReduction.cpp
+++ b/tests/core/timing/SweepTimeloopTimerReduction.cpp
@@ -36,45 +36,42 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
-
-
-void dummySweep ( IBlock * block )
+void dummySweep ( walberla::IBlock * block )
 {
    WALBERLA_LOG_DEVEL("DummySweep on block " << block );
 }
 
 int main( int argc, char ** argv )
 {
-   debug::enterTestMode();
+   walberla::debug::enterTestMode();
    walberla::Environment walberlaEnv( argc, argv );
 
    // 9 processes and 8 blocks:   one process does not have a block
-   WALBERLA_CHECK_EQUAL( MPIManager::instance()->numProcesses(), 9 );
+   WALBERLA_CHECK_EQUAL( walberla::MPIManager::instance()->numProcesses(), 9 );
 
-   using namespace blockforest;
+   using namespace walberla::blockforest;
 
    SetupBlockForest sforest;
    sforest.addWorkloadMemorySUIDAssignmentFunction( uniformWorkloadAndMemoryAssignment );
-   sforest.init( AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
+   sforest.init( walberla::AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
 
    // calculate process distribution
    const memory_t memoryLimit = 1;
 
    GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig( false, false, uniformFacesDominantCommunication );
-   sforest.calculateProcessDistribution_Default( uint_c( MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
-   MPIManager::instance()->useWorldComm();
+   sforest.calculateProcessDistribution_Default( walberla::uint_c( walberla::MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
+   walberla::MPIManager::instance()->useWorldComm();
 
    // create StructuredBlockForest (encapsulates a newly created BlockForest)
-   auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, true ) );
-   auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, 10, 10, 10 ) );
+   auto bf = walberla::shared_ptr< BlockForest >( new BlockForest( walberla::uint_c( walberla::MPIManager::instance()->rank() ), sforest, true ) );
+   auto sbf = walberla::shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, 10, 10, 10 ) );
    sbf->createCellBoundingBoxes();
 
 
-   SweepTimeloop tl( sbf, 1 );
-   tl.add() << Sweep( dummySweep, "DummySweep" );
+   walberla::SweepTimeloop tl( sbf, 1 );
+   tl.add() << walberla::Sweep( dummySweep, "DummySweep" );
 
-   WcTimingPool timingPool;
+   walberla::WcTimingPool timingPool;
    tl.run( timingPool );
 
    timingPool.logResultOnRoot();
diff --git a/tests/core/timing/TimingPoolTest.cpp b/tests/core/timing/TimingPoolTest.cpp
index ca30ca0134b50fae471de03752386748893365a2..11f5f5b88562e3ecc883330e1602e1aae1cc3d27 100644
--- a/tests/core/timing/TimingPoolTest.cpp
+++ b/tests/core/timing/TimingPoolTest.cpp
@@ -28,7 +28,7 @@
 #include <iostream>
 
 
-using namespace walberla;
+namespace walberla {
 
 using std::cout;
 using std::endl;
@@ -178,17 +178,18 @@ void merging()
    pool1.merge( pool2, true );
    WALBERLA_CHECK_EQUAL ( pool1["test"].getCounter(), 6 );
 }
+}// namespace walberla
 
 
 int main( int argc, char ** argv )
 {
-   debug::enterTestMode();
-   MPIManager::instance()->initializeMPI( &argc, &argv );
+   walberla::debug::enterTestMode();
+   walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
 
-   simpleTiming();
-   scopedTimer();
-   reduction();
-   merging();
+   walberla::simpleTiming();
+   walberla::scopedTimer();
+   walberla::reduction();
+   walberla::merging();
 
    return 0;
 }
diff --git a/tests/core/timing/TimingTreeTest.cpp b/tests/core/timing/TimingTreeTest.cpp
index 74fa27e046074df0d4eb5923e0e0705545046854..f0f1dc20726b6d08a7de9a3228c02089ac9a67ce 100644
--- a/tests/core/timing/TimingTreeTest.cpp
+++ b/tests/core/timing/TimingTreeTest.cpp
@@ -27,24 +27,22 @@
 
 #include <iostream>
 
-using namespace walberla;
-
 void mssleep(unsigned int ms)
 {
-   timing::StaticPolicy::addTime( ms * 1e-3);
+   walberla::timing::StaticPolicy::addTime( ms * 1e-3);
 }
 
 int main( int argc, char ** argv )
 {
-   debug::enterTestMode();
+   walberla::debug::enterTestMode();
 
-   mpi::Environment mpiEnv(argc, argv);
+   walberla::mpi::Environment mpiEnv(argc, argv);
    WALBERLA_UNUSED( mpiEnv );
 
-   const unsigned int rank = static_cast<unsigned int> ( MPIManager::instance()->worldRank() );
+   const unsigned int rank = static_cast<unsigned int> ( walberla::MPIManager::instance()->worldRank() );
 
-   timing::TimingTree<timing::StaticPolicy> tt;
-   timing::StaticPolicy::setTime(0);
+   walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt;
+   walberla::timing::StaticPolicy::setTime(0);
 
    tt.start("A");
    mssleep(100 * rank);
@@ -76,9 +74,9 @@ int main( int argc, char ** argv )
    WALBERLA_ASSERT(!tt.timerExists("A.AA.C"));
 
    // check copy constructor
-   timing::TimingTree<timing::StaticPolicy> tt2(tt);
+   walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt2(tt);
    // check assignment operator
-   timing::TimingTree<timing::StaticPolicy> tt3;
+   walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt3;
    tt3 = tt;
 
    WALBERLA_ASSERT(tt2.timerExists("A"));
@@ -97,10 +95,10 @@ int main( int argc, char ** argv )
    WALBERLA_ASSERT(!tt3.timerExists("AAC"));
    WALBERLA_ASSERT(!tt3.timerExists("A.AA.C"));
 
-   tt2 = tt.getReduced( timing::REDUCE_TOTAL, 0 );
-   tt2 = tt.getReduced( timing::REDUCE_TOTAL, 1 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 0 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 1 );
 
-   tt2 = tt.getReduced( timing::REDUCE_MIN, -1 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_MIN, -1 );
    {
    const auto& data = tt2.getRawData();
    WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -109,7 +107,7 @@ int main( int argc, char ** argv )
    WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
    }
 
-   tt2 = tt.getReduced( timing::REDUCE_MAX, -1 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_MAX, -1 );
    {
    const auto& data = tt2.getRawData();
    WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -118,7 +116,7 @@ int main( int argc, char ** argv )
    WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
    }
 
-   tt2 = tt.getReduced( timing::REDUCE_AVG, -1 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_AVG, -1 );
    {
    const auto& data = tt2.getRawData();
    WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -127,7 +125,7 @@ int main( int argc, char ** argv )
    WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
    }
 
-   tt2 = tt.getReduced( timing::REDUCE_TOTAL, -1 );
+   tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, -1 );
    {
    const auto& data = tt2.getRawData();
    WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
diff --git a/tests/domain_decomposition/PeriodicIntersect.cpp b/tests/domain_decomposition/PeriodicIntersect.cpp
index be1bd3f53f9487fc8b065f2b58dc00fecf8cde4b..6753c472eafefc73fda0d2492f683a5ff0c90038 100644
--- a/tests/domain_decomposition/PeriodicIntersect.cpp
+++ b/tests/domain_decomposition/PeriodicIntersect.cpp
@@ -31,7 +31,7 @@
 #include "stencil/D3Q27.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 bool periodicCheck( StructuredBlockForest& forest, const math::AABB& box1, const math::AABB& box2)
 {
@@ -194,3 +194,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/FieldGatherTest.cpp b/tests/field/FieldGatherTest.cpp
index 8f6645b03e8afd692029f51847e564cd6e32d228..5e0aacc5796a9aa5a92e94725ecb8c85176da4a9 100644
--- a/tests/field/FieldGatherTest.cpp
+++ b/tests/field/FieldGatherTest.cpp
@@ -28,7 +28,7 @@
 #include "field/AddToStorage.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 
 int main( int argc, char ** argv )
@@ -82,3 +82,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc,argv);
+}
diff --git a/tests/field/FieldMPIDatatypesTest.cpp b/tests/field/FieldMPIDatatypesTest.cpp
index 3328c1bd72c222d404c589041a9866fd2a8e33f3..0eba715567a53e2edd773b05344d7453978d5602 100644
--- a/tests/field/FieldMPIDatatypesTest.cpp
+++ b/tests/field/FieldMPIDatatypesTest.cpp
@@ -35,12 +35,9 @@
 
 #include <random>
 
-namespace mpi_datatypes_test {
+namespace walberla {
 
-using namespace walberla;
 using namespace field::communication;
-using walberla::real_t;
-using walberla::uint_t;
 
 class FieldRandomizer
 {
@@ -549,16 +546,10 @@ int main( int argc, char* argv[] )
 
    return EXIT_SUCCESS;
 }
-
-
-
-
-
-} // namespace mpi_datatypes_test
-
+} // namespace walberla
 
 
 int main( int argc, char* argv[] )
 {
-   return mpi_datatypes_test::main( argc, argv );
+   return walberla::main( argc, argv );
 }
diff --git a/tests/field/FieldTiming.cpp b/tests/field/FieldTiming.cpp
index 5e8fd340756e899de7c9c0c6ca2e725682c60bb8..98271eec2d197428650cfc98aff1fb4454522906 100644
--- a/tests/field/FieldTiming.cpp
+++ b/tests/field/FieldTiming.cpp
@@ -30,7 +30,8 @@
 #include <sstream>
 
 
-using namespace walberla;
+namespace walberla {
+
 using namespace field;
 
 using std::cout;
@@ -263,4 +264,11 @@ int main(int argc, char ** argv)
    ofstream of ( fileName.str().c_str() );
    of << "size = [ " << xs << "," << ys << "," << zs <<"];" << endl;
    tp.printMatlab( of );
+
+   return EXIT_SUCCESS;
+}
+}
+
+int main(int argc, char** argv){
+   return walberla::main(argc, argv);
 }
diff --git a/tests/field/adaptors/AdaptorTest.cpp b/tests/field/adaptors/AdaptorTest.cpp
index 028b8db3fe9ef0de471feb30c14c2e5ed9e0effa..bcfc43efd4e9581ee86da4cc9982b7bbfb97ab35 100644
--- a/tests/field/adaptors/AdaptorTest.cpp
+++ b/tests/field/adaptors/AdaptorTest.cpp
@@ -41,7 +41,7 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef lbm::D3Q19< lbm::collision_model::SRT >  LatticeModel_T;
 
@@ -167,4 +167,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+}
 
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
diff --git a/tests/field/communication/FieldPackInfoTest.cpp b/tests/field/communication/FieldPackInfoTest.cpp
index d7b94789b8699ffd1b659b9cfdc192ac3fdac4c0..4b48e8f478d4fb89139f0a48a7f6fdb33da0d0bb 100644
--- a/tests/field/communication/FieldPackInfoTest.cpp
+++ b/tests/field/communication/FieldPackInfoTest.cpp
@@ -34,7 +34,7 @@
 #include <cstring>
 
 
-using namespace walberla;
+namespace walberla {
 
 
 void testScalarField( IBlock * block, BlockDataID fieldId )
@@ -185,3 +185,9 @@ int main(int argc, char **argv)
 
    return 0;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/distributors/DistributionTest.cpp b/tests/field/distributors/DistributionTest.cpp
index 4d0e4f644d153c055c9d61c0648568a13df94eb0..3b9a693982efb6526b845d188628c3d2d3355155 100644
--- a/tests/field/distributors/DistributionTest.cpp
+++ b/tests/field/distributors/DistributionTest.cpp
@@ -32,10 +32,10 @@
 
 #include <vector>
 
-using namespace walberla;
-
 namespace distribution_tests {
 
+using namespace walberla;
+
 const uint_t FieldGhostLayers( 1 );
 
 typedef walberla::uint8_t                    flag_t;
diff --git a/tests/field/interpolators/FieldInterpolationTest.cpp b/tests/field/interpolators/FieldInterpolationTest.cpp
index 32adf2898cf57a2ccbc988d01d0f9de02c8ebfd9..a98842aec7e01f92c98341701d9f28fcb5bc45e6 100644
--- a/tests/field/interpolators/FieldInterpolationTest.cpp
+++ b/tests/field/interpolators/FieldInterpolationTest.cpp
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 
 namespace field_interpolation_tests {
 
@@ -424,7 +424,8 @@ int main(int argc, char **argv) {
 }
 
 } // namespace field_interpolation_tests
+}
 
 int main( int argc, char **argv ){
-   field_interpolation_tests::main(argc, argv);
+   walberla::field_interpolation_tests::main(argc, argv);
 }
\ No newline at end of file
diff --git a/tests/gather/CurveGatherTest.cpp b/tests/gather/CurveGatherTest.cpp
index 1697fd4476908d0bf8cfcd70cf481883e883a0c3..362ea0fba6f4f097cec3de0908c6165d64f42018 100644
--- a/tests/gather/CurveGatherTest.cpp
+++ b/tests/gather/CurveGatherTest.cpp
@@ -37,7 +37,7 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef GhostLayerField<real_t,1> GlField;
 
@@ -103,3 +103,9 @@ int main( int argc, char ** argv )
 
    return 0;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/GatherSchemeTest.cpp b/tests/gather/GatherSchemeTest.cpp
index d1904ed017102bce6c875d839008055e5613ef13..3c1b63868f225b007c6d23bc673078bf5008784f 100644
--- a/tests/gather/GatherSchemeTest.cpp
+++ b/tests/gather/GatherSchemeTest.cpp
@@ -36,7 +36,7 @@
 #include <iostream>
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef GhostLayerField<cell_idx_t, 1> ScalarField;
 
@@ -190,3 +190,9 @@ int main(int argc, char ** argv )
    }
    return 0;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/MPIGatherSchemeTest.cpp b/tests/gather/MPIGatherSchemeTest.cpp
index 2d9189b4037be60a60862411c16e0053efa853a0..1bc3f7de095adf9d452fc9ab584536238e0e4778 100644
--- a/tests/gather/MPIGatherSchemeTest.cpp
+++ b/tests/gather/MPIGatherSchemeTest.cpp
@@ -34,8 +34,7 @@
 #include "core/mpi/MPIManager.h"
 
 
-using namespace walberla;
-
+namespace walberla {
 
 class TestGatherPackInfo : public gather::GatherPackInfo
 {
@@ -87,7 +86,7 @@ public:
 private:
    std::set<int> receivedRanks_;
 };
-
+}// namespace walberla
 
 
 
@@ -95,12 +94,12 @@ int main( int argc, char ** argv )
 {
    walberla::Environment env( argc, argv );
 
-   debug::enterTestMode();
+   walberla::debug::enterTestMode();
 
-   uint_t numProcesses = uint_c( MPIManager::instance()->numProcesses() );
+   walberla::uint_t numProcesses = walberla::uint_c( walberla::MPIManager::instance()->numProcesses() );
    WALBERLA_CHECK( numProcesses >= 2 );
 
-   using blockforest::createUniformBlockGrid;
+   using walberla::blockforest::createUniformBlockGrid;
    auto blocks = createUniformBlockGrid( numProcesses, 1, 1,
                                          1, 1, 1,
                                          1,
@@ -108,8 +107,8 @@ int main( int argc, char ** argv )
                                          false, false, false, // periodicity
                                          false );             // do NOT keep global information
 
-   gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
-   gatherScheme.addPackInfo( make_shared<TestGatherPackInfo>() );
+   walberla::gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
+   gatherScheme.addPackInfo( walberla::make_shared<walberla::TestGatherPackInfo>() );
 
    for(int i=0; i<3; ++i )
       gatherScheme();
diff --git a/tests/geometry/ScalarFieldFromBodyTest.cpp b/tests/geometry/ScalarFieldFromBodyTest.cpp
index 2e9beccc96240b7b54dc7da40de74234de832448..095f411e392708312c656d90b3ae2231d7d3b2a5 100644
--- a/tests/geometry/ScalarFieldFromBodyTest.cpp
+++ b/tests/geometry/ScalarFieldFromBodyTest.cpp
@@ -40,9 +40,8 @@
 #include <fstream>
 
 
-using namespace walberla;
+namespace walberla {
 using namespace geometry;
-using walberla::uint8_t;
 
 const uint_t confBlockCount []      = { 1, 1, 1 };
 const uint_t confCells []           = { 30, 30, 30 };
@@ -287,4 +286,11 @@ int main( int argc, char ** argv )
       gui.run();
    }
 
+  return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
index cbdb1bf6547b10b0b4cbff5e7ff5382e55b98ddf..ec63490c6e250abbb18a956c7159ceaddd243f36 100644
--- a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
+++ b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
@@ -37,9 +37,8 @@
 #include <fstream>
 
 
-using namespace walberla;
+namespace walberla {
 using namespace geometry;
-using walberla::uint8_t;
 
 const uint_t confBlockCount []      = { 1, 1, 1 };
 const uint_t confCells []           = { 30, 30, 30 };
@@ -97,4 +96,10 @@ int main( int argc, char ** argv )
       gui.run();
    }
 
+   return EXIT_SUCCESS;
+}
+}
+
+int main( int argc, char ** argv ){
+   return walberla::main(argc, argv);
 }
diff --git a/tests/gui/GuiPdfView.cpp b/tests/gui/GuiPdfView.cpp
index fcabb5a7ebab2d13161bfcd4bbbbcec6bd5ba56c..e09f74f8d8993966b287f44a1ae3698bc190dd82 100644
--- a/tests/gui/GuiPdfView.cpp
+++ b/tests/gui/GuiPdfView.cpp
@@ -34,8 +34,7 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
-using namespace blockforest;
+namespace walberla {
 
 
 typedef GhostLayerField<real_t,19> PdfField;
@@ -53,11 +52,11 @@ int main(int argc, char **argv)
    const uint_t nrOfTimeSteps = 20;
 
    // Create BlockForest
-   auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2],  //blocks
-                                        cells[0],cells[1],cells[2], //cells
-                                        1,                          //dx
-                                        false,                      //one block per process
-                                        true,true,true);            //periodicity
+   auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2],  //blocks
+                                                     cells[0],cells[1],cells[2], //cells
+                                                     1,                          //dx
+                                                     false,                      //one block per process
+                                                     true,true,true);            //periodicity
 
 
    // In addition to the normal GhostLayerField's  we allocated additionally a field containing the whole global simulation domain for each block
@@ -83,10 +82,11 @@ int main(int argc, char **argv)
    GUI gui (timeloop, blocks, argc, argv);
    gui.run();
    //timeloop.singleStep();
+   return EXIT_SUCCESS;
 }
+} // namespace walberla
 
-
-
-
-
-
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gui/SimpleGuiRun.cpp b/tests/gui/SimpleGuiRun.cpp
index 54b8a6a8d57a6dda55be00585fbec31787f4e48a..c04272d4eea56a047ef377ab1961a4add6d3c461 100644
--- a/tests/gui/SimpleGuiRun.cpp
+++ b/tests/gui/SimpleGuiRun.cpp
@@ -41,9 +41,7 @@
 #include "timeloop/SweepTimeloop.h"
 
 
-using namespace walberla;
-using namespace blockforest;
-
+namespace walberla {
 
 typedef GhostLayerField<real_t,19> PdfField;
 typedef GhostLayerField<real_t,1>  ScalarField;
@@ -62,7 +60,7 @@ int main(int argc, char **argv )
    const uint_t nrOfTimeSteps = 20;
 
    // Create BlockForest
-   auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2],  //blocks
+   auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2],  //blocks
                                         cells[0],cells[1],cells[2], //cells
                                         1,                          //dx
                                         false,                      //one block per process
@@ -143,9 +141,14 @@ int main(int argc, char **argv )
    lbm::connectToGui<LatticeModel>( gui );
    gui.run();
    //timeloop.singleStep();
+   return EXIT_SUCCESS;
 }
+}// namespace walberla
 
 
+int main(int argc, char **argv){
+  return walberla::main( argc, argv );
+}
 
 
 
diff --git a/tests/lbm/BoundaryHandlingCommunication.cpp b/tests/lbm/BoundaryHandlingCommunication.cpp
index 975f4bf0b3d5ec06fee9ee803653ca4bae4f6148..d8e3a7c82f4fbdbacbb15652b5006cb61e2fc474 100644
--- a/tests/lbm/BoundaryHandlingCommunication.cpp
+++ b/tests/lbm/BoundaryHandlingCommunication.cpp
@@ -63,8 +63,7 @@
 #endif
 
 
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
 
 typedef walberla::uint8_t   flag_t;
 typedef FlagField< flag_t > FlagField_T;
@@ -399,3 +398,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/lbm/Poiseuille.cpp b/tests/lbm/Poiseuille.cpp
index 5e56138fe75b24a278d201d9af3a15226e76582b..7f74d5eac669b7f9d9732386cebccb9e74fcf1df 100644
--- a/tests/lbm/Poiseuille.cpp
+++ b/tests/lbm/Poiseuille.cpp
@@ -86,9 +86,7 @@
 #include <iostream>
 #include <vector>
 
-
-using namespace walberla;
-
+namespace walberla {
 
 typedef walberla::uint8_t                   flag_t;
 
@@ -390,6 +388,9 @@ int main( int argc, char** argv )
    */
    return 0;
 }
+} // namespace walberla
 
-
-
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/SweepEquivalenceTest.cpp b/tests/lbm/SweepEquivalenceTest.cpp
index 52f1f35ee2edfa9ea23302fc02a251861bd0e1df..e29bab05f4a4a503cd5322f92b5ffeb0a0697b7e 100644
--- a/tests/lbm/SweepEquivalenceTest.cpp
+++ b/tests/lbm/SweepEquivalenceTest.cpp
@@ -70,8 +70,7 @@
 
 
 
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
 
 typedef walberla::uint64_t   flag_t;
 typedef FlagField< flag_t >  FlagField_T;
@@ -864,3 +863,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/evaluations/PermeabilityTest.cpp b/tests/lbm/evaluations/PermeabilityTest.cpp
index 998efb953ec5bb3cb022947c281fbfc5058cde36..9188fd04deed4fd4a8724f2822cdf7cde9d2bfe3 100644
--- a/tests/lbm/evaluations/PermeabilityTest.cpp
+++ b/tests/lbm/evaluations/PermeabilityTest.cpp
@@ -28,7 +28,7 @@
 #include "timeloop/all.h"
 
 
-using namespace walberla;
+namespace walberla {
 
 typedef walberla::uint8_t   flag_t;
 typedef FlagField< flag_t > FlagField_T;
@@ -301,3 +301,9 @@ int main( int argc, char ** argv )
       WALBERLA_ABORT( "Unexpected error: " << e.what() << "! Aborting ..." );
    }
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
diff --git a/tests/lbm/initializer/PdfFieldInitializerTest.cpp b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
index 2ecdb5e4110e698342435c43b36ce21cec32a33f..282fbd689b199af9ea72a342bcdd18f7f1f78c7c 100644
--- a/tests/lbm/initializer/PdfFieldInitializerTest.cpp
+++ b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
@@ -30,7 +30,7 @@
 #include <sstream>
 
 
-using namespace walberla;
+namespace walberla {
 
 
 typedef lbm::D3Q19< lbm::collision_model::SRT >                 LatticeModel_T;
@@ -249,4 +249,10 @@ int main( int argc, char ** argv )
    testDensityAndVelocityInitFromConfig( pdfFieldId, blocks, env.config(), false );
 
    return 0;
+}
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
 }
\ No newline at end of file
diff --git a/tests/lbm/refinement/CommunicationEquivalence.cpp b/tests/lbm/refinement/CommunicationEquivalence.cpp
index 6cd232235ec3695c4e0bae3ac14abc11b373b390..9b14c143011edf3bf5776f821a98fc25dcca597a 100644
--- a/tests/lbm/refinement/CommunicationEquivalence.cpp
+++ b/tests/lbm/refinement/CommunicationEquivalence.cpp
@@ -63,14 +63,7 @@
 enum TestMode { ENTIRE_TOP, TOP, MIDDLE, ENTIRE_BOTTOM };
 static const TestMode testMode = TOP;
 
-
-
-///////////
-// USING //
-///////////
-
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
 
 //////////////
 // TYPEDEFS //
@@ -494,3 +487,9 @@ int main( int argc, char ** argv )
    
    return EXIT_SUCCESS;
 }
+}
+
+int main( int argc, char ** argv )
+{
+   return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/pde/CGTest.cpp b/tests/pde/CGTest.cpp
index ecc51857d222721d217d267554d5ab817517f19d..b3619d157f2d7b1ebc608c660c1d04ff072d8001 100644
--- a/tests/pde/CGTest.cpp
+++ b/tests/pde/CGTest.cpp
@@ -43,7 +43,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -203,3 +203,9 @@ int main( int argc, char** argv )
    logging::Logging::printFooterOnStream();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/JacobiTest.cpp b/tests/pde/JacobiTest.cpp
index 5d048c3638fcf3dabf7ebd69980e728559244c3b..22376f9b96f73da577e26139d0db87a811b9d310 100644
--- a/tests/pde/JacobiTest.cpp
+++ b/tests/pde/JacobiTest.cpp
@@ -46,7 +46,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
    logging::Logging::printFooterOnStream();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGConvergenceTest.cpp b/tests/pde/MGConvergenceTest.cpp
index 0716c841c86ada98ffd584789d67ab2fe841f082..56065b48af288bd347693820d7b909ebd672b2f4 100644
--- a/tests/pde/MGConvergenceTest.cpp
+++ b/tests/pde/MGConvergenceTest.cpp
@@ -44,7 +44,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -506,3 +506,9 @@ int main( int argc, char** argv )
    return EXIT_SUCCESS;
 }
 //**********************************************************************************************************************
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGTest.cpp b/tests/pde/MGTest.cpp
index fa08a2bf8a08a5b6df3006fe842c032a90d38f43..648d83b3869f90eb60619ed61859c424d63f0e4c 100644
--- a/tests/pde/MGTest.cpp
+++ b/tests/pde/MGTest.cpp
@@ -45,7 +45,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -293,4 +293,9 @@ int main( int argc, char** argv )
    logging::Logging::printFooterOnStream();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
 
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/RBGSTest.cpp b/tests/pde/RBGSTest.cpp
index b65245d4755120f3fccc89745819b3279f2ff807..f289a4ca845b15874265de4abbfcc8f0baee4ad7 100644
--- a/tests/pde/RBGSTest.cpp
+++ b/tests/pde/RBGSTest.cpp
@@ -46,7 +46,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
    logging::Logging::printFooterOnStream();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/SORTest.cpp b/tests/pde/SORTest.cpp
index cf9f6f02470fcc6c35a0e0e49b306679cf9d95bc..46f55ea94ac9a71b627434523f8e2e58ffe4e0f1 100644
--- a/tests/pde/SORTest.cpp
+++ b/tests/pde/SORTest.cpp
@@ -46,7 +46,7 @@
 
 #include <cmath>
 
-using namespace walberla;
+namespace walberla {
 
 
 
@@ -212,3 +212,9 @@ int main( int argc, char** argv )
    logging::Logging::printFooterOnStream();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyFlags.cpp b/tests/pe/BodyFlags.cpp
index db7e82ce8f6b3c4890ffb3949bbe5fba7b3dcc4f..0c39b0d43634d910ecb9b042d8ad4f55830d1ec8 100644
--- a/tests/pe/BodyFlags.cpp
+++ b/tests/pe/BodyFlags.cpp
@@ -34,9 +34,8 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef boost::tuple<Sphere> BodyTuple ;
 
@@ -127,3 +126,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyIterators.cpp b/tests/pe/BodyIterators.cpp
index 0dbfcc53cbeb966e45afd28e7fdbb1d36294e8ce..232378417a58d54f5359eebdae3dc590f903210c 100644
--- a/tests/pe/BodyIterators.cpp
+++ b/tests/pe/BodyIterators.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -150,3 +150,9 @@ int main( int argc, char **argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Collision.cpp b/tests/pe/Collision.cpp
index bd77d39c049c6fd6dc3ec7ad7c629f159afa2615..c69ac6b06a9e5b421e85924f5799426c41f17381 100644
--- a/tests/pe/Collision.cpp
+++ b/tests/pe/Collision.cpp
@@ -39,7 +39,7 @@
 #include "core/DataTypes.h"
 #include "core/math/Vector2.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using walberla::pe::fcd::analytic::collide;
 
@@ -271,3 +271,9 @@ int main( int argc, char** argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CollisionTobiasGJK.cpp b/tests/pe/CollisionTobiasGJK.cpp
index 46889c1eab92e2fb883173cb525fb324a510e00b..c6915d86dab50cf32b232ae63ee5bc12a3c9a55c 100644
--- a/tests/pe/CollisionTobiasGJK.cpp
+++ b/tests/pe/CollisionTobiasGJK.cpp
@@ -46,7 +46,7 @@
 #include "pe/collision/EPA.h"
 #include "pe/collision/GJK.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Box, Capsule, Plane, Sphere, Union<boost::tuple<Sphere>>, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>, Ellipsoid> BodyTuple ;
@@ -437,3 +437,9 @@ int main( int argc, char** argv )
    UnionTest();
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CreateWorld.cpp b/tests/pe/CreateWorld.cpp
index 6a79b5bfb59fc72618a145147c6a180c746d7d01..a31fb258434a93adf39131cec7dedf30bbdccc9b 100644
--- a/tests/pe/CreateWorld.cpp
+++ b/tests/pe/CreateWorld.cpp
@@ -28,7 +28,7 @@
 
 #include "core/debug/TestSubsystem.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -56,3 +56,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DeleteBody.cpp b/tests/pe/DeleteBody.cpp
index a37e73bff82f8443dc943da092bee612795d60ad..bd47954f097a0ce6fe9cb37575784135d7f1983b 100644
--- a/tests/pe/DeleteBody.cpp
+++ b/tests/pe/DeleteBody.cpp
@@ -33,7 +33,7 @@
 
 #include <functional>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -122,3 +122,9 @@ int main( int argc, char** argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DestroyBody.cpp b/tests/pe/DestroyBody.cpp
index 6233d4a91b33418d3b0326e310809d2916b2de48..ccef444fb4178095607370a93f67181528c9aed5 100644
--- a/tests/pe/DestroyBody.cpp
+++ b/tests/pe/DestroyBody.cpp
@@ -31,7 +31,7 @@
 #include "core/debug/TestSubsystem.h"
 #include "core/math/Random.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -116,3 +116,9 @@ int main( int argc, char** argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DynamicRefinement.cpp b/tests/pe/DynamicRefinement.cpp
index 0b6e0b469563c1718a09388b6f785d56f5694789..ef0266270540992cb01e67d0e40aeb8d266de3ec 100644
--- a/tests/pe/DynamicRefinement.cpp
+++ b/tests/pe/DynamicRefinement.cpp
@@ -29,7 +29,7 @@
 
 #include "core/debug/TestSubsystem.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -193,3 +193,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ForceSync.cpp b/tests/pe/ForceSync.cpp
index b97d408077ded3ce50672eddca66ff49b0bc35a0..44acba816ff7c6208ddcbb2ee52c68e8976859ba 100644
--- a/tests/pe/ForceSync.cpp
+++ b/tests/pe/ForceSync.cpp
@@ -38,9 +38,8 @@
 #include <algorithm>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
 
@@ -141,3 +140,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HCSITS.cpp b/tests/pe/HCSITS.cpp
index c5e3a2d742e0d058448270ba9e285a003df6a6b5..5b8deb15585be7ba201afb9564fb67036251186d 100644
--- a/tests/pe/HCSITS.cpp
+++ b/tests/pe/HCSITS.cpp
@@ -27,7 +27,7 @@
 
 #include "core/debug/TestSubsystem.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -183,3 +183,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HashGrids.cpp b/tests/pe/HashGrids.cpp
index 7b203cbe8e0baf7173e7d4f3ee231f2996d883b9..afefe3ce536ebbef7805c31da8bdf25e200a4151 100644
--- a/tests/pe/HashGrids.cpp
+++ b/tests/pe/HashGrids.cpp
@@ -31,7 +31,7 @@
 #include "core/debug/TestSubsystem.h"
 #include "core/math/Random.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -147,3 +147,9 @@ int main( int argc, char** argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/LoadFromConfig.cpp b/tests/pe/LoadFromConfig.cpp
index 69ccad26cceb2e37ac1bd51801a098dde157dfb8..b1d381b63588e2ad3cb829c5cd96dd5214b5e953 100644
--- a/tests/pe/LoadFromConfig.cpp
+++ b/tests/pe/LoadFromConfig.cpp
@@ -30,7 +30,7 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 int main( int argc, char ** argv )
@@ -77,3 +77,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Marshalling.cpp b/tests/pe/Marshalling.cpp
index 985269bd619ad65d799ffc62efb6524deefa82e1..a5272bfe3f695cdd065e3633ab52cbf4485da01e 100644
--- a/tests/pe/Marshalling.cpp
+++ b/tests/pe/Marshalling.cpp
@@ -34,7 +34,7 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using namespace walberla::pe::communication;
 
@@ -224,3 +224,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/MinMaxRefinement.cpp b/tests/pe/MinMaxRefinement.cpp
index 3c13d4cfbc7fc6aa974a9cb6f0688e98d813965c..34cde5d21c9f9c5ef4b2e84cb2246b9cc5c722df 100644
--- a/tests/pe/MinMaxRefinement.cpp
+++ b/tests/pe/MinMaxRefinement.cpp
@@ -47,7 +47,7 @@
 #include <limits>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -201,3 +201,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ParallelEquivalence.cpp b/tests/pe/ParallelEquivalence.cpp
index 03aac6f6fa2f73fdc69422287f9dc6e1a45504cf..5ccc4b961f82c48d0caf430d25f869763e587414 100644
--- a/tests/pe/ParallelEquivalence.cpp
+++ b/tests/pe/ParallelEquivalence.cpp
@@ -36,9 +36,8 @@
 #include <algorithm>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 int runs = 1000;
 
@@ -321,3 +320,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/PeDocumentationSnippets.cpp b/tests/pe/PeDocumentationSnippets.cpp
index 4cf46e2f8b0be31450f3900261a9e5bdcd53650d..5c9b15724b6acb01bfd348a926028c44077d684d 100644
--- a/tests/pe/PeDocumentationSnippets.cpp
+++ b/tests/pe/PeDocumentationSnippets.cpp
@@ -43,7 +43,7 @@
 #include <algorithm>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 //! [Definition of Union Types]
@@ -134,3 +134,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Raytracing.cpp b/tests/pe/Raytracing.cpp
index d214fa9c9b0c76ee0555b1668bafcc85fc2b3c55..49e4a277e5fb7223772dd43251fb7cf82bca8a22 100644
--- a/tests/pe/Raytracing.cpp
+++ b/tests/pe/Raytracing.cpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <tuple>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using namespace walberla::pe::raytracing;
 
@@ -909,4 +909,9 @@ int main( int argc, char** argv )
    
    return EXIT_SUCCESS;
 }
+} // namespace walberla
 
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Refinement.cpp b/tests/pe/Refinement.cpp
index cb64385b6b755302933c2c5a50d4988d66f1f5e9..c53907e410f91fad638e2c4270ef5109a0f221be 100644
--- a/tests/pe/Refinement.cpp
+++ b/tests/pe/Refinement.cpp
@@ -40,7 +40,7 @@
 #include <algorithm>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -186,3 +186,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/RigidBody.cpp b/tests/pe/RigidBody.cpp
index 1e73e0f8b073577370e36d19d510ba8c21521ef9..f72d9ce0b5d82597fe72a36d60744edb79f4c2d2 100644
--- a/tests/pe/RigidBody.cpp
+++ b/tests/pe/RigidBody.cpp
@@ -28,7 +28,7 @@
 
 #include "core/debug/TestSubsystem.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 void move( BodyStorage& storage, real_t dt )
@@ -170,4 +170,12 @@ int main( int argc, char** argv )
 
    checkRotationFunctions();
    checkPointFunctions();
+
+   return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SerializeDeserialize.cpp b/tests/pe/SerializeDeserialize.cpp
index 47e30000a79045a29094abbf62fa3c667538b41e..883a15242529079dc0e52f9cab1c85881ce4ab18 100644
--- a/tests/pe/SerializeDeserialize.cpp
+++ b/tests/pe/SerializeDeserialize.cpp
@@ -34,7 +34,7 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -145,3 +145,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ShadowCopy.cpp b/tests/pe/ShadowCopy.cpp
index 8c5dba7c4ad95888979f9b6c88f6109fc763d475..b04db7c36f86e62d1fa313d8b9fb0e9ad0f95fbb 100644
--- a/tests/pe/ShadowCopy.cpp
+++ b/tests/pe/ShadowCopy.cpp
@@ -31,7 +31,7 @@
 
 #include <functional>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef Union< boost::tuple<Sphere> > UnionT;
@@ -173,3 +173,9 @@ int main( int argc, char** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SimpleCCD.cpp b/tests/pe/SimpleCCD.cpp
index 20c147c693a75246d4f4434c212b34131c19c3c7..08571dce0ae31607751754e6b8a52f2337670aba 100644
--- a/tests/pe/SimpleCCD.cpp
+++ b/tests/pe/SimpleCCD.cpp
@@ -33,7 +33,7 @@
 #include "core/debug/TestSubsystem.h"
 #include "core/math/Random.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 
 typedef boost::tuple<Sphere> BodyTuple ;
@@ -107,4 +107,12 @@ int main( int argc, char** argv )
        WALBERLA_LOG_DEVEL_ON_ROOT(bs.size() << "\t" << pool["SCCD"].last() << "\t" << pool["HG"].last() << "\t" << sccd.getPossibleContacts().size() << "\t" << hg.getPossibleContacts().size() << "\t" << hg.active());
        //std::cout << pool << std::endl;
     }
+
+    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SyncEquivalence.cpp b/tests/pe/SyncEquivalence.cpp
index 6afd4f8670bc0ceeac07567021c9581516887241..a4400e0cec917a7bb10ab0874b2047c57612d8c9 100644
--- a/tests/pe/SyncEquivalence.cpp
+++ b/tests/pe/SyncEquivalence.cpp
@@ -40,7 +40,7 @@
 #include "python_coupling/CreateConfig.h"
 #include "python_coupling/PythonCallback.h"
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
 using namespace walberla::timing;
 
@@ -235,3 +235,9 @@ int main( int argc, char ** argv )
 
     return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Synchronization.cpp b/tests/pe/Synchronization.cpp
index 17d33c41be16009ad7a04fd91239f9f76ccdaaa1..f718d492f15d51f21e8fca203c51e725600dc154 100644
--- a/tests/pe/Synchronization.cpp
+++ b/tests/pe/Synchronization.cpp
@@ -33,9 +33,8 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef boost::tuple<Sphere> BodyTuple ;
 
@@ -487,3 +486,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationDelete.cpp b/tests/pe/SynchronizationDelete.cpp
index fb40078fd1e4b121b02684800cf22d7c7537a2c0..fe9cd228aa7f15b99a2ced066947d495508cb942 100644
--- a/tests/pe/SynchronizationDelete.cpp
+++ b/tests/pe/SynchronizationDelete.cpp
@@ -33,9 +33,8 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef boost::tuple<Sphere> BodyTuple ;
 
@@ -126,3 +125,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationLargeBody.cpp b/tests/pe/SynchronizationLargeBody.cpp
index 6bf99cc4700baa403698e23964c9a73139c14953..607db910fc753781cbaa11f630e2c3c048d45b07 100644
--- a/tests/pe/SynchronizationLargeBody.cpp
+++ b/tests/pe/SynchronizationLargeBody.cpp
@@ -32,9 +32,8 @@
 
 #include <boost/tuple/tuple.hpp>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef boost::tuple<Sphere> BodyTuple ;
 
@@ -253,3 +252,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Union.cpp b/tests/pe/Union.cpp
index 1a814c28a1a6a789eadf5a34d1c352f23b0baf8b..bd780f28fc73051e94d913873be581c831ce6e99 100644
--- a/tests/pe/Union.cpp
+++ b/tests/pe/Union.cpp
@@ -41,9 +41,8 @@
 #include <algorithm>
 #include <vector>
 
-using namespace walberla;
+namespace walberla {
 using namespace walberla::pe;
-using namespace walberla::blockforest;
 
 typedef Union< boost::tuple<Sphere> >          UnionType ;
 typedef boost::tuple<Sphere, Plane, UnionType> BodyTuple ;
@@ -132,3 +131,9 @@ int main( int argc, char ** argv )
 
    return EXIT_SUCCESS;
 }
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+  return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/postprocessing/SQLiteTest.cpp b/tests/postprocessing/SQLiteTest.cpp
index 98d97e1beb2d6c3e588ac9cc0d24ea58341e4ab6..547bd12e9b2c3a07548a68ca7001c508fb5f8885 100644
--- a/tests/postprocessing/SQLiteTest.cpp
+++ b/tests/postprocessing/SQLiteTest.cpp
@@ -24,13 +24,11 @@
 
 #include "postprocessing/sqlite/SQLite.h"
 
-using namespace walberla;
-
 
 int main( int argc, char ** argv )
 {
-   debug::enterTestMode();
-   mpi::Environment walberlaEnv( argc, argv );
+   walberla::debug::enterTestMode();
+   walberla::mpi::Environment walberlaEnv( argc, argv );
 
    std::map<std::string, std::string>       strColumns;
    std::map<std::string, int>               intColumns;
@@ -42,7 +40,7 @@ int main( int argc, char ** argv )
       strColumns["property2"] = "value2";
       strColumns["property3"] = "value3";
       intColumns["i"] = int(i);
-      postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
+      walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
    }
 
    for( int i=0; i< 100; ++i )
@@ -51,7 +49,7 @@ int main( int argc, char ** argv )
       strColumns["property2"] = "value2";
       strColumns["property3"] = "value3";
       largeColumns["i"] = 4294967297 + i;
-      postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
+      walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
    }
 
    return 0;