diff --git a/CMakeLists.txt b/CMakeLists.txt
index be06e15413022b1fc11f3a0cec613f32031f51ed..44190bf90a29af6d3901c5fd7976a9fc089bcdd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ add_subdirectory(targets/libs/GridGenerator)
 set(BUILD_TESTS ON CACHE BOOL "Build shared libraries")
 if(BUILD_TESTS)
   add_subdirectory(3rdParty/googletest)
+  add_subdirectory(targets/tests/GridGeneratorTest)
   #add_subdirectory(targets/tests/VirtualFluidsTest)
   add_subdirectory(targets/tests/VirtualFluidsBasicsTest)
 endif()
diff --git a/targets/tests/GridGeneratorTest/3rdPartyLinking.cmake b/targets/tests/GridGeneratorTest/3rdPartyLinking.cmake
index af583545a343bfe2290abeebae4d30ffa8b115f9..f621a1361bf6da145beb6ddb1232cae44506d934 100644
--- a/targets/tests/GridGeneratorTest/3rdPartyLinking.cmake
+++ b/targets/tests/GridGeneratorTest/3rdPartyLinking.cmake
@@ -5,4 +5,4 @@ linkMPI(${targetName})
 include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Cuda/Link.cmake)
 linkCuda(${targetName})
 include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/Boost/Link.cmake)
-linkBoost(${targetName})
\ No newline at end of file
+linkBoost(${targetName} "")
\ No newline at end of file
diff --git a/targets/tests/GridGeneratorTest/CMakeLists.txt b/targets/tests/GridGeneratorTest/CMakeLists.txt
index 1d33c0783aa1dc2ab92a4d6b2a2b8fad5e028490..e40a48a827440ba741581da9096c3c35a751dc93 100644
--- a/targets/tests/GridGeneratorTest/CMakeLists.txt
+++ b/targets/tests/GridGeneratorTest/CMakeLists.txt
@@ -2,7 +2,7 @@ setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR})
 
 set(linkDirectories "")
 set(libsToLink GridGenerator)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
+set(includeDirectories ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/GridGenerator)
 
 #glob files and save in MY_SRCS
 include(CMakePackage.cmake)
diff --git a/targets/tests/GridGeneratorTest/CMakePackage.cmake b/targets/tests/GridGeneratorTest/CMakePackage.cmake
index 2f8c3b65e643f8b2f6a835a804110c3ef1c13ca8..d4fe817111e9fe53d2526bde70a9200e0fdaee91 100644
--- a/targets/tests/GridGeneratorTest/CMakePackage.cmake
+++ b/targets/tests/GridGeneratorTest/CMakePackage.cmake
@@ -5,4 +5,4 @@ addCAndCPPFileTypes()
 #GLOB SOURCE FILES IN MY_SRCS
 unset(MY_SRCS)
 includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(GridGenerator ${PROJECT_SOURCE_DIR}/src)
