diff --git a/Makefile b/Makefile
index 35ee08a9..520a56ba 100644
--- a/Makefile
+++ b/Makefile
@@ -118,9 +118,9 @@ obj/%.o: %.cpp | mk_obj_dir
 $(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT) $(ARLIB_LANG)
 	$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
 
-$(SHLIB): $(LIB_OBJS) $(SHLIB_LANG)
+$(SHLIB): $(LIB_OBJS)
 ifneq ($(USE_STATIC),yes)
-	$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LDLIBS) $(SHLIB_LANG)
+	$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LDLIBS)
 endif
 
 $(SHLIB_CLIENT): $(LIB_CLIENT_OBJS) $(SHLIB) $(SHLIB_LANG)
diff --git a/Makefile.linux b/Makefile.linux
index 9a3fdda3..d01f2b73 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -20,10 +20,10 @@ else ifeq ($(shell expr match ${CXXVER} "4\.[8-9]"),3) # gcc 4.8 - 4.9
 else ifeq ($(shell expr match ${CXXVER} "[5-6]"),1) # gcc 5 - 6
 	NEEDED_CXXFLAGS += -std=c++11
 	LDLIBS = -latomic
-else ifeq ($(shell expr match ${CXXVER} "[7-9]"),1) # gcc 7 - 9 
+else ifeq ($(shell expr match ${CXXVER} "[7-9]"),1) # gcc 7 - 9
 	NEEDED_CXXFLAGS += -std=c++17
 	LDLIBS = -latomic
-else ifeq ($(shell expr match ${CXXVER} "1[0-9]"),2) # gcc 10 - 19
+else ifeq ($(shell expr match ${CXXVER} "1[0-9]"),2) # gcc 10+
 #	NEEDED_CXXFLAGS += -std=c++20
 	NEEDED_CXXFLAGS += -std=c++17
 	LDLIBS = -latomic
diff --git a/build/.gitignore b/build/.gitignore
index 872332c5..7689cc88 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,5 +1,7 @@
 # Various generated files
 /CMakeFiles/
+/Testing/
+/tests/
 /i2pd
 /libi2pd.a
 /libi2pdclient.a
@@ -8,6 +10,7 @@
 /CMakeCache.txt
 /CPackConfig.cmake
 /CPackSourceConfig.cmake
+/CTestTestfile.cmake
 /install_manifest.txt
 /arch.c
 # windows build script
diff --git a/libi2pd/HTTP.cpp b/libi2pd/HTTP.cpp
index 8b61c7e5..7cc87df8 100644
--- a/libi2pd/HTTP.cpp
+++ b/libi2pd/HTTP.cpp
@@ -356,8 +356,8 @@ namespace http
 		for (auto& it : headers)
 			if (it.first == name) num++;
 		return num;
-	}	
-	
+	}
+
 	bool HTTPRes::is_chunked() const
 	{
 		auto it = headers.find("Transfer-Encoding");
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 00000000..90457c23
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,12 @@
+/test-http-merge_chunked
+/test-http-req
+/test-http-res
+/test-http-url
+/test-http-url_decode
+/test-gost
+/test-gost-sig
+/test-base-64
+/test-x25519
+/test-aeadchacha20poly1305
+/test-blinding
+/test-elligator
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c6eec047..21daadd9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,9 +4,9 @@ include_directories(${CHECK_INCLUDE_DIRS})
 
 # Compiler flags:
 if(APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -Wl,-undefined,dynamic_lookup")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -Wl,-undefined,dynamic_lookup")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -D_GLIBCXX_USE_NANOSLEEP=1 -Wl,--unresolved-symbols=ignore-in-object-files")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -Wl,--unresolved-symbols=ignore-in-object-files")
 endif()
 
 set(TEST_PATH ${CMAKE_CURRENT_BINARY_DIR})
