diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d3e2ada..e69de29 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1 +0,0 @@
-add_subdirectory(Pickler)
diff --git a/externals/Pickler b/externals/Pickler
deleted file mode 160000
index 22a9fb9..0000000
--- a/externals/Pickler
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22a9fb9fabce4a1f3add4d2531858b20597190d1
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 8b75864..a310f3d 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -1,4 +1,5 @@
 project(TartTest)
+add_subdirectory(externals)
 set( CMAKE_CXX_STANDARD 11)
 set( CMAKE_CXX_STANDARD_REQUIRED ON)
 set( SOURCES 
@@ -7,10 +8,17 @@ set( SOURCES
     test_term.cpp
 )
 
+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests)
+
 add_executable(${PROJECT_NAME} ${SOURCES} )
 target_link_libraries(${PROJECT_NAME} TartLib PickleLib)
 
-add_test(${PROJECT_NAME} "${CMAKE_SOURCE_DIR}/bin/testing.exe")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing")
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe")
+endif()
 
 project(InputTartTest)
 set( CMAKE_CXX_STANDARD 11)
diff --git a/testing/externals/CMakeLists.txt b/testing/externals/CMakeLists.txt
new file mode 100644
index 0000000..d3e2ada
--- /dev/null
+++ b/testing/externals/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(Pickler)