diff --git a/CMakeLists.txt b/CMakeLists.txt
index 572e78e6760fae7c61817033d9ab0960549fc0f9..14bff7010dfd6a0a9525509301ae297a0274ce43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,7 +373,10 @@ add_subdirectory(Source/CollisionDetection)
 add_subdirectory(Source/CollisionHandling)
 add_subdirectory(Source/Scene)
 add_subdirectory(Source/SimulationManager)
+<<<<<<< HEAD
 add_subdirectory(Source/Testing)
+=======
+>>>>>>> d1989b9d (REFAC: Remove apiutils)
 add_subdirectory(Source/Filtering)
 add_subdirectory(Source/FilteringCore)
 
diff --git a/Source/Testing/imstkTestingMain.cpp b/Source/Testing/imstkTestingMain.cpp
index ed307e20bfcc7fd128dd3f4d8071998f366909fa..d49f2276e08f1deac676e6b92de4b8bdfa643b03 100644
--- a/Source/Testing/imstkTestingMain.cpp
+++ b/Source/Testing/imstkTestingMain.cpp
@@ -28,23 +28,24 @@
 int
 main(int argc, char** argv)
 {
-    bool removeLog = false;
+    bool removeLog = true;
     for (int i = 0; i < argc; ++i)
     {
         if (std::string(argv[i]) == "--imstk_keep_log")
         {
-            removeLog = true;
+            removeLog = false;
         }
     }
 
     if (removeLog)
     {
-        vtksys::SystemTools::RemoveADirectory("testlog");
-        vtksys::SystemTools::MakeDirectory("testlog");
+        vtksys::SystemTools::RemoveADirectory("log");
     }
 
+    vtksys::SystemTools::MakeDirectory("log");
+
     auto& logger = imstk::Logger::getInstance();
-    logger.addFileSink("test", "testlog");
+    logger.addFileSink("test", "log");
 
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();