diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88bbb28..36465fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,10 @@ IMPORTED_LOCATION "${DONUT_BUILD_DIR}/lib/donut.lib"
 
 add_subdirectory(core/modules)
 add_subdirectory(core/beacon)
+if(C2CORE_BUILD_TESTS)
+  add_subdirectory(core/listener/tests)
+  add_subdirectory(core/beacon/tests)
+endif()
 
 include_directories(core/listener)
 include_directories(core/beacon)
diff --git a/core b/core
index c5e3475..5930cbe 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c5e34750bf69079619b3eb9ac61c28c2c2738329
+Subproject commit 5930cbe3983f5dbb33f58656b1c6595dea5feed9
diff --git a/libs/libDns b/libs/libDns
index e6766e9..3a46f1d 160000
--- a/libs/libDns
+++ b/libs/libDns
@@ -1 +1 @@
-Subproject commit e6766e926643ae9e26cdaf4cff334e66c0da7e5b
+Subproject commit 3a46f1d6f4c454aeb73171878dd8a136def464d4
diff --git a/libs/libPipeHandler b/libs/libPipeHandler
index f13f640..187c023 160000
--- a/libs/libPipeHandler
+++ b/libs/libPipeHandler
@@ -1 +1 @@
-Subproject commit f13f640287fc007a3a1c34830c479ca4bf50dd64
+Subproject commit 187c023618354631073312ce49eeda8859f4e887
diff --git a/libs/libSocketHandler b/libs/libSocketHandler
index 42205ae..85cfff6 160000
--- a/libs/libSocketHandler
+++ b/libs/libSocketHandler
@@ -1 +1 @@
-Subproject commit 42205ae0e33c3ad0ad10657925abc50cb39f4851
+Subproject commit 85cfff6f0d86dd598d228e81b7ec0afd333ac9e7
diff --git a/libs/libSocks5 b/libs/libSocks5
index 8ef9dd3..2cb9ead 160000
--- a/libs/libSocks5
+++ b/libs/libSocks5
@@ -1 +1 @@
-Subproject commit 8ef9dd3549ca1a06000628ea6be6dcc3935a9969
+Subproject commit 2cb9ead72fb5d4916b3210ccbb920565a4b674a1
diff --git a/thirdParty/CMakeLists.txt b/thirdParty/CMakeLists.txt
index 0a70c36..4c41ce9 100644
--- a/thirdParty/CMakeLists.txt
+++ b/thirdParty/CMakeLists.txt
@@ -20,8 +20,6 @@ add_subdirectory(MemoryModule)
 
 ## donut
 file(COPY ${CMAKE_SOURCE_DIR}/thirdParty/donut DESTINATION ${CMAKE_BINARY_DIR}/thirdParty)
-file(REMOVE ${CMAKE_BINARY_DIR}/thirdParty/donut/Makefile.msvc)
-file(COPY ${CMAKE_SOURCE_DIR}/thirdParty/custom/Makefile.msvc DESTINATION ${CMAKE_BINARY_DIR}/thirdParty/donut/)
 
 if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(ARM64|arm64|aarch64)$" OR "${MSVC_CXX_ARCHITECTURE_ID}" MATCHES "ARM64")
 
diff --git a/thirdParty/custom/Makefile.msvc b/thirdParty/custom/Makefile.msvc
deleted file mode 100644
index d03e805..0000000
--- a/thirdParty/custom/Makefile.msvc
+++ /dev/null
@@ -1,42 +0,0 @@
-donut: clean
-	@echo ###### Building exe2h ######
-	cl /nologo loader\exe2h\exe2h.c loader\exe2h\mmap-windows.c
-	
-	@echo ###### Building loader ######
-	cl -DBYPASS_AMSI_A -DBYPASS_WLDP_A -DBYPASS_ETW_B -Zp8 -c -nologo -Gy -Os -O1 -GR- -EHa -Oi -GS- -I include loader\loader.c hash.c encrypt.c loader\depack.c loader\clib.c
-	link -nologo -order:@loader\order.txt -entry:DonutLoader -fixed -subsystem:console -nodefaultlib loader.obj hash.obj encrypt.obj depack.obj clib.obj
-	exe2h loader.exe
-	
-	@echo ###### Building generator ######
-	rc include\donut.rc
-	cl -Zp8 -DDONUT_EXE /DUSE_CRT -I include donut.c hash.c encrypt.c format.c loader\clib.c lib\aplib64.lib include\donut.res
-	cl -Zp8 -nologo -DDLL /DUSE_CRT -LD -I include donut.c hash.c encrypt.c format.c loader\clib.c lib\aplib64.lib
-	
-	lib donut.obj hash.obj encrypt.obj format.obj clib.obj lib\aplib64.lib
-	move donut.lib lib\donut.lib
-
-	@echo ###### Building injection testing tools ######
-	cl -Zp8 -nologo -DTEST -I include loader\inject.c
-	cl -Zp8 -nologo -DTEST -I include loader\inject_local.c
-debug: clean
-	cl /nologo -DDEBUG -DBYPASS_AMSI_B -DBYPASS_WLDP_A -DBYPASS_ETW_B -Zp8 -c -nologo -Gy -Os -EHa -GS- -I include loader\loader.c hash.c encrypt.c loader\depack.c loader\clib.c
-	link -nologo -order:@loader\order.txt -subsystem:console loader.obj hash.obj encrypt.obj depack.obj clib.obj
-  
-	cl -Zp8 -nologo -DDEBUG /DUSE_CRT -DDONUT_EXE -I include donut.c hash.c encrypt.c format.c loader\clib.c lib\aplib64.lib
-	cl -Zp8 -nologo -DDEBUG /DUSE_CRT -DDLL -LD -I include donut.c hash.c encrypt.c format.c loader\clib.c lib\aplib64.lib
-
-	lib donut.obj hash.obj encrypt.obj format.obj clib.obj lib\aplib64.lib
-	move donut.lib lib\donut.lib
-
-	cl -Zp8 -nologo -DTEST -I include loader\inject.c
-	cl -Zp8 -nologo -DTEST -I include loader\inject_local.c
-hash:
-	cl -Zp8 -nologo -DTEST -I include hash.c loader\clib.c
-encrypt:
-	cl -Zp8 -nologo -DTEST -I include encrypt.c
-inject:
-	cl -Zp8 -nologo -DTEST -I include loader\inject.c
-inject_local:
-	cl -Zp8 -nologo -DTEST -I include loader\inject_local.c
-clean:
-	@del /Q mmap-windows.obj donut.obj hash.obj encrypt.obj inject.obj inject_local.obj depack.obj format.obj clib.obj exe2h.exe loader.exe hash.exe encrypt.exe inject.exe inject_local.exe donut.exe lib\donut.lib lib\donut.exp lib\donut.dll include\donut.res
diff --git a/thirdParty/donut b/thirdParty/donut
index b1e74fe..0e2a90b 160000
--- a/thirdParty/donut
+++ b/thirdParty/donut
@@ -1 +1 @@
-Subproject commit b1e74fed695e2953f70caf06c723a1472e9be1b1
+Subproject commit 0e2a90b8b89cd10c9f3f84de11e1d3038a9fd90c