+includeRecursiveTestFilesFrom(GridGenerator ${CMAKE_SOURCE_DIR}/src/GridGenerator)
diff --git a/targets/tests/Input.Test/3rdPartyLinking.cmake b/targets/tests/Input.Test/3rdPartyLinking.cmake
deleted file mode 100644
index 408176efc206d9b8fd2fd90b2ac7f36abdd72c2c..0000000000000000000000000000000000000000
--- a/targets/tests/Input.Test/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/JsonCpp/Link.cmake)
-linkJsonCpp(${targetName})
\ No newline at end of file
diff --git a/targets/tests/Input.Test/CMakeLists.txt b/targets/tests/Input.Test/CMakeLists.txt
deleted file mode 100644
index 869c0bdee2403874bec50662860829a9519ada9d..0000000000000000000000000000000000000000
--- a/targets/tests/Input.Test/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink Input)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/tests/Input.Test/CMakePackage.cmake b/targets/tests/Input.Test/CMakePackage.cmake
deleted file mode 100644
index 5658269eae92f1b834e3a8dd205f84c95442e669..0000000000000000000000000000000000000000
--- a/targets/tests/Input.Test/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(Input ${PROJECT_SOURCE_DIR}/src)
diff --git a/targets/tests/Input.Test/main.cpp b/targets/tests/Input.Test/main.cpp
deleted file mode 100644
index 36018915793c97406c584e0d72daa1481f0de201..0000000000000000000000000000000000000000
--- a/targets/tests/Input.Test/main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "gmock/gmock.h"
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/targets/tests/Input.Test/package.include b/targets/tests/Input.Test/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/Logger.Test/3rdPartyLinking.cmake b/targets/tests/Logger.Test/3rdPartyLinking.cmake
deleted file mode 100644
index c8ec68202c609b1c54436e67281e1a3f99d10e09..0000000000000000000000000000000000000000
--- a/targets/tests/Logger.Test/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-
diff --git a/targets/tests/Logger.Test/CMakeLists.txt b/targets/tests/Logger.Test/CMakeLists.txt
deleted file mode 100644
index a47bac5dd7454e7d4da2dc71edc55fe70b2c49f9..0000000000000000000000000000000000000000
--- a/targets/tests/Logger.Test/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink Logger)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/tests/Logger.Test/CMakePackage.cmake b/targets/tests/Logger.Test/CMakePackage.cmake
deleted file mode 100644
index fa4439939ed05b5667745f962066ca26783261d2..0000000000000000000000000000000000000000
--- a/targets/tests/Logger.Test/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(Logger ${PROJECT_SOURCE_DIR}/src)
diff --git a/targets/tests/Logger.Test/main.cpp b/targets/tests/Logger.Test/main.cpp
deleted file mode 100644
index 1acaa3b9e22bd4972d9b7b758811a70a6f729433..0000000000000000000000000000000000000000
--- a/targets/tests/Logger.Test/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "gmock/gmock.h"
-
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
-
diff --git a/targets/tests/Logger.Test/package.include b/targets/tests/Logger.Test/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/targets/tests/utilities.Test/3rdPartyLinking.cmake b/targets/tests/utilities.Test/3rdPartyLinking.cmake
deleted file mode 100644
index c8ec68202c609b1c54436e67281e1a3f99d10e09..0000000000000000000000000000000000000000
--- a/targets/tests/utilities.Test/3rdPartyLinking.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include (${CMAKE_SOURCE_DIR}/${cmakeMacroPath}/GMock/Link.cmake)
-linkGMock(${targetName})
-
diff --git a/targets/tests/utilities.Test/CMakeLists.txt b/targets/tests/utilities.Test/CMakeLists.txt
deleted file mode 100644
index e52d675936472c5938c7ef0d11a19d57f83e377f..0000000000000000000000000000000000000000
--- a/targets/tests/utilities.Test/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-setTargetNameToFolderName(${CMAKE_CURRENT_LIST_DIR}) 
-
-set(linkDirectories "")
-set(libsToLink utilities)
-set(includeDirectories ${PROJECT_SOURCE_DIR}/src)
-
-#glob files and save in MY_SRCS
-include(CMakePackage.cmake)
-
-buildExe(${targetName} "${MY_SRCS}" "${linkDirectories}" "${libsToLink}" "${includeDirectories}")
-groupTarget(${targetName} ${testFolder})
-
-#Specify the linking to 3rdParty libs
-include(3rdPartyLinking.cmake)
diff --git a/targets/tests/utilities.Test/CMakePackage.cmake b/targets/tests/utilities.Test/CMakePackage.cmake
deleted file mode 100644
index e3309614af299d4a93e44f94c7435759bedee58b..0000000000000000000000000000000000000000
--- a/targets/tests/utilities.Test/CMakePackage.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#FILE ENDINGS
-resetFileEndingsToCollect()
-addCAndCPPFileTypes()
-
-#GLOB SOURCE FILES IN MY_SRCS
-unset(MY_SRCS)
-includeRecursiveAllFilesFrom(${targetName} ${CMAKE_CURRENT_LIST_DIR})
-includeRecursiveTestFilesFrom(utilities ${PROJECT_SOURCE_DIR}/src)
diff --git a/targets/tests/utilities.Test/main.cpp b/targets/tests/utilities.Test/main.cpp
deleted file mode 100644
index 3f1aead4bd66514bcca56cab2c627dad69741dbd..0000000000000000000000000000000000000000
--- a/targets/tests/utilities.Test/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "gmock/gmock.h"
-
-int main(int argc, char **argv)
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
-
diff --git a/targets/tests/utilities.Test/package.include b/targets/tests/utilities.Test/package.include
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000