diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 168ca95..ac3f100 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -12,10 +12,7 @@
                 "ENABLE_DEBUG=1",
                 "USE_GPSD=1"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": []
         },
         {
@@ -28,7 +25,10 @@
                 "ENABLE_DEBUG=1",
                 "USE_GPSD=1"
             ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "problemMatcher": []
         }
     ]
diff --git a/Tests/APRSFormater/frameToString.cpp b/Tests/APRSFormater/frameToString.cpp
index 7b457e4..da17cbe 100644
--- a/Tests/APRSFormater/frameToString.cpp
+++ b/Tests/APRSFormater/frameToString.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../APRSFormater.h"
+#include "APRSFormater.h"
 
  class APRSFormater_frameToString : public ::testing::Test {
  
diff --git a/Tests/APRSParser/parseAPRSFrame.cpp b/Tests/APRSParser/parseAPRSFrame.cpp
index fdead96..a2d1ae1 100644
--- a/Tests/APRSParser/parseAPRSFrame.cpp
+++ b/Tests/APRSParser/parseAPRSFrame.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../APRSParser.h"
+#include "APRSParser.h"
 
 namespace APRSParserTests
 {
diff --git a/Tests/APRStoDPRS/aprsToDPRS.cpp b/Tests/APRStoDPRS/aprsToDPRS.cpp
index 872d3a0..1334e8f 100644
--- a/Tests/APRStoDPRS/aprsToDPRS.cpp
+++ b/Tests/APRStoDPRS/aprsToDPRS.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../APRStoDPRS.h"
+#include "APRStoDPRS.h"
 
 namespace APRStoDPRSTests
 {
diff --git a/Tests/Config/getValue.cpp b/Tests/Config/getValue.cpp
index 5df3883..c7c0d15 100644
--- a/Tests/Config/getValue.cpp
+++ b/Tests/Config/getValue.cpp
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <string>
 
-#include "../../Config.h"
+#include "Config.h"
 
 namespace ConfigTests
 {
diff --git a/Tests/Config/load.cpp b/Tests/Config/load.cpp
index e03cea6..3d600e8 100644
--- a/Tests/Config/load.cpp
+++ b/Tests/Config/load.cpp
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <string>
 
-#include "../../Config.h"
+#include "Config.h"
 
 namespace ConfigTests
 {
diff --git a/Tests/DCSProtocolHandlerPool/getHandler.cpp b/Tests/DCSProtocolHandlerPool/getHandler.cpp
index 3d31874..9721803 100644
--- a/Tests/DCSProtocolHandlerPool/getHandler.cpp
+++ b/Tests/DCSProtocolHandlerPool/getHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DCSProtocolHandlerPool.h"
+#include "DCSProtocolHandlerPool.h"
 
 namespace DCSProtocolHandlerPoolTests
 {
diff --git a/Tests/DCSProtocolHandlerPool/getIncomingHandler.cpp b/Tests/DCSProtocolHandlerPool/getIncomingHandler.cpp
index f4c3f34..b675b05 100644
--- a/Tests/DCSProtocolHandlerPool/getIncomingHandler.cpp
+++ b/Tests/DCSProtocolHandlerPool/getIncomingHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DCSProtocolHandlerPool.h"
+#include "DCSProtocolHandlerPool.h"
 
 namespace DCSProtocolHandlerPoolTests
 {
diff --git a/Tests/DPlusProtocolHandlerPool/getHandler.cpp b/Tests/DPlusProtocolHandlerPool/getHandler.cpp
index 2389298..dbb6948 100644
--- a/Tests/DPlusProtocolHandlerPool/getHandler.cpp
+++ b/Tests/DPlusProtocolHandlerPool/getHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DPlusProtocolHandlerPool.h"
+#include "DPlusProtocolHandlerPool.h"
 
 namespace DPlusProtocolHandlerPoolTests
 {
diff --git a/Tests/DPlusProtocolHandlerPool/getIncomingHandler.cpp b/Tests/DPlusProtocolHandlerPool/getIncomingHandler.cpp
index a27dbd9..14ddf6e 100644
--- a/Tests/DPlusProtocolHandlerPool/getIncomingHandler.cpp
+++ b/Tests/DPlusProtocolHandlerPool/getIncomingHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DPlusProtocolHandlerPool.h"
+#include "DPlusProtocolHandlerPool.h"
 
 namespace DPlusProtocolHandlerPoolTests
 {
diff --git a/Tests/DextraProtocolHandlerPool/getHandler.cpp b/Tests/DextraProtocolHandlerPool/getHandler.cpp
index bc7c805..0f0f6dc 100644
--- a/Tests/DextraProtocolHandlerPool/getHandler.cpp
+++ b/Tests/DextraProtocolHandlerPool/getHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DExtraProtocolHandlerPool.h"
+#include "DExtraProtocolHandlerPool.h"
 
 namespace DextraProtocolHandlerPoolTests
 {
diff --git a/Tests/DextraProtocolHandlerPool/getIncomingHandler.cpp b/Tests/DextraProtocolHandlerPool/getIncomingHandler.cpp
index c6bfbc5..ae90c3d 100644
--- a/Tests/DextraProtocolHandlerPool/getIncomingHandler.cpp
+++ b/Tests/DextraProtocolHandlerPool/getIncomingHandler.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../DExtraProtocolHandlerPool.h"
+#include "DExtraProtocolHandlerPool.h"
 
 namespace DextraProtocolHandlerPoolTests
 {
diff --git a/Tests/NetUtils/lookup.cpp b/Tests/NetUtils/lookup.cpp
index f55f23c..e499f59 100644
--- a/Tests/NetUtils/lookup.cpp
+++ b/Tests/NetUtils/lookup.cpp
@@ -20,7 +20,7 @@
 
 #include <netdb.h>
 
-#include "../../NetUtils.h"
+#include "NetUtils.h"
 
 namespace NetUtilsTests
 {
diff --git a/Tests/NetUtils/lookupV4.cpp b/Tests/NetUtils/lookupV4.cpp
index 5f554fb..da5b88e 100644
--- a/Tests/NetUtils/lookupV4.cpp
+++ b/Tests/NetUtils/lookupV4.cpp
@@ -20,7 +20,7 @@
 
 #include <netdb.h>
 
-#include "../../NetUtils.h"
+#include "NetUtils.h"
 
 namespace NetUtilsTests
 {
diff --git a/Tests/NetUtils/lookupV6.cpp b/Tests/NetUtils/lookupV6.cpp
index 1a6c9bf..99b95af 100644
--- a/Tests/NetUtils/lookupV6.cpp
+++ b/Tests/NetUtils/lookupV6.cpp
@@ -20,7 +20,7 @@
 
 #include <netdb.h>
 
-#include "../../NetUtils.h"
+#include "NetUtils.h"
 
 namespace NetUtilsTests
 {
diff --git a/Tests/NetUtils/match.cpp b/Tests/NetUtils/match.cpp
index 0f58d12..bade2b5 100644
--- a/Tests/NetUtils/match.cpp
+++ b/Tests/NetUtils/match.cpp
@@ -20,7 +20,7 @@
 
 #include <netdb.h>
 
-#include "../../NetUtils.h"
+#include "NetUtils.h"
 
 namespace NetUtilsTests
 {
diff --git a/Tests/RSMS1AMessageBuilder/buildMessage.cpp b/Tests/RSMS1AMessageBuilder/buildMessage.cpp
index aefcb68..42ef3d0 100644
--- a/Tests/RSMS1AMessageBuilder/buildMessage.cpp
+++ b/Tests/RSMS1AMessageBuilder/buildMessage.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../RSMS1AMessageBuilder.h"
+#include "RSMS1AMessageBuilder.h"
 
 namespace RSMS1AMessageBuilderTests
 {
diff --git a/Tests/RSMS1AMessageBuilder/parseMessage.cpp b/Tests/RSMS1AMessageBuilder/parseMessage.cpp
index 5e1c82d..c614c13 100644
--- a/Tests/RSMS1AMessageBuilder/parseMessage.cpp
+++ b/Tests/RSMS1AMessageBuilder/parseMessage.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../RSMS1AMessageBuilder.h"
+#include "RSMS1AMessageBuilder.h"
 
 namespace RSMS1AMessageBuilderTests
 {
diff --git a/Tests/SlowDataEncoder/GPSData.cpp b/Tests/SlowDataEncoder/GPSData.cpp
index 21bc48f..85fe6c6 100644
--- a/Tests/SlowDataEncoder/GPSData.cpp
+++ b/Tests/SlowDataEncoder/GPSData.cpp
@@ -18,8 +18,8 @@
 
 #include <gtest/gtest.h>
 
-#include "../../SlowDataEncoder.h"
-#include "../../DStarDefines.h"
+#include "SlowDataEncoder.h"
+#include "DStarDefines.h"
 
 namespace SlowDataEncoderTests
 {
diff --git a/Tests/SlowDataEncoder/HeaderData.cpp b/Tests/SlowDataEncoder/HeaderData.cpp
index a3d253c..9948e78 100644
--- a/Tests/SlowDataEncoder/HeaderData.cpp
+++ b/Tests/SlowDataEncoder/HeaderData.cpp
@@ -18,8 +18,8 @@
 
 #include <gtest/gtest.h>
 
-#include "../../SlowDataEncoder.h"
-#include "../../DStarDefines.h"
+#include "SlowDataEncoder.h"
+#include "DStarDefines.h"
 
 namespace SlowDataEncoderTests
 {
diff --git a/Tests/SlowDataEncoder/InterleavedData.cpp b/Tests/SlowDataEncoder/InterleavedData.cpp
index 0651b15..7d225e1 100644
--- a/Tests/SlowDataEncoder/InterleavedData.cpp
+++ b/Tests/SlowDataEncoder/InterleavedData.cpp
@@ -19,8 +19,8 @@
 #include <gtest/gtest.h>
 #include <cstring>
 
-#include "../../SlowDataEncoder.h"
-#include "../../DStarDefines.h"
+#include "SlowDataEncoder.h"
+#include "DStarDefines.h"
 
 namespace SlowDataEncoderTests
 {
diff --git a/Tests/SlowDataEncoder/TextData.cpp b/Tests/SlowDataEncoder/TextData.cpp
index b2ba775..22c4c7d 100644
--- a/Tests/SlowDataEncoder/TextData.cpp
+++ b/Tests/SlowDataEncoder/TextData.cpp
@@ -18,8 +18,8 @@
 
 #include <gtest/gtest.h>
 
-#include "../../SlowDataEncoder.h"
-#include "../../DStarDefines.h"
+#include "SlowDataEncoder.h"
+#include "DStarDefines.h"
 
 namespace SlowDataEncoderTests
 {
diff --git a/Tests/StringUtils/stringToPort.cpp b/Tests/StringUtils/stringToPort.cpp
index b3cc740..6770a89 100644
--- a/Tests/StringUtils/stringToPort.cpp
+++ b/Tests/StringUtils/stringToPort.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../StringUtils.h"
+#include "StringUtils.h"
 
 namespace StringUtilsTests
 {
diff --git a/Tests/Utils/swap_endian.cpp b/Tests/Utils/swap_endian.cpp
index 767d10e..af94adc 100644
--- a/Tests/Utils/swap_endian.cpp
+++ b/Tests/Utils/swap_endian.cpp
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "../../Utils.h"
+#include "Utils.h"
 
 class Utils_swap_endian : public ::testing::Test {
  
diff --git a/Tests/Utils/swap_endian_be.cpp b/Tests/Utils/swap_endian_be.cpp
index 8e3a817..50f7cb2 100644
--- a/Tests/Utils/swap_endian_be.cpp
+++ b/Tests/Utils/swap_endian_be.cpp
@@ -18,9 +18,9 @@
 
 #include <gtest/gtest.h>
 
-#include "../../Utils.h"
-#include "../../StringUtils.h"
-#include "../../Log.h"
+#include "Utils.h"
+#include "StringUtils.h"
+#include "Log.h"
 
 class Utils_swap_endian_be : public ::testing::Test {