@@ -18,80 +18,50 @@ include_directories(
 )
 
 set(test-http-merge_chunked_SRCS
-  ../libi2pd/HTTP.cpp
   test-http-merge_chunked.cpp
 )
 
 set(test-http-req_SRCS
-  ../libi2pd/HTTP.cpp
   test-http-req.cpp
 )
 
 set(test-http-res_SRCS
-  ../libi2pd/HTTP.cpp
   test-http-res.cpp
 )
 
 set(test-http-url_decode_SRCS
-  ../libi2pd/HTTP.cpp
   test-http-url_decode.cpp
 )
 
 set(test-http-url_SRCS
-  ../libi2pd/HTTP.cpp
   test-http-url.cpp
 )
 
 set(test-base-64_SRCS
-  ../libi2pd/Base.cpp
   test-base-64.cpp
 )
 
 set(test-gost_SRCS
-  ../libi2pd/Gost.cpp
-  ../libi2pd/I2PEndian.cpp
   test-gost.cpp
 )
 
 set(test-gost-sig_SRCS
-  ../libi2pd/Gost.cpp
-  ../libi2pd/I2PEndian.cpp
-  ../libi2pd/Crypto.cpp
-  ../libi2pd/Log.cpp
   test-gost-sig.cpp
 )
 
 set(test-x25519_SRCS
-  ../libi2pd/Ed25519.cpp
-  ../libi2pd/I2PEndian.cpp
-  ../libi2pd/Log.cpp
-  ../libi2pd/Crypto.cpp
   test-x25519.cpp
 )
 
 set(test-aeadchacha20poly1305_SRCS
-  ../libi2pd/Crypto.cpp
-  ../libi2pd/ChaCha20.cpp
-  ../libi2pd/Poly1305.cpp
   test-aeadchacha20poly1305.cpp
 )
 
 set(test-blinding_SRCS
-  ../libi2pd/Crypto.cpp
-  ../libi2pd/Blinding.cpp
-  ../libi2pd/Ed25519.cpp
-  ../libi2pd/I2PEndian.cpp
-  ../libi2pd/Log.cpp
-  ../libi2pd/util.cpp
-  ../libi2pd/Identity.cpp
-  ../libi2pd/Signature.cpp
-  ../libi2pd/Timestamp.cpp
   test-blinding.cpp
 )
 
 SET(test-elligator_SRCS
-  ../libi2pd/Elligator.cpp
-  ../libi2pd/Crypto.cpp
   test-elligator.cpp
 )
 
@@ -109,15 +79,23 @@ add_executable(test-blinding ${test-blinding_SRCS})
 add_executable(test-elligator ${test-elligator_SRCS})
 
 set(LIBS
+  libi2pd
   ${Boost_LIBRARIES}
-  ${CHECK_LDFLAGS}
-  ${CMAKE_REQUIRED_LIBRARIES}
   OpenSSL::SSL
   OpenSSL::Crypto
+  ZLIB::ZLIB
   Threads::Threads
+  ${CHECK_LDFLAGS}
+  ${CMAKE_REQUIRED_LIBRARIES}
 )
 
-target_link_libraries(test-gost OpenSSL::Crypto Threads::Threads)
+target_link_libraries(test-http-merge_chunked ${LIBS})
+target_link_libraries(test-http-req ${LIBS})
+target_link_libraries(test-http-res ${LIBS})
+target_link_libraries(test-http-url_decode ${LIBS})
+target_link_libraries(test-http-url ${LIBS})
+target_link_libraries(test-base-64 ${LIBS})
+target_link_libraries(test-gost ${LIBS})
 target_link_libraries(test-gost-sig ${LIBS})
 target_link_libraries(test-x25519 ${LIBS})
 target_link_libraries(test-aeadchacha20poly1305 ${LIBS})
diff --git a/tests/Makefile b/tests/Makefile
index f8f6cf77..db71a06e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,36 +1,50 @@
-CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -pthread -Wl,--unresolved-symbols=ignore-in-object-files
+CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -DOPENSSL_SUPPRESS_DEPRECATED -pthread -Wl,--unresolved-symbols=ignore-in-object-files
 INCFLAGS += -I../libi2pd
 
-TESTS = test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator
+LIBI2PD = ../libi2pd.a
+
+TESTS = \
+	test-http-merge_chunked test-http-req test-http-res test-http-url test-http-url_decode \
+	test-gost test-gost-sig test-base-64 test-x25519 test-aeadchacha20poly1305 test-blinding test-elligator
+
+LDLIBS = \
+	-lcrypto \
+	-lssl \
+	-lboost_filesystem \
+	-lboost_program_options \
+	-lpthread
 
 all: $(TESTS) run
 
