diff --git a/src/EC/Manager.hpp b/src/EC/Manager.hpp
index cdc52aa..ea07b04 100644
--- a/src/EC/Manager.hpp
+++ b/src/EC/Manager.hpp
@@ -693,7 +693,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
         }
@@ -812,7 +812,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
         }
@@ -956,7 +956,7 @@ namespace EC
                         }
                         threadPool.wakeThreads();
                         do {
-                            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                            std::this_thread::sleep_for(std::chrono::microseconds(200));
                         } while(!threadPool.isAllThreadsWaiting());
                     }
                 })));
@@ -1035,7 +1035,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
 
@@ -1414,7 +1414,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
 
@@ -1476,7 +1476,7 @@ namespace EC
                         }
                         threadPool.wakeThreads();
                         do {
-                            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                            std::this_thread::sleep_for(std::chrono::microseconds(200));
                         } while(!threadPool.isAllThreadsWaiting());
                     }
                 }
@@ -1607,7 +1607,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
 
@@ -1674,7 +1674,7 @@ namespace EC
                         }
                         threadPool.wakeThreads();
                         do {
-                            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                            std::this_thread::sleep_for(std::chrono::microseconds(200));
                         } while(!threadPool.isAllThreadsWaiting());
                     }
                 }
@@ -1738,7 +1738,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
         }
@@ -1818,7 +1818,7 @@ namespace EC
                 }
                 threadPool.wakeThreads();
                 do {
-                    std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                    std::this_thread::sleep_for(std::chrono::microseconds(200));
                 } while(!threadPool.isAllThreadsWaiting());
             }
         }
diff --git a/src/test/ECTest.cpp b/src/test/ECTest.cpp
index a59fa98..3105903 100644
--- a/src/test/ECTest.cpp
+++ b/src/test/ECTest.cpp
@@ -458,11 +458,6 @@ TEST(EC, MultiThreaded)
         EXPECT_EQ(0, manager.getEntityData<C0>(i)->y);
     }
 
-#ifndef NDEBUG
-    std::clog << "Addr of C0 for entity 0 is " << manager.getEntityData<C0>(0)
-        << std::endl;
-#endif
-
     manager.forMatchingSignature<EC::Meta::TypeList<C0> >(
         [] (const std::size_t& /* id */, void* /* context */, C0* c) {
             c->x = 1;