diff --git a/src/communication/export_manager.hpp b/src/communication/export_manager.hpp
index ed4997282ac6d2f71894b8aa987d8ac80250d8db..d3628a847abcdaedb93b92b99ffb5e61f0d8d320 100644
--- a/src/communication/export_manager.hpp
+++ b/src/communication/export_manager.hpp
@@ -47,6 +47,8 @@ public:
 
     void do_export_rank(const std::vector<spike_type>& spikes)
     {
+        // TODO: do the buffering of the spikes here and not in the 
+        //      exporters itself!!!
         for (auto &exporter : rank_exporters_)
         {
             exporter->add_and_export(spikes);
diff --git a/src/model.hpp b/src/model.hpp
index d84396c7ca2bed6a3223f1cf24bff1de6724d30e..19e75a132b3cc523bf8f50ebe13f52e1b1696a9f 100644
--- a/src/model.hpp
+++ b/src/model.hpp
@@ -137,7 +137,7 @@ public:
                 auto local_spikes = previous_spikes().gather();
                 future_events() = communicator_.exchange(local_spikes,
                     [&](const std::vector<spike_type>& spikes) { exporter_->do_export_rank(spikes); },
-                [&] (const std::vector<spike_type>& spikes){ exporter_->do_export_single(spikes); });
+                    [&] (const std::vector<spike_type>& spikes){ exporter_->do_export_single(spikes); });
                 PL(2);
             };
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 10fb65efd052c1d9d7d7fdd5f50bdec0f93cb5a5..c39e22a80f408f824af43f31f1d5e965b1f37ff5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,6 +14,9 @@ add_subdirectory(validation)
 # Test for the internode communication (eg. mpi)
 add_subdirectory(global_communication)
 
+# Tests for performance: This could include stand alone tests. These do not necessarily be run automatically
+add_subdirectory(performance)
+
 
 # Proposed additional test types:
 
@@ -21,7 +24,6 @@ add_subdirectory(global_communication)
 
 # Test to check integration between components 
 
-# Tests for performance: This could include stand alone tests. These do not necessarily be run automatically
 
 # Numbered tests based on bugs in the tracker