diff --git a/tests/unit/unittest/builddependencycollector-test.cpp b/tests/unit/unittest/builddependencycollector-test.cpp
index 04bb4720adc..aa46fc77bb1 100644
--- a/tests/unit/unittest/builddependencycollector-test.cpp
+++ b/tests/unit/unittest/builddependencycollector-test.cpp
@@ -302,48 +302,83 @@ TEST_F(BuildDependencyCollector, TopIncludesIgnoreMissingFile)
 
 TEST_F(BuildDependencyCollector, SourceFiles)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.collect();
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
-                UnorderedElementsAre(id(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     id(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     id(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     id(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     id(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(BuildDependencyCollector, MainFileInSourceFiles)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
-                ElementsAre(id(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(BuildDependencyCollector, ResetMainFileInSourceFiles)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
-                ElementsAre(id(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(BuildDependencyCollector, DontDuplicateSourceFiles)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
     emptyCollector.collect();
 
     emptyCollector.collect();
 
     ASSERT_THAT(emptyCollector.sourceFiles(),
-                UnorderedElementsAre(id(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     id(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     id(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     id(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     id(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(BuildDependencyCollector, ClearSourceFiles)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.clear();
 
@@ -352,7 +387,14 @@ TEST_F(BuildDependencyCollector, ClearSourceFiles)
 
 TEST_F(BuildDependencyCollector, ClearFileStatus)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
     emptyCollector.collect();
 
     emptyCollector.clear();
@@ -362,7 +404,14 @@ TEST_F(BuildDependencyCollector, ClearFileStatus)
 
 TEST_F(BuildDependencyCollector, ClearUsedMacros)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_defines.h"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/defines.h"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
     emptyCollector.collect();
 
     emptyCollector.clear();
@@ -372,7 +421,7 @@ TEST_F(BuildDependencyCollector, ClearUsedMacros)
 
 TEST_F(BuildDependencyCollector, ClearSourceDependencies)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main2.cpp"), {"cc", "-I" TESTDATA_DIR});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main2.cpp"), {"cc", "-I" TESTDATA_DIR});
     emptyCollector.collect();
 
     emptyCollector.clear();
@@ -382,7 +431,14 @@ TEST_F(BuildDependencyCollector, ClearSourceDependencies)
 
 TEST_F(BuildDependencyCollector, DontCollectSourceFilesAfterFilesAreCleared)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -392,7 +448,14 @@ TEST_F(BuildDependencyCollector, DontCollectSourceFilesAfterFilesAreCleared)
 
 TEST_F(BuildDependencyCollector, DontCollectFileStatusAfterFilesAreCleared)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -402,7 +465,14 @@ TEST_F(BuildDependencyCollector, DontCollectFileStatusAfterFilesAreCleared)
 
 TEST_F(BuildDependencyCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -413,7 +483,14 @@ TEST_F(BuildDependencyCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 
 TEST_F(BuildDependencyCollector, DontCollectSourceDependenciesAfterFilesAreCleared)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.clear();
     emptyCollector.collect();
@@ -423,7 +500,7 @@ TEST_F(BuildDependencyCollector, DontCollectSourceDependenciesAfterFilesAreClear
 
 TEST_F(BuildDependencyCollector, CollectUsedMacrosWithExternalDefine)
 {
-    auto fileId = id(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = id(TESTDATA_DIR "/symbolscollector/defines.h");
     emptyCollector.addFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     emptyCollector.collect();
@@ -438,8 +515,15 @@ TEST_F(BuildDependencyCollector, CollectUsedMacrosWithExternalDefine)
 
 TEST_F(BuildDependencyCollector, CollectUsedMacrosWithoutExternalDefine)
 {
-    auto fileId = id(TESTDATA_DIR "/symbolscollector_defines.h");
-    emptyCollector.addFile(fileId, {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    auto fileId = id(TESTDATA_DIR "/symbolscollector/defines.h");
+    emptyCollector.addFile(fileId,
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.collect();
 
@@ -453,8 +537,15 @@ TEST_F(BuildDependencyCollector, CollectUsedMacrosWithoutExternalDefine)
 
 TEST_F(BuildDependencyCollector, DontCollectHeaderGuards)
 {
-    auto fileId = id(TESTDATA_DIR "/symbolscollector_defines.h");
-    emptyCollector.addFile(fileId, {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    auto fileId = id(TESTDATA_DIR "/symbolscollector/defines.h");
+    emptyCollector.addFile(fileId,
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.collect();
 
@@ -464,8 +555,15 @@ TEST_F(BuildDependencyCollector, DontCollectHeaderGuards)
 
 TEST_F(BuildDependencyCollector, DISABLED_DontCollectDynamicLibraryExports)
 {
-    auto fileId = id(TESTDATA_DIR "/symbolscollector_defines.h");
-    emptyCollector.addFile(fileId, {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    auto fileId = id(TESTDATA_DIR "/symbolscollector/defines.h");
+    emptyCollector.addFile(fileId,
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.collect();
 
@@ -475,23 +573,29 @@ TEST_F(BuildDependencyCollector, DISABLED_DontCollectDynamicLibraryExports)
 
 TEST_F(BuildDependencyCollector, CollectFileStatuses)
 {
-    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc", "-I", TESTDATA_DIR "/builddependencycollector/external", "-I", TESTDATA_DIR "/builddependencycollector/project", "-isystem", TESTDATA_DIR "/builddependencycollector/system"});
+    emptyCollector.addFile(id(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                           {"cc",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/external",
+                            "-I",
+                            TESTDATA_DIR "/builddependencycollector/project",
+                            "-isystem",
+                            TESTDATA_DIR "/builddependencycollector/system"});
 
     emptyCollector.collect();
 
     ASSERT_THAT(emptyCollector.fileStatuses(),
-                ElementsAre(
-                    fileStatus(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header1.h"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header2.h")));
+                ElementsAre(fileStatus(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                            fileStatus(TESTDATA_DIR "/symbolscollector/header1.h"),
+                            fileStatus(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(BuildDependencyCollector, CollectSourceDependencies)
 {
-    auto mainFileId = id(TESTDATA_DIR "/symbolscollector_main2.cpp");
-    auto header1FileId = id(TESTDATA_DIR "/symbolscollector_header1.h");
-    auto header2FileId = id(TESTDATA_DIR "/symbolscollector_header2.h");
-    auto header3FileId = id(TESTDATA_DIR "/symbolscollector_header3.h");
+    auto mainFileId = id(TESTDATA_DIR "/symbolscollector/main2.cpp");
+    auto header1FileId = id(TESTDATA_DIR "/symbolscollector/header1.h");
+    auto header2FileId = id(TESTDATA_DIR "/symbolscollector/header2.h");
+    auto header3FileId = id(TESTDATA_DIR "/symbolscollector/header3.h");
     emptyCollector.addFile(mainFileId, {"cc", "-I" TESTDATA_DIR});
 
     emptyCollector.collect();
diff --git a/tests/unit/unittest/data/symbolscollector_defines.h b/tests/unit/unittest/data/symbolscollector/defines.h
similarity index 100%
rename from tests/unit/unittest/data/symbolscollector_defines.h
rename to tests/unit/unittest/data/symbolscollector/defines.h
diff --git a/tests/unit/unittest/data/symbolscollector/error.cpp b/tests/unit/unittest/data/symbolscollector/error.cpp
new file mode 100644
index 00000000000..5df7507e2de
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/error.cpp
@@ -0,0 +1 @@
+ERROR
diff --git a/tests/unit/unittest/data/symbolscollector/header1.h b/tests/unit/unittest/data/symbolscollector/header1.h
new file mode 100644
index 00000000000..3d1ea4b7e04
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/header1.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "header2.h"
diff --git a/tests/unit/unittest/data/symbolscollector_header2.h b/tests/unit/unittest/data/symbolscollector/header2.h
similarity index 100%
rename from tests/unit/unittest/data/symbolscollector_header2.h
rename to tests/unit/unittest/data/symbolscollector/header2.h
diff --git a/tests/unit/unittest/data/symbolscollector/header3.h b/tests/unit/unittest/data/symbolscollector/header3.h
new file mode 100644
index 00000000000..3d1ea4b7e04
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/header3.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "header2.h"
diff --git a/tests/unit/unittest/data/include/symbolscollector_unmodified_header.h b/tests/unit/unittest/data/symbolscollector/include/unmodified_header.h
similarity index 100%
rename from tests/unit/unittest/data/include/symbolscollector_unmodified_header.h
rename to tests/unit/unittest/data/symbolscollector/include/unmodified_header.h
diff --git a/tests/unit/unittest/data/include/symbolscollector_unmodified_header2.h b/tests/unit/unittest/data/symbolscollector/include/unmodified_header2.h
similarity index 100%
rename from tests/unit/unittest/data/include/symbolscollector_unmodified_header2.h
rename to tests/unit/unittest/data/symbolscollector/include/unmodified_header2.h
diff --git a/tests/unit/unittest/data/symbolscollector/main.cpp b/tests/unit/unittest/data/symbolscollector/main.cpp
new file mode 100644
index 00000000000..d85f515e18b
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/main.cpp
@@ -0,0 +1,4 @@
+#include "header1.h"
+
+void function();
+
diff --git a/tests/unit/unittest/data/symbolscollector/main2.cpp b/tests/unit/unittest/data/symbolscollector/main2.cpp
new file mode 100644
index 00000000000..c6971f02996
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/main2.cpp
@@ -0,0 +1,5 @@
+#include "header1.h"
+#include "header3.h"
+
+void function();
+
diff --git a/tests/unit/unittest/data/symbolscollector_simple.cpp b/tests/unit/unittest/data/symbolscollector/simple.cpp
similarity index 100%
rename from tests/unit/unittest/data/symbolscollector_simple.cpp
rename to tests/unit/unittest/data/symbolscollector/simple.cpp
diff --git a/tests/unit/unittest/data/symbolscollector_symbolkind.cpp b/tests/unit/unittest/data/symbolscollector/symbolkind.cpp
similarity index 100%
rename from tests/unit/unittest/data/symbolscollector_symbolkind.cpp
rename to tests/unit/unittest/data/symbolscollector/symbolkind.cpp
diff --git a/tests/unit/unittest/data/symbolscollector_unmodified.cpp b/tests/unit/unittest/data/symbolscollector/unmodified.cpp
similarity index 66%
rename from tests/unit/unittest/data/symbolscollector_unmodified.cpp
rename to tests/unit/unittest/data/symbolscollector/unmodified.cpp
index b7fe032e558..3f9791bfbdd 100644
--- a/tests/unit/unittest/data/symbolscollector_unmodified.cpp
+++ b/tests/unit/unittest/data/symbolscollector/unmodified.cpp
@@ -1,4 +1,4 @@
-#include <symbolscollector_unmodified_header.h>
+#include <unmodified_header.h>
 
 #define MAINFILE_DEFINE
 
diff --git a/tests/unit/unittest/data/symbolscollector_unmodified2.cpp b/tests/unit/unittest/data/symbolscollector/unmodified2.cpp
similarity index 66%
rename from tests/unit/unittest/data/symbolscollector_unmodified2.cpp
rename to tests/unit/unittest/data/symbolscollector/unmodified2.cpp
index 6127587bd36..3f8256ced81 100644
--- a/tests/unit/unittest/data/symbolscollector_unmodified2.cpp
+++ b/tests/unit/unittest/data/symbolscollector/unmodified2.cpp
@@ -1,4 +1,4 @@
-#include <symbolscollector_unmodified_header.h>
+#include <unmodified_header.h>
 
 #define MAINFILE_DEFINE
 
diff --git a/tests/unit/unittest/data/symbolscollector/unmodified3.cpp b/tests/unit/unittest/data/symbolscollector/unmodified3.cpp
new file mode 100644
index 00000000000..3a5d8f9df99
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/unmodified3.cpp
@@ -0,0 +1,9 @@
+#include <unmodified_header.h>
+#include <unmodified_header2.h>
+
+#define MAINFILE_DEFINE
+
+void MainFileFunction()
+{
+    HeaderFunctionReferenceInMainFile();
+}
diff --git a/tests/unit/unittest/data/symbolscollector/unsaved.cpp b/tests/unit/unittest/data/symbolscollector/unsaved.cpp
new file mode 100644
index 00000000000..0d0dc9fd518
--- /dev/null
+++ b/tests/unit/unittest/data/symbolscollector/unsaved.cpp
@@ -0,0 +1 @@
+#include "generated_file.h"
diff --git a/tests/unit/unittest/data/symbolscollector_header1.h b/tests/unit/unittest/data/symbolscollector_header1.h
deleted file mode 100644
index bacb59d24a7..00000000000
--- a/tests/unit/unittest/data/symbolscollector_header1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "symbolscollector_header2.h"
diff --git a/tests/unit/unittest/data/symbolscollector_header3.h b/tests/unit/unittest/data/symbolscollector_header3.h
deleted file mode 100644
index bacb59d24a7..00000000000
--- a/tests/unit/unittest/data/symbolscollector_header3.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "symbolscollector_header2.h"
diff --git a/tests/unit/unittest/data/symbolscollector_main.cpp b/tests/unit/unittest/data/symbolscollector_main.cpp
deleted file mode 100644
index 3a17b0a64ae..00000000000
--- a/tests/unit/unittest/data/symbolscollector_main.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "symbolscollector_header1.h"
-
-void function();
-
diff --git a/tests/unit/unittest/data/symbolscollector_main2.cpp b/tests/unit/unittest/data/symbolscollector_main2.cpp
deleted file mode 100644
index 71ea20e2b65..00000000000
--- a/tests/unit/unittest/data/symbolscollector_main2.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "symbolscollector_header1.h"
-#include "symbolscollector_header3.h"
-
-void function();
-
diff --git a/tests/unit/unittest/data/symbolscollector_unmodified3.cpp b/tests/unit/unittest/data/symbolscollector_unmodified3.cpp
deleted file mode 100644
index dbaabe7352d..00000000000
--- a/tests/unit/unittest/data/symbolscollector_unmodified3.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <symbolscollector_unmodified_header.h>
-#include <symbolscollector_unmodified_header2.h>
-
-#define MAINFILE_DEFINE
-
-void MainFileFunction()
-{
-    HeaderFunctionReferenceInMainFile();
-}
diff --git a/tests/unit/unittest/data/symbolscollector_unsaved.cpp b/tests/unit/unittest/data/symbolscollector_unsaved.cpp
deleted file mode 100644
index a57a4e69f74..00000000000
--- a/tests/unit/unittest/data/symbolscollector_unsaved.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "symbolscollector_generated_file.h"
diff --git a/tests/unit/unittest/mocksymbolscollector.h b/tests/unit/unittest/mocksymbolscollector.h
index b41a4bcd4ac..34cd71b17d4 100644
--- a/tests/unit/unittest/mocksymbolscollector.h
+++ b/tests/unit/unittest/mocksymbolscollector.h
@@ -47,8 +47,7 @@ public:
         ON_CALL(*this, setUnsavedFiles(_)).WillByDefault(Invoke(this, &MockSymbolsCollector::setHasUnsavedFiles));
     }
 
-    MOCK_METHOD0(collectSymbols,
-                 void());
+    MOCK_METHOD0(collectSymbols, bool());
 
     MOCK_METHOD2(setFile,
                  void(ClangBackEnd::FilePathId filePathId,
diff --git a/tests/unit/unittest/symbolscollector-test.cpp b/tests/unit/unittest/symbolscollector-test.cpp
index 9ddb7c461b9..2d7025373f3 100644
--- a/tests/unit/unittest/symbolscollector-test.cpp
+++ b/tests/unit/unittest/symbolscollector-test.cpp
@@ -178,7 +178,7 @@ protected:
 
 TEST_F(SymbolsCollector, CollectSymbolName)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -188,7 +188,7 @@ TEST_F(SymbolsCollector, CollectSymbolName)
 
 TEST_F(SymbolsCollector, SymbolMatchesLocation)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -200,7 +200,7 @@ TEST_F(SymbolsCollector, SymbolMatchesLocation)
 
 TEST_F(SymbolsCollector, OtherSymboldMatchesLocation)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -212,20 +212,19 @@ TEST_F(SymbolsCollector, OtherSymboldMatchesLocation)
 
 TEST_F(SymbolsCollector, CollectFilePath)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
     ASSERT_THAT(collector.sourceLocations(),
-                Contains(
-                    AllOf(Field(&SourceLocationEntry::filePathId,
-                                filePathId(TESTDATA_DIR"/symbolscollector_simple.cpp")),
-                          Field(&SourceLocationEntry::kind, SourceLocationKind::Declaration))));
+                Contains(AllOf(Field(&SourceLocationEntry::filePathId,
+                                     filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp")),
+                               Field(&SourceLocationEntry::kind, SourceLocationKind::Declaration))));
 }
 
 TEST_F(SymbolsCollector, CollectLineColumn)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -237,7 +236,7 @@ TEST_F(SymbolsCollector, CollectLineColumn)
 
 TEST_F(SymbolsCollector, CollectReference)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -249,7 +248,7 @@ TEST_F(SymbolsCollector, CollectReference)
 
 TEST_F(SymbolsCollector, ReferencedSymboldMatchesLocation)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_simple.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/simple.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -261,10 +260,9 @@ TEST_F(SymbolsCollector, ReferencedSymboldMatchesLocation)
 
 TEST_F(SymbolsCollector, DISABLED_ON_WINDOWS(CollectInUnsavedFile))
 {
-    FileContainers unsaved{{{TESTDATA_DIR, "symbolscollector_generated_file.h"},
-                            "void function();",
-                            {}}};
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unsaved.cpp"),  {"cc"});
+    FileContainers unsaved{
+        {{TESTDATA_DIR, "symbolscollector/generated_file.h"}, "void function();", {}}};
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unsaved.cpp"), {"cc"});
     collector.setUnsavedFiles(std::move(unsaved));
 
     collector.collectSymbols();
@@ -275,48 +273,48 @@ TEST_F(SymbolsCollector, DISABLED_ON_WINDOWS(CollectInUnsavedFile))
 
 TEST_F(SymbolsCollector, SourceFiles)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.collectSymbols();
 
     ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(SymbolsCollector, MainFileInSourceFiles)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(SymbolsCollector, ResetMainFileInSourceFiles)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(SymbolsCollector, DontDuplicateSourceFiles)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collectSymbols();
 
     collector.collectSymbols();
 
     ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(SymbolsCollector, ClearSourceFiles)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
 
@@ -325,7 +323,7 @@ TEST_F(SymbolsCollector, ClearSourceFiles)
 
 TEST_F(SymbolsCollector, ClearSymbols)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collectSymbols();
 
     collector.clear();
@@ -335,7 +333,7 @@ TEST_F(SymbolsCollector, ClearSymbols)
 
 TEST_F(SymbolsCollector, ClearSourceLocations)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collectSymbols();
 
     collector.clear();
@@ -345,7 +343,7 @@ TEST_F(SymbolsCollector, ClearSourceLocations)
 
 TEST_F(SymbolsCollector, ClearFileStatus)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collectSymbols();
 
     collector.clear();
@@ -355,7 +353,7 @@ TEST_F(SymbolsCollector, ClearFileStatus)
 
 TEST_F(SymbolsCollector, ClearUsedMacros)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_defines.h"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/defines.h"), {"cc"});
     collector.collectSymbols();
 
     collector.clear();
@@ -365,7 +363,8 @@ TEST_F(SymbolsCollector, ClearUsedMacros)
 
 TEST_F(SymbolsCollector, ClearSourceDependencies)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main2.cpp"), {"cc", "-I" TESTDATA_DIR});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp"),
+                      {"cc", "-I" TESTDATA_DIR});
     collector.collectSymbols();
 
     collector.clear();
@@ -375,7 +374,7 @@ TEST_F(SymbolsCollector, ClearSourceDependencies)
 
 TEST_F(SymbolsCollector, DontCollectSymbolsAfterFilesAreCleared)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collectSymbols();
@@ -385,7 +384,7 @@ TEST_F(SymbolsCollector, DontCollectSymbolsAfterFilesAreCleared)
 
 TEST_F(SymbolsCollector, DontCollectSourceFilesAfterFilesAreCleared)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collectSymbols();
@@ -395,7 +394,7 @@ TEST_F(SymbolsCollector, DontCollectSourceFilesAfterFilesAreCleared)
 
 TEST_F(SymbolsCollector, DontCollectFileStatusAfterFilesAreCleared)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collectSymbols();
@@ -405,7 +404,7 @@ TEST_F(SymbolsCollector, DontCollectFileStatusAfterFilesAreCleared)
 
 TEST_F(SymbolsCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collectSymbols();
@@ -415,7 +414,7 @@ TEST_F(SymbolsCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 
 TEST_F(SymbolsCollector, DontCollectSourceDependenciesAfterFilesAreCleared)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collectSymbols();
@@ -425,7 +424,7 @@ TEST_F(SymbolsCollector, DontCollectSourceDependenciesAfterFilesAreCleared)
 
 TEST_F(SymbolsCollector, CollectUsedMacrosWithExternalDefine)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -442,7 +441,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithExternalDefine)
 
 TEST_F(SymbolsCollector, CollectUsedMacrosWithoutExternalDefine)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
@@ -459,7 +458,7 @@ TEST_F(SymbolsCollector, CollectUsedMacrosWithoutExternalDefine)
 
 TEST_F(SymbolsCollector, DontCollectHeaderGuards)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
@@ -470,7 +469,7 @@ TEST_F(SymbolsCollector, DontCollectHeaderGuards)
 
 TEST_F(SymbolsCollector, DISABLED_DontCollectDynamicLibraryExports)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
@@ -481,7 +480,7 @@ TEST_F(SymbolsCollector, DISABLED_DontCollectDynamicLibraryExports)
 
 TEST_F(SymbolsCollector, CollectMacroDefinitionSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -492,7 +491,7 @@ TEST_F(SymbolsCollector, CollectMacroDefinitionSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageInIfNotDefSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -503,7 +502,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageInIfNotDefSourceLocation)
 
 TEST_F(SymbolsCollector, CollectSecondMacroUsageInIfNotDefSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -514,7 +513,7 @@ TEST_F(SymbolsCollector, CollectSecondMacroUsageInIfNotDefSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageCompilerArgumentSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -525,7 +524,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageCompilerArgumentSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageInIfDefSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -536,7 +535,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageInIfDefSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageInDefinedSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -547,7 +546,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageInDefinedSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageExpansionSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -558,7 +557,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageExpansionSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageUndefSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -569,7 +568,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageUndefSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroUsageBuiltInSourceLocation)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -580,7 +579,7 @@ TEST_F(SymbolsCollector, CollectMacroUsageBuiltInSourceLocation)
 
 TEST_F(SymbolsCollector, CollectMacroDefinitionSymbols)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
@@ -591,7 +590,7 @@ TEST_F(SymbolsCollector, CollectMacroDefinitionSymbols)
 
 TEST_F(SymbolsCollector, CollectMacroBuiltInSymbols)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
@@ -602,7 +601,7 @@ TEST_F(SymbolsCollector, CollectMacroBuiltInSymbols)
 
 TEST_F(SymbolsCollector, CollectMacroCompilerArgumentSymbols)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.setFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collectSymbols();
@@ -613,24 +612,23 @@ TEST_F(SymbolsCollector, CollectMacroCompilerArgumentSymbols)
 
 TEST_F(SymbolsCollector, CollectFileStatuses)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_main.cpp");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/main.cpp");
     collector.setFile(fileId, {"cc"});
 
     collector.collectSymbols();
 
     ASSERT_THAT(collector.fileStatuses(),
-                ElementsAre(
-                    fileStatus(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header1.h"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header2.h")));
+                ElementsAre(fileStatus(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                            fileStatus(TESTDATA_DIR "/symbolscollector/header1.h"),
+                            fileStatus(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(SymbolsCollector, CollectSourceDependencies)
 {
-    auto mainFileId = filePathId(TESTDATA_DIR "/symbolscollector_main2.cpp");
-    auto header1FileId = filePathId(TESTDATA_DIR "/symbolscollector_header1.h");
-    auto header2FileId = filePathId(TESTDATA_DIR "/symbolscollector_header2.h");
-    auto header3FileId = filePathId(TESTDATA_DIR "/symbolscollector_header3.h");
+    auto mainFileId = filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp");
+    auto header1FileId = filePathId(TESTDATA_DIR "/symbolscollector/header1.h");
+    auto header2FileId = filePathId(TESTDATA_DIR "/symbolscollector/header2.h");
+    auto header3FileId = filePathId(TESTDATA_DIR "/symbolscollector/header3.h");
     collector.setFile(mainFileId, {"cc", "-I" TESTDATA_DIR});
 
     collector.collectSymbols();
@@ -644,7 +642,7 @@ TEST_F(SymbolsCollector, CollectSourceDependencies)
 
 TEST_F(SymbolsCollector, IsClassSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -658,7 +656,7 @@ TEST_F(SymbolsCollector, IsClassSymbol)
 
 TEST_F(SymbolsCollector, IsStructSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -672,7 +670,7 @@ TEST_F(SymbolsCollector, IsStructSymbol)
 
 TEST_F(SymbolsCollector, IsEnumerationSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -690,7 +688,7 @@ TEST_F(SymbolsCollector, IsEnumerationSymbol)
 
 TEST_F(SymbolsCollector, IsUnionSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -704,7 +702,7 @@ TEST_F(SymbolsCollector, IsUnionSymbol)
 
 TEST_F(SymbolsCollector, DISABLED_ON_NON_WINDOWS(IsMsvcInterfaceSymbol))
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -718,7 +716,7 @@ TEST_F(SymbolsCollector, DISABLED_ON_NON_WINDOWS(IsMsvcInterfaceSymbol))
 
 TEST_F(SymbolsCollector, IsFunctionSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -731,7 +729,7 @@ TEST_F(SymbolsCollector, IsFunctionSymbol)
 
 TEST_F(SymbolsCollector, IsVariableSymbol)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_symbolkind.cpp"), {"cc"});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/symbolkind.cpp"), {"cc"});
 
     collector.collectSymbols();
 
@@ -744,7 +742,8 @@ TEST_F(SymbolsCollector, IsVariableSymbol)
 
 TEST_F(SymbolsCollector, IndexUnmodifiedHeaderFilesAtFirstRun)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified.cpp"), {"cc", "-I", {TESTDATA_DIR, "/include"}});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified.cpp"),
+                      {"cc", "-I", {TESTDATA_DIR, "/symbolscollector/include"}});
 
     collector.collectSymbols();
 
@@ -761,10 +760,12 @@ TEST_F(SymbolsCollector, IndexUnmodifiedHeaderFilesAtFirstRun)
 
 TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtSecondRun)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified.cpp"), {"cc", "-I", {TESTDATA_DIR, "/include"}});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified.cpp"),
+                      {"cc", "-I", {TESTDATA_DIR, "/symbolscollector/include"}});
     collector.collectSymbols();
     collector.clear();
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified2.cpp"), {"cc", "-I", {TESTDATA_DIR, "/include"}});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified2.cpp"),
+                      {"cc", "-I", {TESTDATA_DIR, "/symbolscollector/include"}});
 
     collector.collectSymbols();
 
@@ -780,11 +781,13 @@ TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtSecondRun)
 
 TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtTouchHeader)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified3.cpp"), {"cc", "-I", {TESTDATA_DIR, "/include"}});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified3.cpp"),
+                      {"cc", "-I", {TESTDATA_DIR, "/symbolscollector/include"}});
     collector.collectSymbols();
     collector.clear();
-    touchFile(TESTDATA_DIR "/include/symbolscollector_unmodified_header2.h");
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified3.cpp"), {"cc", "-I", {TESTDATA_DIR, "/include"}});
+    touchFile(TESTDATA_DIR "/symbolscollector/include/unmodified_header2.h");
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified3.cpp"),
+                      {"cc", "-I", {TESTDATA_DIR, "/symbolscollector/include"}});
 
     collector.collectSymbols();
 
@@ -800,7 +803,8 @@ TEST_F(SymbolsCollector, DontIndexUnmodifiedHeaderFilesAtTouchHeader)
 
 TEST_F(SymbolsCollector, DontIndexSystemIncudes)
 {
-    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector_unmodified.cpp"), {"cc", "-isystem", {TESTDATA_DIR, "/include"}});
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/unmodified.cpp"),
+                      {"cc", "-isystem", {TESTDATA_DIR, "/symbolscollector/include"}});
 
     collector.collectSymbols();
 
@@ -815,4 +819,22 @@ TEST_F(SymbolsCollector, DontIndexSystemIncudes)
                     Not(Contains(HasSymbolName("HEADER_DEFINE"))),
                     Not(Contains(HasSymbolName("FunctionLocalVariable")))));
 }
+
+TEST_F(SymbolsCollector, CollectReturnsFalseIfThereIsError)
+{
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/error.cpp"), {"cc"});
+
+    bool success = collector.collectSymbols();
+
+    ASSERT_FALSE(success);
 }
+
+TEST_F(SymbolsCollector, CollectReturnsFalseIfThereIsNoError)
+{
+    collector.setFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
+
+    bool success = collector.collectSymbols();
+
+    ASSERT_TRUE(success);
+}
+} // namespace
diff --git a/tests/unit/unittest/usedmacrocollector-test.cpp b/tests/unit/unittest/usedmacrocollector-test.cpp
index 40f8e8e744c..61f7fcd99b4 100644
--- a/tests/unit/unittest/usedmacrocollector-test.cpp
+++ b/tests/unit/unittest/usedmacrocollector-test.cpp
@@ -79,48 +79,48 @@ protected:
 
 TEST_F(UsedMacroAndSourcesCollector, SourceFiles)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.collect();
 
     ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(UsedMacroAndSourcesCollector, MainFileInSourceFiles)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(UsedMacroAndSourcesCollector, ResetMainFileInSourceFiles)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     ASSERT_THAT(collector.sourceFiles(),
-                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp")));
+                ElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp")));
 }
 
 TEST_F(UsedMacroAndSourcesCollector, DontDuplicateSourceFiles)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collect();
 
     collector.collect();
 
     ASSERT_THAT(collector.sourceFiles(),
-                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header1.h"),
-                                     filePathId(TESTDATA_DIR "/symbolscollector_header2.h")));
+                UnorderedElementsAre(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header1.h"),
+                                     filePathId(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(UsedMacroAndSourcesCollector, ClearSourceFiles)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
 
@@ -129,7 +129,7 @@ TEST_F(UsedMacroAndSourcesCollector, ClearSourceFiles)
 
 TEST_F(UsedMacroAndSourcesCollector, ClearFileStatus)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
     collector.collect();
 
     collector.clear();
@@ -139,7 +139,7 @@ TEST_F(UsedMacroAndSourcesCollector, ClearFileStatus)
 
 TEST_F(UsedMacroAndSourcesCollector, ClearUsedMacros)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_defines.h"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/defines.h"), {"cc"});
     collector.collect();
 
     collector.clear();
@@ -149,7 +149,7 @@ TEST_F(UsedMacroAndSourcesCollector, ClearUsedMacros)
 
 TEST_F(UsedMacroAndSourcesCollector, ClearSourceDependencies)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main2.cpp"), {"cc", "-I" TESTDATA_DIR});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp"), {"cc", "-I" TESTDATA_DIR});
     collector.collect();
 
     collector.clear();
@@ -159,7 +159,7 @@ TEST_F(UsedMacroAndSourcesCollector, ClearSourceDependencies)
 
 TEST_F(UsedMacroAndSourcesCollector, DontCollectSourceFilesAfterFilesAreCleared)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collect();
@@ -169,7 +169,7 @@ TEST_F(UsedMacroAndSourcesCollector, DontCollectSourceFilesAfterFilesAreCleared)
 
 TEST_F(UsedMacroAndSourcesCollector, DontCollectFileStatusAfterFilesAreCleared)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collect();
@@ -179,7 +179,7 @@ TEST_F(UsedMacroAndSourcesCollector, DontCollectFileStatusAfterFilesAreCleared)
 
 TEST_F(UsedMacroAndSourcesCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collect();
@@ -190,7 +190,7 @@ TEST_F(UsedMacroAndSourcesCollector, DontCollectUsedMacrosAfterFilesAreCleared)
 
 TEST_F(UsedMacroAndSourcesCollector, DontCollectSourceDependenciesAfterFilesAreCleared)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.clear();
     collector.collect();
@@ -200,7 +200,7 @@ TEST_F(UsedMacroAndSourcesCollector, DontCollectSourceDependenciesAfterFilesAreC
 
 TEST_F(UsedMacroAndSourcesCollector, CollectUsedMacrosWithExternalDefine)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.addFile(fileId, {"cc", "-DCOMPILER_ARGUMENT"});
 
     collector.collect();
@@ -217,7 +217,7 @@ TEST_F(UsedMacroAndSourcesCollector, CollectUsedMacrosWithExternalDefine)
 
 TEST_F(UsedMacroAndSourcesCollector, CollectUsedMacrosWithoutExternalDefine)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.addFile(fileId, {"cc"});
 
     collector.collect();
@@ -234,7 +234,7 @@ TEST_F(UsedMacroAndSourcesCollector, CollectUsedMacrosWithoutExternalDefine)
 
 TEST_F(UsedMacroAndSourcesCollector, DontCollectHeaderGuards)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.addFile(fileId, {"cc"});
 
     collector.collect();
@@ -245,7 +245,7 @@ TEST_F(UsedMacroAndSourcesCollector, DontCollectHeaderGuards)
 
 TEST_F(UsedMacroAndSourcesCollector, DISABLED_DontCollectDynamicLibraryExports)
 {
-    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector_defines.h");
+    auto fileId = filePathId(TESTDATA_DIR "/symbolscollector/defines.h");
     collector.addFile(fileId, {"cc"});
 
     collector.collect();
@@ -256,23 +256,23 @@ TEST_F(UsedMacroAndSourcesCollector, DISABLED_DontCollectDynamicLibraryExports)
 
 TEST_F(UsedMacroAndSourcesCollector, CollectFileStatuses)
 {
-    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector_main.cpp"), {"cc"});
+    collector.addFile(filePathId(TESTDATA_DIR "/symbolscollector/main.cpp"), {"cc"});
 
     collector.collect();
 
     ASSERT_THAT(collector.fileStatuses(),
                 ElementsAre(
-                    fileStatus(TESTDATA_DIR "/symbolscollector_main.cpp"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header1.h"),
-                    fileStatus(TESTDATA_DIR "/symbolscollector_header2.h")));
+                    fileStatus(TESTDATA_DIR "/symbolscollector/main.cpp"),
+                    fileStatus(TESTDATA_DIR "/symbolscollector/header1.h"),
+                    fileStatus(TESTDATA_DIR "/symbolscollector/header2.h")));
 }
 
 TEST_F(UsedMacroAndSourcesCollector, CollectSourceDependencies)
 {
-    auto mainFileId = filePathId(TESTDATA_DIR "/symbolscollector_main2.cpp");
-    auto header1FileId = filePathId(TESTDATA_DIR "/symbolscollector_header1.h");
-    auto header2FileId = filePathId(TESTDATA_DIR "/symbolscollector_header2.h");
-    auto header3FileId = filePathId(TESTDATA_DIR "/symbolscollector_header3.h");
+    auto mainFileId = filePathId(TESTDATA_DIR "/symbolscollector/main2.cpp");
+    auto header1FileId = filePathId(TESTDATA_DIR "/symbolscollector/header1.h");
+    auto header2FileId = filePathId(TESTDATA_DIR "/symbolscollector/header2.h");
+    auto header3FileId = filePathId(TESTDATA_DIR "/symbolscollector/header3.h");
     collector.addFile(mainFileId, {"cc", "-I" TESTDATA_DIR});
 
     collector.collect();