diff --git a/api/tests/movies/get-all-movies.test.ts b/api/tests/movies/get-all-movies.test.ts
new file mode 100644
index 00000000..1b76eea1
--- /dev/null
+++ b/api/tests/movies/get-all-movies.test.ts
@@ -0,0 +1,108 @@
+import { afterAll, beforeAll, describe, expect, it } from "bun:test";
+import { eq } from "drizzle-orm";
+import Elysia from "elysia";
+import { base } from "~/base";
+import { movies } from "~/controllers/movies";
+import { seedMovie } from "~/controllers/seed/movies";
+import { db } from "~/db";
+import { shows } from "~/db/schema";
+import { bubble } from "~/models/examples";
+import { dune1984 } from "~/models/examples/dune-1984";
+import { dune } from "~/models/examples/dune-2021";
+
+const app = new Elysia().use(base).use(movies);
+const getMovies = async ({
+	langs,
+	...query
+}: {
+	filter?: string;
+	limit?: number;
+	after?: string;
+	sort?: string[];
+	langs?: string;
+}) => {
+	const params = new URLSearchParams();
+	for (const [key, value] of Object.entries(query)) {
+		if (!Array.isArray(value)) {
+			params.append(key, value.toString());
+			continue;
+		}
+		for (const v of value) params.append(key, v.toString());
+	}
+
+	const resp = await app.handle(
+		new Request(`http://localhost/movies?${params}`, {
+			method: "GET",
+			headers: langs
+				? {
+						"Accept-Language": langs,
+					}
+				: {},
+		}),
+	);
+	const body = await resp.json();
+	return [resp, body] as const;
+};
+
+function expectStatus(resp: Response, body: object) {
+	const matcher = expect({ ...body, status: resp.status });
+	return {
+		toBe: (status: number) => {
+			matcher.toMatchObject({ status: status });
+		},
+	};
+}
+
+describe("Get all movies", () => {
+	it("Invalid filter params", async () => {
+		const [resp, body] = await getMovies({
+			filter: `slug eq ${bubble.slug}`,
+			langs: "en",
+		});
+
+		expectStatus(resp, body).toBe(422);
+		expect(body).toMatchObject({
+			status: 422,
+			message:
+				"Invalid property: slug. Expected one of genres, rating, status, runtime, airDate, originalLanguage.",
+			details: {
+				in: "slug eq bubble",
+			},
+		});
+	});
+	it("Invalid filter syntax", async () => {
+		const [resp, body] = await getMovies({
+			filter: `slug eq gt ${bubble.slug}`,
+			langs: "en",
+		});
+
+		expectStatus(resp, body).toBe(422);
+		expect(body).toMatchObject({
+			details: expect.objectContaining( {
+				in: "slug eq gt bubble",
+			}),
+			message: "Invalid filter: slug eq gt bubble.",
+			status: 422,
+		});
+	});
+	it("Limit 1, default sort", async () => {
+		const [resp, body] = await getMovies({
+			limit: 1,
+			langs: "en",
+		});
+
+		expectStatus(resp, body).toBe(200);
+		expect(body).toMatchObject({
+			items: [bubble],
+			this: "",
+		});
+	});
+});
+
+beforeAll(async () => {
+	await db.delete(shows);
+	for (const movie of [bubble, dune1984, dune]) await seedMovie(movie);
+});
+afterAll(async () => {
+	await db.delete(shows);
+});
diff --git a/api/tests/movies/get-movies.test.ts b/api/tests/movies/get-movies.test.ts
index 689a34c9..fca0d08a 100644
--- a/api/tests/movies/get-movies.test.ts
+++ b/api/tests/movies/get-movies.test.ts
@@ -23,30 +23,6 @@ const getMovie = async (id: string, langs?: string) => {
 	const body = await resp.json();
 	return [resp, body] as const;
 };
-const getMovies = async ({
-	langs,
-	...query
-}: { filter?: string; langs?: string }) => {
-	// const params = Object.entries(query).reduce(
-	// 	(acc, [param, value]) => `${param}=${value}&`,
-	// 	"?",
-	// );
-	const resp = await app.handle(
-		new Request(
-			`http://localhost/movies?${new URLSearchParams(query).toString()}`,
-			{
-				method: "GET",
-				headers: langs
-					? {
-							"Accept-Language": langs,
-						}
-					: {},
-			},
-		),
-	);
-	const body = await resp.json();
-	return [resp, body] as const;
-};
 
 let bubbleId = "";
 
@@ -119,25 +95,6 @@ describe("Get movie", () => {
 	});
 });
 
-describe("Get all movies", () => {
-	it("Invalid filter params", async () => {
-		const [resp, body] = await getMovies({
-			filter: `slug eq ${bubble.slug}`,
-			langs: "en",
-		});
-
-		expectStatus(resp, body).toBe(422);
-		expect(body).toMatchObject({
-			status: 422,
-			message:
-				"Invalid property: slug. Expected one of genres, rating, status, runtime, airDate, originalLanguage.",
-			details: {
-				in: "slug eq bubble",
-			},
-		});
-	});
-});
-
 beforeAll(async () => {
 	const ret = await seedMovie(bubble);
 	bubbleId = ret.id;