diff --git a/test/config.test.mjs b/test/unit/config.test.mjs
similarity index 95%
rename from test/config.test.mjs
rename to test/unit/config.test.mjs
index b02f18d..28deec9 100644
--- a/test/config.test.mjs
+++ b/test/unit/config.test.mjs
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import { getConfig } from '../lib/config.mjs';
+import { getConfig } from '../../lib/config.mjs';
 
 describe('lib/config', () => {
   it('should return default config', () => {
diff --git a/test/handlers.test.mjs b/test/unit/handlers.test.mjs
similarity index 88%
rename from test/handlers.test.mjs
rename to test/unit/handlers.test.mjs
index fc55a9b..efd5e94 100644
--- a/test/handlers.test.mjs
+++ b/test/unit/handlers.test.mjs
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import { getHandler, runHandler } from '../lib/handlers.mjs';
+import { getHandler, runHandler } from '../../lib/handlers.mjs';
 
 describe('lib/handlers', () => {
   describe('#getHandler', () => {
@@ -17,6 +17,11 @@ describe('lib/handlers', () => {
       const handler = await getHandler('test/handlers/plain-modulejs.handler');
       assert.ok(typeof handler === 'function', 'Expected handler to be a function');
     });
+
+    it('should return a valid handler (.ts)', async () => {
+      const handler = await getHandler('test/handlers/typed.handler');
+      assert.ok(typeof handler === 'function', 'Expected handler to be a function');
+    });
   });
 
   describe('#runHandler', () => {
diff --git a/test/requests.test.mjs b/test/unit/requests.test.mjs
similarity index 98%
rename from test/requests.test.mjs
rename to test/unit/requests.test.mjs
index be0ed90..78d4811 100644
--- a/test/requests.test.mjs
+++ b/test/unit/requests.test.mjs
@@ -2,7 +2,7 @@ import assert from 'assert';
 import axios from 'axios';
 import { randomBytes } from 'crypto';
 import { createServer } from 'http';
-import { getReqHeader, getReqBody, setResResult } from '../lib/requests.mjs';
+import { getReqHeader, getReqBody, setResResult } from '../../lib/requests.mjs';
 
 describe('lib/requests', () => {
   function httpRequest(config, assertion) {
diff --git a/test/server.test.mjs b/test/unit/server.test.mjs
similarity index 95%
rename from test/server.test.mjs
rename to test/unit/server.test.mjs
index 8b489b2..6fbb65c 100644
--- a/test/server.test.mjs
+++ b/test/unit/server.test.mjs
@@ -1,6 +1,6 @@
 import assert from 'assert';
 import axios from 'axios';
-import { createServer } from '../lib/server.mjs';
+import { createServer } from '../../lib/server.mjs';
 
 describe('lib/server', () => {
   async function httpRequest({ createEvent, createContext, handlerName = 'app.handler', handlerFn }) {
diff --git a/test/utils.test.mjs b/test/unit/utils.test.mjs
similarity index 96%
rename from test/utils.test.mjs
rename to test/unit/utils.test.mjs
index 71719c1..e5c298a 100644
--- a/test/utils.test.mjs
+++ b/test/unit/utils.test.mjs
@@ -1,5 +1,5 @@
 import assert from 'assert';
-import { getApiGatewayReqTime, getContextLogStreamTime, isPlainObject } from '../lib/utils.mjs';
+import { getApiGatewayReqTime, getContextLogStreamTime, isPlainObject } from '../../lib/utils.mjs';
 
 describe('lib/utils', () => {