diff --git a/build.zig b/build.zig
index 94c5905..d644d4f 100644
--- a/build.zig
+++ b/build.zig
@@ -99,14 +99,24 @@ pub fn build(b: *std.build.Builder) !void {
     exe.addSystemIncludePath("/usr/include/");
 
     const unittest_http_cmd = b.step("unit:http", "Run tests for http package");
-    const unittest_http = b.addTest("src/http/test.zig");
+    const unittest_http = b.addTest("src/http/lib.zig");
     unittest_http_cmd.dependOn(&unittest_http.step);
     unittest_http.addPackage(pkgs.util);
 
     const unittest_util_cmd = b.step("unit:util", "Run tests for util package");
-    const unittest_util = b.addTest("src/util/test.zig");
+    const unittest_util = b.addTest("src/util/lib.zig");
     unittest_util_cmd.dependOn(&unittest_util.step);
 
+    const unittest_sql_cmd = b.step("unit:sql", "Run tests for sql package");
+    const unittest_sql = b.addTest("src/sql/lib.zig");
+    unittest_sql_cmd.dependOn(&unittest_sql.step);
+    unittest_sql.addPackage(pkgs.util);
+
+    const unittest_template_cmd = b.step("unit:template", "Run tests for template package");
+    const unittest_template = b.addTest("src/template/lib.zig");
+    unittest_template_cmd.dependOn(&unittest_template.step);
+    //unittest_template.addPackage(pkgs.util);
+
     //const util_tests = b.addTest("src/util/lib.zig");
     //const sql_tests = b.addTest("src/sql/lib.zig");
     //http_tests.addPackage(pkgs.util);
@@ -116,6 +126,8 @@ pub fn build(b: *std.build.Builder) !void {
     const unittest_all = b.step("unit", "Run unit tests");
     unittest_all.dependOn(unittest_http_cmd);
     unittest_all.dependOn(unittest_util_cmd);
+    unittest_all.dependOn(unittest_sql_cmd);
+    unittest_all.dependOn(unittest_template_cmd);
 
     const api_integration = b.addTest("./tests/api_integration/lib.zig");
     api_integration.addPackage(pkgs.opts);
diff --git a/src/http/lib.zig b/src/http/lib.zig
index 2b46311..abde83e 100644
--- a/src/http/lib.zig
+++ b/src/http/lib.zig
@@ -3,15 +3,15 @@ const std = @import("std");
 const request = @import("./request.zig");
 const server = @import("./server.zig");
 pub const urlencode = @import("./urlencode.zig");
-
 pub const socket = @import("./socket.zig");
+const json = @import("./json.zig");
 
 pub const Method = std.http.Method;
 pub const Status = std.http.Status;
 
 pub const Request = request.Request(server.Stream.Reader);
 pub const Response = server.Response;
-pub const Handler = server.Handler;
+//pub const Handler = server.Handler;
 pub const Server = server.Server;
 
 pub const middleware = @import("./middleware.zig");
@@ -23,3 +23,7 @@ pub const Protocol = enum {
     http_1_1,
     http_1_x,
 };
+
+test {
+    _ = std.testing.refAllDecls(@This());
+}
diff --git a/src/util/lib.zig b/src/util/lib.zig
index 77aa529..6d69c47 100644
--- a/src/util/lib.zig
+++ b/src/util/lib.zig
@@ -249,3 +249,7 @@ pub const testing = struct {
         }
     }
 };
+
+test {
+    _ = std.testing.refAllDecls(@This());
+}