diff --git a/.github/workflows/test_project.yml b/.github/workflows/test_project.yml
index 732c45d6..3685e756 100644
--- a/.github/workflows/test_project.yml
+++ b/.github/workflows/test_project.yml
@@ -23,13 +23,13 @@ jobs:
         run: deno task cli:install
 
       - name: Check Formatting
-        run: cd tests/test_project/ && opengb format --check
+        run: cd tests/basic/ && opengb format --check
 
       - name: Lint
-        run: cd tests/test_project/ && opengb lint
+        run: cd tests/basic/ && opengb lint
 
       - name: Generate DB Migrations
-        run: cd tests/test_project/ && opengb db dev
+        run: cd tests/basic/ && opengb db dev
 
       - name: Run Tests
-        run: cd tests/test_project/ && opengb test
+        run: cd tests/basic/ && opengb test
diff --git a/deno.jsonc b/deno.jsonc
index 01413297..7ca7a45f 100644
--- a/deno.jsonc
+++ b/deno.jsonc
@@ -1,7 +1,7 @@
 {
 	"tasks": {
 		// Runs the CLI
-		"cli:run": "deno task artifacts:build:all && deno run -A --check src/cli/main.ts --path tests/test_project",
+		"cli:run": "deno task artifacts:build:all && deno run -A --check src/cli/main.ts --path tests/basic",
 
 		// Compiles the CLI to a binary
 		"cli:compile": "deno task artifacts:build:all && deno compile --check --allow-net --allow-read --allow-env --allow-run --allow-write --output _gen/cli src/cli/main.ts",
diff --git a/docs/KNOWN_ISSUES.md b/docs/KNOWN_ISSUES.md
index f380d73b..a58e5c4d 100644
--- a/docs/KNOWN_ISSUES.md
+++ b/docs/KNOWN_ISSUES.md
@@ -4,9 +4,11 @@
 
 [typescript-json-schema#547](https://github.com/YousefED/typescript-json-schema/issues/547)
 
+Will be fixed with [#15](https://github.com/rivet-gg/open-game-services-engine/issues/15).
+
 ## Moving modules folder breaks imports
 
 ```
 error: Module not found "file:///path/to/src/runtime/mod.ts".
-  at file:///path/to/tests/test_project/_gen/entrypoint.ts:3:25
+  at file:///path/to/tests/basic/_gen/entrypoint.ts:3:25
 ```
\ No newline at end of file
diff --git a/tests/test_project/backend.yaml b/tests/basic/backend.yaml
similarity index 100%
rename from tests/test_project/backend.yaml
rename to tests/basic/backend.yaml
diff --git a/tests/test_project/deno.json b/tests/basic/deno.json
similarity index 100%
rename from tests/test_project/deno.json
rename to tests/basic/deno.json
diff --git a/tests/test_project/deno.lock b/tests/basic/deno.lock
similarity index 100%
rename from tests/test_project/deno.lock
rename to tests/basic/deno.lock
diff --git a/tests/test_project/modules/foo/db/migrations/20240307013756_init/migration.sql b/tests/basic/modules/foo/db/migrations/20240307013756_init/migration.sql
similarity index 100%
rename from tests/test_project/modules/foo/db/migrations/20240307013756_init/migration.sql
rename to tests/basic/modules/foo/db/migrations/20240307013756_init/migration.sql
diff --git a/tests/test_project/modules/foo/db/migrations/migration_lock.toml b/tests/basic/modules/foo/db/migrations/migration_lock.toml
similarity index 100%
rename from tests/test_project/modules/foo/db/migrations/migration_lock.toml
rename to tests/basic/modules/foo/db/migrations/migration_lock.toml
diff --git a/tests/test_project/modules/foo/db/schema.prisma b/tests/basic/modules/foo/db/schema.prisma
similarity index 100%
rename from tests/test_project/modules/foo/db/schema.prisma
rename to tests/basic/modules/foo/db/schema.prisma
diff --git a/tests/test_project/modules/foo/module.yaml b/tests/basic/modules/foo/module.yaml
similarity index 100%
rename from tests/test_project/modules/foo/module.yaml
rename to tests/basic/modules/foo/module.yaml
diff --git a/tests/test_project/modules/foo/scripts/call_self.ts b/tests/basic/modules/foo/scripts/call_self.ts
similarity index 100%
rename from tests/test_project/modules/foo/scripts/call_self.ts
rename to tests/basic/modules/foo/scripts/call_self.ts
diff --git a/tests/test_project/modules/foo/scripts/create_entry.ts b/tests/basic/modules/foo/scripts/create_entry.ts
similarity index 100%
rename from tests/test_project/modules/foo/scripts/create_entry.ts
rename to tests/basic/modules/foo/scripts/create_entry.ts
diff --git a/tests/test_project/modules/foo/scripts/ping.ts b/tests/basic/modules/foo/scripts/ping.ts
similarity index 100%
rename from tests/test_project/modules/foo/scripts/ping.ts
rename to tests/basic/modules/foo/scripts/ping.ts
diff --git a/tests/test_project/modules/foo/tests/e2e.ts b/tests/basic/modules/foo/tests/e2e.ts
similarity index 100%
rename from tests/test_project/modules/foo/tests/e2e.ts
rename to tests/basic/modules/foo/tests/e2e.ts
diff --git a/tests/test_project/modules/foo/types/common.ts b/tests/basic/modules/foo/types/common.ts
similarity index 100%
rename from tests/test_project/modules/foo/types/common.ts
rename to tests/basic/modules/foo/types/common.ts