9 files changed, 16 insertions, 11 deletions
diff --git a/lib/Makefile b/lib/Makefile
index f5eeded..1301e04 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,6 @@
 include ../Makefile.config
 
+# minimal C standard library
 TARGETLIB += libk
 libk.SRCS = \
 	libk/endian/little.c \
@@ -7,11 +8,16 @@ libk.SRCS = \
 	libk/stdlib/memcpy.c libk/stdlib/memset.c libk/stdlib/linked_list_allocator.c \
 	libk/string/itoa.c
 
-TESTS += tst/endian_little tst/mem tst/string tst/linked_list_allocator
+TESTS += \
+	 libk/endian/test_endian_little \
+	 libk/stdlib/test_linked_list_allocator libk/stdlib/test_mem \
+	 libk/string/test_string
 
+# blake2s hash algorithm
 TARGETLIB += blake2
 blake2.SRCS = blake2/blake2s.c
-TESTS += tst/blake2s_selftest
+
+TESTS += blake2/test_blake2s_selftest
 
 include ../rules.mk
 
diff --git a/lib/tst/blake2s_genkat.py b/lib/blake2/blake2s_genkat.py
index 2dd5370..2dd5370 100755
--- a/lib/tst/blake2s_genkat.py
+++ b/lib/blake2/blake2s_genkat.py
diff --git a/lib/tst/blake2s_kat.h b/lib/blake2/test_blake2_kat.h
index aa42ef5..aa42ef5 100644
--- a/lib/tst/blake2s_kat.h
+++ b/lib/blake2/test_blake2_kat.h
diff --git a/lib/tst/blake2s_selftest.cc b/lib/blake2/test_blake2s_selftest.cc
index 58199f6..2c046b2 100644
--- a/lib/tst/blake2s_selftest.cc
+++ b/lib/blake2/test_blake2s_selftest.cc
@@ -1,9 +1,8 @@
 // Self test Modules for  BLAKE2s
+#include "blake2s.c"
+#include "test_blake2_kat.h"
 #include <gtest/gtest.h>
 
-#include "../blake2/blake2s.c"
-#include "blake2s_kat.h"
-
 static_assert(sizeof(BLAKE2s_param) == (8 * sizeof(uint32_t)), "sizeof struct BLAKE2s_param");
 
 // Deterministic sequences (Fibonacci generator).
diff --git a/lib/tst/endian_little.cc b/lib/libk/endian/test_endian_little.cc
index 9c8c73b..97ee286 100644
--- a/lib/tst/endian_little.cc
+++ b/lib/libk/endian/test_endian_little.cc
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 namespace libk {
-#include "../libk/endian/little.c"
+#include "little.c"
 } // namespace libk
 
 TEST(endian_little, htole16)
diff --git a/lib/tst/allocator.hh b/lib/libk/stdlib/test_allocator.hh
index 3bc1715..3bc1715 100644
--- a/lib/tst/allocator.hh
+++ b/lib/libk/stdlib/test_allocator.hh
diff --git a/lib/tst/linked_list_allocator.cc b/lib/libk/stdlib/test_linked_list_allocator.cc
index a2575d5..5963ce1 100644
--- a/lib/tst/linked_list_allocator.cc
+++ b/lib/libk/stdlib/test_linked_list_allocator.cc
@@ -3,7 +3,7 @@
 #include <iostream>
 
 namespace libk {
-#include "../libk/stdlib/linked_list_allocator.c"
+#include "linked_list_allocator.c"
 
 std::ostream &
 operator<<(std::ostream &os, const Chunk &b)
@@ -16,7 +16,7 @@ operator<<(std::ostream &os, const Chunk &b)
 }
 }; // namespace libk
 
-#include "allocator.hh"
+#include "test_allocator.hh"
 
 TEST(UninitializedAllocator, malloc) { EXPECT_EQ(libk::malloc(1024), nullptr); }
 
diff --git a/lib/tst/mem.cc b/lib/libk/stdlib/test_mem.cc
index 1ad266c..f8a5e18 100644
--- a/lib/tst/mem.cc
+++ b/lib/libk/stdlib/test_mem.cc
@@ -3,8 +3,8 @@
 #define restrict __restrict__
 
 namespace libk {
-#include "../libk/stdlib/memcpy.c"
-#include "../libk/stdlib/memset.c"
+#include "memcpy.c"
+#include "memset.c"
 } // namespace libk
 
 TEST(mem, memset)
diff --git a/lib/tst/string.cc b/lib/libk/string/test_string.cc
index f22c123..d12b318 100644
--- a/lib/tst/string.cc
+++ b/lib/libk/string/test_string.cc
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 namespace libk {
-#include "../libk/string/itoa.c"
+#include "itoa.c"
 }
 
 char buffer[64];