-test-http-%: ../libi2pd/HTTP.cpp test-http-%.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
+$(LIBI2PD):
+	@echo "Building libi2pd.a ..." && cd .. && $(MAKE) libi2pd.a
+
+test-http-%: test-http-%.cpp $(LIBI2PD)
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-base-%: ../libi2pd/Base.cpp test-base-%.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^
+test-base-%: test-base-%.cpp $(LIBI2PD)
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-gost: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp test-gost.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto
+test-gost: test-gost.cpp $(LIBI2PD)
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-gost-sig: ../libi2pd/Gost.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Crypto.cpp ../libi2pd/Log.cpp test-gost-sig.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
+test-gost-sig: test-gost-sig.cpp $(LIBI2PD)
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-x25519: ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/Crypto.cpp test-x25519.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
+test-x25519: test-x25519.cpp $(LIBI2PD)
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-aeadchacha20poly1305: ../libi2pd/Crypto.cpp ../libi2pd/ChaCha20.cpp ../libi2pd/Poly1305.cpp test-aeadchacha20poly1305.cpp
-	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
+test-aeadchacha20poly1305: test-aeadchacha20poly1305.cpp $(LIBI2PD)
+	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-blinding: ../libi2pd/Crypto.cpp ../libi2pd/Blinding.cpp ../libi2pd/Ed25519.cpp ../libi2pd/I2PEndian.cpp ../libi2pd/Log.cpp ../libi2pd/util.cpp ../libi2pd/Identity.cpp ../libi2pd/Signature.cpp ../libi2pd/Timestamp.cpp test-blinding.cpp
-	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
+test-blinding: test-blinding.cpp $(LIBI2PD)
+	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
-test-elligator: ../libi2pd/Elligator.cpp ../libi2pd/Crypto.cpp test-elligator.cpp
-	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ -lcrypto -lssl -lboost_system
+test-elligator: test-elligator.cpp $(LIBI2PD)
+	 $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -o $@ $^ $(LDLIBS)
 
 run: $(TESTS)
-	@for TEST in $(TESTS); do ./$$TEST ; done
+	@for TEST in $(TESTS); do echo Running $$TEST; ./$$TEST ; done
 
 clean:
 	rm -f $(TESTS)
diff --git a/tests/test-aeadchacha20poly1305.cpp b/tests/test-aeadchacha20poly1305.cpp
index de9f1db2..64a0f358 100644
--- a/tests/test-aeadchacha20poly1305.cpp
+++ b/tests/test-aeadchacha20poly1305.cpp
@@ -7,28 +7,28 @@
 char text[] = "Ladies and Gentlemen of the class of '99: If I could offer you "
 "only one tip for the future, sunscreen would be it."; // 114 bytes
 
-uint8_t key[32] = 
+uint8_t key[32] =
 {
     0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
 };
 
-uint8_t ad[12] = 
+uint8_t ad[12] =
 {
     0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7
 };
 
-uint8_t nonce[12] = 
+uint8_t nonce[12] =
 {
 	0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47
 };
 
-uint8_t tag[16] = 
+uint8_t tag[16] =
 {
 	0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a, 0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91
 };
 
