diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc
index 7edeb87..7d8f160 100644
--- a/containers_cpp/test/main.cc
+++ b/containers_cpp/test/main.cc
@@ -26,18 +26,6 @@
 
 #include <embb/base/c/memory_allocation.h>
 
-
-#include <partest/partest.h>
-#include <embb/base/thread.h>
-
-#include "./pool_test.h"
-#include "./queue_test.h"
-#include "./stack_test.h"
-#include "./hazard_pointer_test.h"
-#include "./object_pool_test.h"
-
-
-
 #ifdef EMBB_PLATFORM_COMPILER_MSVC
  // Suppress warning generated by malloc.h(160): expression before comma
  // has no effect: expected expression with side effect
@@ -56,7 +44,14 @@
 #pragma warning(pop) // Reset warning 4548
 #endif
 
+#include <partest/partest.h>
+#include <embb/base/thread.h>
 
+#include "./pool_test.h"
+#include "./queue_test.h"
+#include "./stack_test.h"
+#include "./hazard_pointer_test.h"
+#include "./object_pool_test.h"
 
 #define COMMA ,
 
@@ -74,8 +69,6 @@ using embb::containers::test::StackTest;
 using embb::containers::test::ObjectPoolTest;
 using embb::containers::test::HazardPointerTest2;
 
-
-
 PT_MAIN("Data Structures C++") {
   unsigned int max_threads = static_cast<unsigned int>(
     2 * partest::TestSuite::GetDefaultNumThreads());
@@ -93,8 +86,4 @@ PT_MAIN("Data Structures C++") {
   PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool<bool COMMA false> >);
 
   PT_EXPECT(embb_get_bytes_allocated() == 0);
-}
-
-
-
-
+}
\ No newline at end of file