diff --git a/bin/test/data/log/test_log.txt b/bin/test/data/log/test_log.txt
index c547a434..049f19e2 100644
--- a/bin/test/data/log/test_log.txt
+++ b/bin/test/data/log/test_log.txt
@@ -1,310 +1,157 @@
 ConfigManager.cpp WARNING: value path/to/nowhere is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
-Settings.cpp WARNING: File for Settings not found: data/TestSettings.xml
-ConfigManager.cpp WARNING: value source/HeaderSearchPaths/HeaderSearchPath is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
+ConfigManager.cpp WARNING: value source/header_search_paths/header_search_path is not present in config.
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Edge.cpp ERROR: Edge type_of can't go from Node undefined to Node undefined
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h
index 42ddaecb..22a06c9b 100644
--- a/src/test/CxxParserTestSuite.h
+++ b/src/test/CxxParserTestSuite.h
@@ -1453,7 +1453,7 @@ public:
 		);
 
 		TS_ASSERT_EQUALS(client->classes.size(), 1);
-		TS_ASSERT_EQUALS(client->classes[0], "A<typename> <2:1 <2:7 2:7> 4:1>");
+		TS_ASSERT_EQUALS(client->classes[0], "A<typename> <1:1 <2:7 2:7> 4:1>");
 	}
 
 	void test_cxx_parser_finds_type_template_parameter_of_template_method_definition_outside_template_class()
@@ -1952,7 +1952,7 @@ public:
 			"};\n"
 		);
 		TS_ASSERT_EQUALS(client->classes.size(), 2);
-		TS_ASSERT_EQUALS(client->classes[0], "A<typename T, typename U> <2:1 <2:7 2:7> 4:1>");
+		TS_ASSERT_EQUALS(client->classes[0], "A<typename T, typename U> <1:1 <2:7 2:7> 4:1>");
 		TS_ASSERT_EQUALS(client->classes[1], "A<typename T, int> <5:1 <6:7 6:7> 8:1>");
 	}
 
@@ -2424,17 +2424,18 @@ public:
 	{
 		std::shared_ptr<TestParserClient> client = parseCode(
 				"template <typename T>\n"
-						"class A\n"
-						"{};\n"
-						"template <template<typename> class T = A>\n"
-						"void test()\n"
-						"{\n"
-						"};\n"
+				"class A\n"
+				"{};\n"
+				"template <template<typename> class T = A>\n"
+				"void test()\n"
+				"{\n"
+				"};\n"
 		);
 
 		TS_ASSERT_EQUALS(client->templateDefaultArgumentTypes.size(), 1);
-		TS_ASSERT_EQUALS(client->templateDefaultArgumentTypes[0],
-						 "A<typename T> -> test<template<typename> typename T>::T<typename> <4:40 4:40>");
+		TS_ASSERT_EQUALS(
+			client->templateDefaultArgumentTypes[0],
+			"A<typename T> -> test<template<typename> typename T>::T<typename> <4:40 4:40>");
 	}