-uint8_t encrypted[114] = 
+uint8_t encrypted[114] =
 {
     0xd3, 0x1a, 0x8d, 0x34, 0x64, 0x8e, 0x60, 0xdb, 0x7b, 0x86, 0xaf, 0xbc, 0x53, 0xef, 0x7e, 0xc2,
     0xa4, 0xad, 0xed, 0x51, 0x29, 0x6e, 0x08, 0xfe, 0xa9, 0xe2, 0xb5, 0xa7, 0x36, 0xee, 0x62, 0xd6,
@@ -53,7 +53,7 @@ int main ()
 	assert (memcmp (buf1, text, 114) == 0);
 	// test encryption of multiple buffers
 	memcpy (buf, text, 114);
-	std::vector<std::pair<uint8_t*, std::size_t> > bufs{ std::make_pair (buf, 20), std::make_pair (buf + 20, 10), std::make_pair (buf + 30, 70), std::make_pair (buf + 100, 14) };  
+	std::vector<std::pair<uint8_t*, std::size_t> > bufs{ std::make_pair (buf, 20), std::make_pair (buf + 20, 10), std::make_pair (buf + 30, 70), std::make_pair (buf + 100, 14) };
 	i2p::crypto::AEADChaCha20Poly1305Encrypt (bufs, key, nonce, buf + 114);
 	i2p::crypto::AEADChaCha20Poly1305 (buf, 114, nullptr, 0, key, nonce, buf1, 114, false);
 	assert (memcmp (buf1, text, 114) == 0);
diff --git a/tests/test-blinding.cpp b/tests/test-blinding.cpp
index d7c41809..10b72e4f 100644
--- a/tests/test-blinding.cpp
+++ b/tests/test-blinding.cpp
@@ -13,12 +13,12 @@ void BlindTest (SigningKeyType sigType)
 {
 	auto keys = PrivateKeys::CreateRandomKeys (sigType);
 	BlindedPublicKey blindedKey (keys.GetPublic ());
-	auto timestamp = GetSecondsSinceEpoch ();	
+	auto timestamp = GetSecondsSinceEpoch ();
 	char date[9];
 	GetDateString (timestamp, date);
-	uint8_t blindedPriv[32], blindedPub[32]; 
+	uint8_t blindedPriv[32], blindedPub[32];
 	auto publicKeyLen = blindedKey.BlindPrivateKey (keys.GetSigningPrivateKey (), date, blindedPriv, blindedPub);
-	uint8_t blindedPub1[32];	
+	uint8_t blindedPub1[32];
 	blindedKey.GetBlindedKey (date, blindedPub1);
 	// check if public key produced from private blinded key matches blided public key
 	assert (!memcmp (blindedPub, blindedPub1, publicKeyLen));
@@ -26,16 +26,16 @@ void BlindTest (SigningKeyType sigType)
 	std::unique_ptr<Signer> blindedSigner (PrivateKeys::CreateSigner (blindedKey.GetBlindedSigType (), blindedPriv));
 	uint8_t buf[100], signature[64];
 	memset (buf, 1, 100);
-	blindedSigner->Sign (buf, 100, signature);	
+	blindedSigner->Sign (buf, 100, signature);
 	std::unique_ptr<Verifier> blindedVerifier (IdentityEx::CreateVerifier (blindedKey.GetBlindedSigType ()));
 	blindedVerifier->SetPublicKey (blindedPub);
-	assert (blindedVerifier->Verify (buf, 100, signature));		
+	assert (blindedVerifier->Verify (buf, 100, signature));
 }
 
 int main ()
 {
-	// EdDSA test	
+	// EdDSA test
 	BlindTest (SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519);
-	// RedDSA test	
+	// RedDSA test
 	BlindTest (SIGNING_KEY_TYPE_REDDSA_SHA512_ED25519);
 }
diff --git a/tests/test-elligator.cpp b/tests/test-elligator.cpp
index 48c9e31a..359c71c5 100644
--- a/tests/test-elligator.cpp
+++ b/tests/test-elligator.cpp
@@ -4,19 +4,19 @@
 
 #include "Elligator.h"
 
-const uint8_t key[32] = 
+const uint8_t key[32] =
 {
 	0x33, 0x95, 0x19, 0x64, 0x00, 0x3c, 0x94, 0x08, 0x78, 0x06, 0x3c, 0xcf, 0xd0, 0x34, 0x8a, 0xf4,
 	0x21, 0x50, 0xca, 0x16, 0xd2, 0x64, 0x6f, 0x2c, 0x58, 0x56, 0xe8, 0x33, 0x83, 0x77, 0xd8, 0x80
 };
 
-const uint8_t encoded_key[32] = 
+const uint8_t encoded_key[32] =
 {
 	0x28, 0x20, 0xb6, 0xb2, 0x41, 0xe0, 0xf6, 0x8a, 0x6c, 0x4a, 0x7f, 0xee, 0x3d, 0x97, 0x82, 0x28,
 	0xef, 0x3a, 0xe4, 0x55, 0x33, 0xcd, 0x41, 0x0a, 0xa9, 0x1a, 0x41, 0x53, 0x31, 0xd8, 0x61, 0x2d
 };
 
-const uint8_t encoded_key_high_y[32] = 
+const uint8_t encoded_key_high_y[32] =
 {
 	0x3c, 0xfb, 0x87, 0xc4, 0x6c, 0x0b, 0x45, 0x75, 0xca, 0x81, 0x75, 0xe0, 0xed, 0x1c, 0x0a, 0xe9,
 	0xda, 0xe7, 0x9d, 0xb7, 0x8d, 0xf8, 0x69, 0x97, 0xc4, 0x84, 0x7b, 0x9f, 0x20, 0xb2, 0x77, 0x18
@@ -28,7 +28,7 @@ const uint8_t encoded1[32] =
 	0x14, 0x50, 0x95, 0x89, 0x28, 0x84, 0x57, 0x99, 0x5a, 0x2b, 0x4c, 0xa3, 0x49, 0x0a, 0xa2, 0x07
 };
 
-const uint8_t key1[32] = 
+const uint8_t key1[32] =
 {
 	0x1e, 0x8a, 0xff, 0xfe, 0xd6, 0xbf, 0x53, 0xfe, 0x27, 0x1a, 0xd5, 0x72, 0x47, 0x32, 0x62, 0xde,
 	0xd8, 0xfa, 0xec, 0x68, 0xe5, 0xe6, 0x7e, 0xf4, 0x5e, 0xbb, 0x82, 0xee, 0xba, 0x52, 0x60, 0x4f
@@ -40,7 +40,7 @@ const uint8_t encoded2[32] =
 	0xd9, 0x03, 0x65, 0xf2, 0x4a, 0x38, 0xaa, 0x7a, 0xef, 0x1b, 0x97, 0xe2, 0x39, 0x54, 0x10, 0x1b
 };
 
-const uint8_t key2[32] = 
+const uint8_t key2[32] =
 {
 	0x79, 0x4f, 0x05, 0xba, 0x3e, 0x3a, 0x72, 0x95, 0x80, 0x22, 0x46, 0x8c, 0x88, 0x98, 0x1e, 0x0b,
 	0xe5, 0x78, 0x2b, 0xe1, 0xe1, 0x14, 0x5c, 0xe2, 0xc3, 0xc6, 0xfd, 0xe1, 0x6d, 0xed, 0x53, 0x63
@@ -52,7 +52,7 @@ const uint8_t encoded3[32] =
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f
 };
 
-const uint8_t key3[32] = 
+const uint8_t key3[32] =
 {
 	0x9c, 0xdb, 0x52, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
 	0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55
diff --git a/tests/test-x25519.cpp b/tests/test-x25519.cpp
index 2ab8ad6a..a1f3f424 100644
--- a/tests/test-x25519.cpp
+++ b/tests/test-x25519.cpp
@@ -4,21 +4,21 @@
 
 #include "Ed25519.h"
 
-const uint8_t k[32] = 
+const uint8_t k[32] =
 {
     0xa5, 0x46, 0xe3, 0x6b, 0xf0, 0x52, 0x7c, 0x9d, 0x3b, 0x16, 0x15,
     0x4b, 0x82, 0x46, 0x5e, 0xdd, 0x62, 0x14, 0x4c, 0x0a, 0xc1, 0xfc,
     0x5a, 0x18, 0x50, 0x6a, 0x22, 0x44, 0xba, 0x44, 0x9a, 0xc4
 };
 
-const uint8_t u[32] = 
+const uint8_t u[32] =
 {
     0xe6, 0xdb, 0x68, 0x67, 0x58, 0x30, 0x30, 0xdb, 0x35, 0x94, 0xc1,
     0xa4, 0x24, 0xb1, 0x5f, 0x7c, 0x72, 0x66, 0x24, 0xec, 0x26, 0xb3,
     0x35, 0x3b, 0x10, 0xa9, 0x03, 0xa6, 0xd0, 0xab, 0x1c, 0x4c
 };
 
-uint8_t p[32] = 
+uint8_t p[32] =
 {
     0xc3, 0xda, 0x55, 0x37, 0x9d, 0xe9, 0xc6, 0x90, 0x8e, 0x94, 0xea,
     0x4d, 0xf2, 0x8d, 0x08, 0x4f, 0x32, 0xec, 0xcf, 0x03, 0x49, 0x1c,
@@ -36,4 +36,3 @@ int main ()
     assert(memcmp (buf, p, 32) == 0);
 #endif
 }
-