diff --git a/package.json b/package.json
index f6ec82c9d..496143631 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 
 		"setup": "node scripts/setup/setup.js",
 		"setup:test": "bun scripts/setup/setup-test.ts",
-		"tests": "bun scripts/test.ts",
+		"tests": "infisical run --env=dev -- bun scripts/test.ts",
 
 		"setupci": "node scripts/setup/setupci.js",
 		"replicate": "bun scripts/db/replicate.ts",
diff --git a/scripts/test.ts b/scripts/test.ts
index 9e6841dd6..dd4a2f696 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -2,8 +2,11 @@
 import { spawn } from "node:child_process";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
+import { loadLocalEnv } from "@server/utils/envUtils.js";
 import chalk from "chalk";
 
+loadLocalEnv();
+
 /**
  * Recursively finds all test files in a directory
  */
@@ -267,46 +270,17 @@ async function runTest() {
 	const frameworkLabel = framework === "bun" ? "Bun" : "Mocha";
 	console.log(chalk.cyan(`🧪 Running test file with ${frameworkLabel}...\n`));
 
+	if (framework !== "bun") {
+		console.error(chalk.red("❌ Mocha tests are deprecated"));
+		process.exit(1);
+	}
+
 	// Run the test file with the appropriate framework, wrapped with Infisical
-	const child =
-		framework === "bun"
-			? spawn(
-					"infisical",
-					[
-						"run",
-						"--env=dev",
-						"--",
-						"bun",
-						"test",
-						"--timeout",
-						"0",
-						testFile.relative,
-					],
-					{
-						cwd: serverDir,
-						stdio: "inherit",
-						env: { ...process.env, NODE_ENV: "production" },
-					},
-				)
-			: spawn(
-					"infisical",
-					[
-						"run",
-						"--env=dev",
-						"--",
-						"npx",
-						"mocha",
-						"--bail",
-						"--timeout",
-						"10000000",
-						testFile.relative,
-					],
-					{
-						cwd: serverDir,
-						stdio: "inherit",
-						env: { ...process.env, NODE_ENV: "production" },
-					},
-				);
+	const child = spawn("bun", ["test", "--timeout", "0", testFile.relative], {
+		cwd: serverDir,
+		stdio: "inherit",
+		env: { ...process.env, NODE_ENV: "production" },
+	});
 
 	// Store the process group ID
 	const pgid = child.pid;
@@ -363,3 +337,25 @@ async function runTest() {
 }
 
 runTest();
+
+// framework === "bun"
+// ?
+// : spawn(
+// 		"infisical",
+// 		[
+// 			"run",
+// 			"--env=dev",
+// 			"--",
+// 			"npx",
+// 			"mocha",
+// 			"--bail",
+// 			"--timeout",
+// 			"10000000",
+// 			testFile.relative,
+// 		],
+// 		{
+// 			cwd: serverDir,
+// 			stdio: "inherit",
+// 			env: { ...process.env, NODE_ENV: "production" },
+// 		},
+// 	);
diff --git a/scripts/testGroups/g1.sh b/scripts/testGroups/g1.sh
index b7f27073c..96ace6ce4 100755
--- a/scripts/testGroups/g1.sh
+++ b/scripts/testGroups/g1.sh
@@ -14,28 +14,28 @@ fi
 
 # Run tests using TypeScript runner with compact mode
 # Adjust --max to control concurrency (default: 6)
-# BUN_PARALLEL_COMPACT \
-  # 'server/tests/balances/check/basic' \
-  # 'server/tests/balances/check/credit-systems' \
-  # 'server/tests/balances/check/misc' \
-  # 'server/tests/balances/check/prepaid' \
-  # 'server/tests/balances/track/basic' \
-  # 'server/tests/balances/track/credit-systems' \
-  # 'server/tests/balances/track/entity-products' \
-  # 'server/tests/balances/track/legacy' \
-  # 'server/tests/balances/track/allocated' \
-  # 'server/tests/balances/track/entity-balances' \
-  # 'server/tests/balances/track/concurrency' \
-
-
 BUN_PARALLEL_COMPACT \
-  'server/tests/attach/basic' \
-  'server/tests/attach/entities' \
-  'server/tests/attach/upgrade' \
-  'server/tests/attach/downgrade' \
-  'server/tests/attach/free' \
-  'server/tests/attach/addOn' \
-  'server/tests/attach/entities' \
-  'server/tests/attach/checkout' \
-  'server/tests/attach/misc' \
-  --max=6 \
+  'server/tests/balances/check/basic' \
+  'server/tests/balances/check/credit-systems' \
+  'server/tests/balances/check/misc' \
+  'server/tests/balances/check/prepaid' \
+  'server/tests/balances/track/basic' \
+  'server/tests/balances/track/credit-systems' \
+  'server/tests/balances/track/entity-products' \
+  'server/tests/balances/track/legacy' \
+  'server/tests/balances/track/allocated' \
+  'server/tests/balances/track/entity-balances' \
+  'server/tests/balances/track/concurrency' \
+
+
+# BUN_PARALLEL_COMPACT \
+#   'server/tests/attach/basic' \
+#   'server/tests/attach/entities' \
+#   'server/tests/attach/upgrade' \
+#   'server/tests/attach/downgrade' \
+#   'server/tests/attach/free' \
+#   'server/tests/attach/addOn' \
+#   'server/tests/attach/entities' \
+#   'server/tests/attach/checkout' \
+#   'server/tests/attach/misc' \
+#   --max=6 \
diff --git a/scripts/testGroups/g2.sh b/scripts/testGroups/g2.sh
index dbe36f7f7..968721451 100755
--- a/scripts/testGroups/g2.sh
+++ b/scripts/testGroups/g2.sh
@@ -14,15 +14,15 @@ fi
 
 
 
-# BUN_PARALLEL_COMPACT \
-#   'server/tests/attach/migrations' \
-#   'server/tests/attach/others' \
-#   'server/tests/attach/newVersion' \
-#   'server/tests/attach/upgradeOld' \
-#   'server/tests/attach/updateEnts' \
-#   'server/tests/advanced/check' \
-#   'server/tests/attach/prepaid' \
-#   'server/tests/interval/upgrade' \
-#   'server/tests/interval/multiSub' \
-#   --max=6
+BUN_PARALLEL_COMPACT \
+  'server/tests/attach/migrations' \
+  'server/tests/attach/others' \
+  'server/tests/attach/newVersion' \
+  'server/tests/attach/upgradeOld' \
+  'server/tests/attach/updateEnts' \
+  'server/tests/advanced/check' \
+  'server/tests/attach/prepaid' \
+  'server/tests/interval/upgrade' \
+  'server/tests/interval/multiSub' \
+  --max=6
 
diff --git a/scripts/testGroups/g5.sh b/scripts/testGroups/g5.sh
index 4e7e2c76f..5e643e8b7 100755
--- a/scripts/testGroups/g5.sh
+++ b/scripts/testGroups/g5.sh
@@ -31,8 +31,8 @@ BUN_PARALLEL_COMPACT \
   --max=6
 
 
-# BUN_PARALLEL_COMPACT \
-#   'server/tests/advanced/usage'
-#   'server/tests/crud/plan'
+BUN_PARALLEL_COMPACT \
+  'server/tests/advanced/usage'
+  # 'server/tests/crud/plan'
 
 # 'server/tests/advanced/referrals/paid' \
\ No newline at end of file
diff --git a/scripts/testScripts/runTests.ts b/scripts/testScripts/runTests.ts
index 2fbd88712..9e3ed2b76 100755
--- a/scripts/testScripts/runTests.ts
+++ b/scripts/testScripts/runTests.ts
@@ -1,11 +1,14 @@
 #!/usr/bin/env bun
 
+import { readdir } from "node:fs/promises";
+import { basename, resolve } from "node:path";
+import { loadLocalEnv } from "@server/utils/envUtils.js";
 import { spawn } from "bun";
 import chalk from "chalk";
 import dotenv from "dotenv";
-import { readdir } from "fs/promises";
 import pLimit from "p-limit";
-import { basename, resolve } from "path";
+
+loadLocalEnv();
 
 // Load environment variables from server/.env
 dotenv.config({ path: resolve(process.cwd(), "server", ".env") });
diff --git a/server/package.json b/server/package.json
index 4e7dc4fab..19c8cd296 100644
--- a/server/package.json
+++ b/server/package.json
@@ -6,13 +6,14 @@
 	"type": "module",
 	"scripts": {
 		"email": "email dev -p 3001",
-		"start": "bun src/index.ts",
 		"d": "ENV_FILE=.env infisical run --env=dev -- bun dev",
 		"p": "ENV_FILE=.env.prod infisical run --env=prod -- bun dev",
 		"w": "ENV_FILE=.env infisical run --env=dev -- bun workers:dev",
 		"c": "ENV_FILE=.env infisical run --env=dev -- bun cron",
 		"dev": "cross-env NODE_ENV=development bunx nodemon",
 		"workers:dev": "cross-env NODE_ENV=development bunx nodemon --exec bun src/workers.ts --signal SIGTERM --delay 500ms",
+		
+		"start": "bun src/index.ts",
 		"workers": "bun src/workers.ts",
 		"cron": "bun src/cron.ts",
 		"check": "bun src/check.ts",
diff --git a/server/run.sh b/server/run.sh
index 5303839ce..aefdee53e 100755
--- a/server/run.sh
+++ b/server/run.sh
@@ -4,8 +4,6 @@
 filename="$1"
 
 
-# Check if the file path contains "shell"
-
 
 if [[ "$filename" == *"shell"* ]]; then
     "$filename" "${@:2}"
@@ -15,7 +13,7 @@ elif [[ "$filename" == *"/tests/"* ]]; then
     # Remove .ts extension if present
     path_after_tests="${path_after_tests%.ts}"
     # Use scripts/test.ts which auto-detects framework
-    bun ../scripts/test.ts "$path_after_tests"
+    infisical run --env=dev -- bun ../scripts/test.ts "$path_after_tests"
 
 elif [[ "$filename" == *".sh"* ]]; then
     "$filename"
diff --git a/server/src/_luaScripts/entityLuaScripts/setEntitiesBatch.lua b/server/src/_luaScripts/entityLuaScripts/setEntitiesBatch.lua
index 884778f06..ab8bed82e 100644
--- a/server/src/_luaScripts/entityLuaScripts/setEntitiesBatch.lua
+++ b/server/src/_luaScripts/entityLuaScripts/setEntitiesBatch.lua
@@ -41,6 +41,7 @@ for _, entityWrapper in ipairs(entities) do
         created_at = entityData.created_at,
         env = entityData.env,
         subscriptions = entityData.subscriptions,
+        legacyData = entityData.legacyData,
         _balanceFeatureIds = balanceFeatureIds
     }
     
diff --git a/server/src/_luaScripts/entityLuaScripts/setEntity.lua b/server/src/_luaScripts/entityLuaScripts/setEntity.lua
index ea6fab345..cc44a7732 100644
--- a/server/src/_luaScripts/entityLuaScripts/setEntity.lua
+++ b/server/src/_luaScripts/entityLuaScripts/setEntity.lua
@@ -43,6 +43,7 @@ local baseEntity = {
     created_at = entityData.created_at,
     env = entityData.env,
     subscriptions = entityData.subscriptions,
+    legacyData = entityData.legacyData,
     _balanceFeatureIds = balanceFeatureIds
 }
 
diff --git a/server/src/cron.ts b/server/src/cron.ts
index 763b325b6..256d529d9 100644
--- a/server/src/cron.ts
+++ b/server/src/cron.ts
@@ -7,7 +7,6 @@ import { resetCustomerEntitlement } from "./cron/cronUtils.js";
 import { runProductCron } from "./cron/productCron/runProductCron.js";
 import { initDrizzle } from "./db/initDrizzle.js";
 import { CusEntService } from "./internal/customers/cusProducts/cusEnts/CusEntitlementService.js";
-import { OrgService } from "./internal/orgs/OrgService.js";
 import { notNullish } from "./utils/genUtils.js";
 
 dotenv.config();
@@ -26,8 +25,6 @@ export const cronTask = async () => {
 			batchSize: 500,
 		});
 
-		const cacheEnabledOrgs = await OrgService.getCacheEnabledOrgs({ db });
-
 		const batchSize = 100;
 		for (let i = 0; i < cusEnts.length; i += batchSize) {
 			const batch = cusEnts.slice(i, i + batchSize);
@@ -37,7 +34,6 @@ export const cronTask = async () => {
 					resetCustomerEntitlement({
 						db,
 						cusEnt: cusEnt,
-						cacheEnabledOrgs,
 					}),
 				);
 			}
diff --git a/server/src/cron/cronUtils.ts b/server/src/cron/cronUtils.ts
index 5d7369a2e..beeda2eb0 100644
--- a/server/src/cron/cronUtils.ts
+++ b/server/src/cron/cronUtils.ts
@@ -94,11 +94,9 @@ const checkSubAnchor = async ({
 const handleShortDurationCusEnt = async ({
 	db,
 	cusEnt,
-	cacheEnabledOrgs,
 }: {
 	db: DrizzleCli;
 	cusEnt: ResetCusEnt;
-	cacheEnabledOrgs: any[];
 }) => {
 	const ent = cusEnt.entitlement as FullEntitlement;
 
@@ -155,11 +153,9 @@ const shortDurations = [EntInterval.Minute, EntInterval.Hour, EntInterval.Day];
 export const resetCustomerEntitlement = async ({
 	db,
 	cusEnt,
-	cacheEnabledOrgs,
 }: {
 	db: DrizzleCli;
 	cusEnt: ResetCusEnt;
-	cacheEnabledOrgs: any[];
 }) => {
 	try {
 		const ent = cusEnt.entitlement as FullEntitlement;
@@ -171,7 +167,6 @@ export const resetCustomerEntitlement = async ({
 			return await handleShortDurationCusEnt({
 				db,
 				cusEnt,
-				cacheEnabledOrgs,
 			});
 		}
 
@@ -299,10 +294,6 @@ export const resetCustomerEntitlement = async ({
 			)}`,
 		);
 
-		// let cacheOrg = cacheEnabledOrgs.find(
-		//   (org) => org.id === cusEnt.customer.org_id
-		// );
-
 		const org = await OrgService.get({
 			db,
 			orgId: cusEnt.customer.org_id,
diff --git a/server/src/db/cteUtils/relationUtils.ts b/server/src/db/cteUtils/relationUtils.ts
index ffd00b0f7..eef385015 100644
--- a/server/src/db/cteUtils/relationUtils.ts
+++ b/server/src/db/cteUtils/relationUtils.ts
@@ -1,4 +1,4 @@
-import type { Many, One, Relations } from "drizzle-orm";
+import type { Relations } from "drizzle-orm";
 import type { PgTable } from "drizzle-orm/pg-core";
 
 export interface RelationPath {
diff --git a/server/src/db/cteUtils/sqlGenerators.ts b/server/src/db/cteUtils/sqlGenerators.ts
index f67ddb840..9fa4d166d 100644
--- a/server/src/db/cteUtils/sqlGenerators.ts
+++ b/server/src/db/cteUtils/sqlGenerators.ts
@@ -34,7 +34,6 @@ export function generateArrayAggSQL({
 	alias,
 	filter,
 	orderBy,
-	limit,
 	distinct = false,
 }: ArrayAggregationConfig): SQL {
 	const tableAlias = alias || getTableAlias(table);
@@ -81,34 +80,33 @@ export function generateRowSubquerySQL({
 	return query;
 }
 
-/**
- * Generate SQL for many-to-many join through junction table
- * Example:
- * SELECT json_agg(o)
- * FROM member m
- * INNER JOIN organizations o ON o.id = m.organization_id
- * WHERE m.user_id = ${userId}
- */
-export function generateJunctionJoinSQL({
-	junctionTable,
-	fromField,
-	toField,
-	fromTable,
-	toTable,
-	fromId,
-}: JunctionJoinConfig): SQL {
-	const junctionAlias = getTableAlias(junctionTable);
-	const toAlias = getTableAlias(toTable);
-	const junctionTableName = getTableName(junctionTable);
-	const toTableName = getTableName(toTable);
+// /**
+//  * Generate SQL for many-to-many join through junction table
+//  * Example:
+//  * SELECT json_agg(o)
+//  * FROM member m
+//  * INNER JOIN organizations o ON o.id = m.organization_id
+//  * WHERE m.user_id = ${userId}
+//  */
+// export function generateJunctionJoinSQL({
+// 	junctionTable,
+// 	fromField,
+// 	toField,
+// 	toTable,
+// 	fromId,
+// }: JunctionJoinConfig): SQL {
+// 	const junctionAlias = getTableAlias(junctionTable);
+// 	const toAlias = getTableAlias(toTable);
+// 	const junctionTableName = getTableName(junctionTable);
+// 	const toTableName = getTableName(toTable);
 
-	return sql`
-		FROM ${sql.identifier(junctionTableName)} ${sql.identifier(junctionAlias)}
-		INNER JOIN ${sql.identifier(toTableName)} ${sql.identifier(toAlias)}
-			ON ${sql.identifier(toAlias)}.${sql.identifier("id")} = ${sql.identifier(junctionAlias)}.${sql.identifier(toField)}
-		WHERE ${sql.identifier(junctionAlias)}.${sql.identifier(fromField)} = ${fromId}
-	`;
-}
+// 	return sql`
+// 		FROM ${sql.identifier(junctionTableName)} ${sql.identifier(junctionAlias)}
+// 		INNER JOIN ${sql.identifier(toTableName)} ${sql.identifier(toAlias)}
+// 			ON ${sql.identifier(toAlias)}.${sql.identifier("id")} = ${sql.identifier(junctionAlias)}.${sql.identifier(toField)}
+// 		WHERE ${sql.identifier(junctionAlias)}.${sql.identifier(fromField)} = ${fromId}
+// 	`;
+// }
 
 /**
  * Generate SQL for limiting results per parent using window functions
diff --git a/server/src/db/cteUtils/strategies/joinGroupByStrategy.ts b/server/src/db/cteUtils/strategies/joinGroupByStrategy.ts
index 3b08e5a51..86bf6e0e0 100644
--- a/server/src/db/cteUtils/strategies/joinGroupByStrategy.ts
+++ b/server/src/db/cteUtils/strategies/joinGroupByStrategy.ts
@@ -1,12 +1,7 @@
 import { type SQL, sql } from "drizzle-orm";
 import type { PgTable } from "drizzle-orm/pg-core";
 import type { CTEConfig } from "../buildCte.js";
-import {
-	buildRelationGraph,
-	getTableName,
-	parseJoinCondition,
-	type RelationNode,
-} from "./relationGraph.js";
+import { buildRelationGraph, type RelationNode } from "./relationGraph.js";
 
 /**
  * Build the optimized query using JOIN + GROUP BY strategy
@@ -26,7 +21,6 @@ export function buildJoinGroupByQuery({
 	}) => SQL | undefined;
 }): SQL {
 	// Build relation graph
-	const rootTable = getSourceTable(config.from);
 	const graph = buildRelationGraph({
 		config,
 		relations,
@@ -34,7 +28,7 @@ export function buildJoinGroupByQuery({
 	});
 
 	// Step 1: Build aggregation CTEs for array (one-to-many) relations
-	const aggregationCTEs = buildAggregationCTEs({ graph, rootTable });
+	const aggregationCTEs = buildAggregationCTEs({ graph });
 
 	// Step 2: Build main query with row (one-to-one) relations as direct JOINs
 	const mainQuery = buildMainQuery({ graph, config });
@@ -181,10 +175,8 @@ function addNestedJoins({
  */
 function buildAggregationCTEs({
 	graph,
-	rootTable,
 }: {
 	graph: RelationNode;
-	rootTable: PgTable;
 }): Array<{ name: string; definition: SQL }> {
 	const ctes: Array<{ name: string; definition: SQL }> = [];
 
@@ -301,13 +293,3 @@ function buildAggregationCTEs({
 
 	return ctes;
 }
-
-/**
- * Get source table from config (unwrap CTEBuilder if needed)
- */
-function getSourceTable(from: any): PgTable {
-	if (from?.config?.from) {
-		return getSourceTable(from.config.from);
-	}
-	return from;
-}
diff --git a/server/src/db/cteUtils/strategies/relationGraph.ts b/server/src/db/cteUtils/strategies/relationGraph.ts
index f1cca1de5..30a90954a 100644
--- a/server/src/db/cteUtils/strategies/relationGraph.ts
+++ b/server/src/db/cteUtils/strategies/relationGraph.ts
@@ -1,4 +1,4 @@
-import { type SQL } from "drizzle-orm";
+import type { SQL } from "drizzle-orm";
 import type { PgTable } from "drizzle-orm/pg-core";
 import type { CTEConfig } from "../buildCte.js";
 import { CTEBuilder } from "../buildCte.js";
@@ -80,12 +80,10 @@ export function parseJoinCondition({
  */
 export function buildRelationGraph({
 	config,
-	parentTable,
 	relations,
 	extractJoinCondition,
 }: {
 	config: CTEConfig;
-	parentTable?: PgTable;
 	relations: Record<string, any>;
 	extractJoinCondition: (params: {
 		parentTable: PgTable;
@@ -128,7 +126,6 @@ export function buildRelationGraph({
 		// Recursively build nested nodes
 		const nestedNode = buildRelationGraph({
 			config: nested,
-			parentTable: table,
 			relations,
 			extractJoinCondition,
 		});
diff --git a/server/src/db/cteUtils/typeDetection.ts b/server/src/db/cteUtils/typeDetection.ts
index 9430a4325..85e004080 100644
--- a/server/src/db/cteUtils/typeDetection.ts
+++ b/server/src/db/cteUtils/typeDetection.ts
@@ -36,11 +36,7 @@ export function inferMode(config: ModeDetectionConfig): CTEMode {
 
 	// 5. Plural field name? → array (entities, organizations, products)
 	// Exclude words ending in 'ss' (address, process, etc.)
-	if (
-		config.fieldName &&
-		config.fieldName.endsWith("s") &&
-		!config.fieldName.endsWith("ss")
-	) {
+	if (config.fieldName?.endsWith("s") && !config.fieldName.endsWith("ss")) {
 		return "array";
 	}
 
diff --git a/server/src/db/dbUtils.ts b/server/src/db/dbUtils.ts
index c14d5fec3..3c6b3c3be 100644
--- a/server/src/db/dbUtils.ts
+++ b/server/src/db/dbUtils.ts
@@ -1,5 +1,5 @@
-import { getTableColumns, sql, SQL } from "drizzle-orm";
-import { PgTable } from "drizzle-orm/pg-core";
+import { getTableColumns, type SQL, sql } from "drizzle-orm";
+import type { PgTable } from "drizzle-orm/pg-core";
 
 export const buildConflictUpdateColumns = <T extends PgTable>(
 	table: T,
diff --git a/server/src/db/initClickHouse.ts b/server/src/db/initClickHouse.ts
index 23fb3bcd3..bef70af13 100644
--- a/server/src/db/initClickHouse.ts
+++ b/server/src/db/initClickHouse.ts
@@ -1,4 +1,4 @@
-import { ClickHouseClient, createClient } from "@clickhouse/client";
+import { type ClickHouseClient, createClient } from "@clickhouse/client";
 
 export const clickhouseClient: ClickHouseClient = createClient({
 	url: process.env.CLICKHOUSE_URL!,
diff --git a/server/src/errors/logger.ts b/server/src/errors/logger.ts
index 91e9220f4..4c331962a 100644
--- a/server/src/errors/logger.ts
+++ b/server/src/errors/logger.ts
@@ -1,5 +1,5 @@
+import { Writable } from "node:stream";
 import pino from "pino";
-import { Writable } from "stream";
 
 // Custom log formatter for Bun compatibility
 const createDevLogStream = () => {
@@ -53,7 +53,7 @@ const createDevLogStream = () => {
 	};
 
 	return new Writable({
-		write(chunk, encoding, callback) {
+		write(chunk, _encoding, callback) {
 			try {
 				const log = JSON.parse(chunk.toString());
 				const timestamp = new Date(log.time)
diff --git a/server/src/external/autumn/autumnCli.ts b/server/src/external/autumn/autumnCli.ts
index e28aab50b..348aab109 100644
--- a/server/src/external/autumn/autumnCli.ts
+++ b/server/src/external/autumn/autumnCli.ts
@@ -128,6 +128,40 @@ export class AutumnInt {
 
 		return response.json();
 	}
+	async patch(path: string, body: any) {
+		const response = await fetch(`${this.baseUrl}${path}`, {
+			method: "PATCH",
+			headers: this.headers,
+			body: JSON.stringify(body),
+		});
+
+		if (response.status !== 200) {
+			// Handle rate limit errors
+			if (response.status === 429) {
+				throw new AutumnError({
+					message: `request failed, rate limit exceeded`,
+					code: "rate_limit_exceeded",
+				});
+			}
+
+			let error: any;
+			try {
+				error = await response.json();
+			} catch (error) {
+				throw new AutumnError({
+					message: `request failed, error: ${error}`,
+					code: ErrCode.InternalError,
+				});
+			}
+
+			throw new AutumnError({
+				message: error.message,
+				code: error.code,
+			});
+		}
+
+		return response.json();
+	}
 
 	async delete(
 		path: string,
@@ -418,7 +452,7 @@ export class AutumnInt {
 			// if (product.items && typeof product.items === "object") {
 			//   product.items = Object.values(product.items);
 			// }
-			const data = await this.post(`/products/${productId}`, product);
+			const data = await this.patch(`/products/${productId}`, product);
 			return data;
 		},
 
diff --git a/server/src/external/autumn/autumnUtils.ts b/server/src/external/autumn/autumnUtils.ts
index 0e769a4db..afc1d74f9 100644
--- a/server/src/external/autumn/autumnUtils.ts
+++ b/server/src/external/autumn/autumnUtils.ts
@@ -1,7 +1,7 @@
-import { AppEnv, ErrCode, Organization } from "@autumn/shared";
+import { AppEnv, ErrCode, type Organization } from "@autumn/shared";
+import { Autumn } from "autumn-js";
 // import { Autumn } from "./autumnCli.js";
 import RecaseError from "@/utils/errorUtils.js";
-import { Autumn } from "autumn-js";
 
 export enum FeatureId {
 	Products = "products",
diff --git a/server/src/external/autumn/autumnWebhookRouter.ts b/server/src/external/autumn/autumnWebhookRouter.ts
index 73e3f6f47..f234a640b 100644
--- a/server/src/external/autumn/autumnWebhookRouter.ts
+++ b/server/src/external/autumn/autumnWebhookRouter.ts
@@ -5,7 +5,7 @@ import RecaseError from "@/utils/errorUtils.js";
 
 export const autumnWebhookRouter: Router = express.Router();
 
-const verifyAutumnWebhook = async (req: any, res: any) => {
+const verifyAutumnWebhook = async (req: any) => {
 	const wh = new Webhook(process.env.AUTUMN_WEBHOOK_SECRET!);
 
 	const headers = req.headers;
@@ -49,7 +49,7 @@ autumnWebhookRouter.post(
 	express.raw({ type: "application/json" }),
 	async (req, res) => {
 		try {
-			const evt = await verifyAutumnWebhook(req, res);
+			const evt = await verifyAutumnWebhook(req);
 			console.log("Received webhook from autumn");
 			const { type, data } = evt;
 
diff --git a/server/src/external/clickhouse/ClickHouseManager.ts b/server/src/external/clickhouse/ClickHouseManager.ts
index 1d39a551f..cd861b6b5 100644
--- a/server/src/external/clickhouse/ClickHouseManager.ts
+++ b/server/src/external/clickhouse/ClickHouseManager.ts
@@ -1,6 +1,6 @@
-import fs from "fs";
-import path from "path";
-import { ClickHouseClient, QueryParams } from "@clickhouse/client";
+import fs from "node:fs";
+import path from "node:path";
+import type { ClickHouseClient, QueryParams } from "@clickhouse/client";
 import { clickhouseClient } from "../../db/initClickHouse.js";
 
 export enum ClickHouseQuery {
@@ -115,6 +115,7 @@ export class ClickHouseManager {
 		}
 	}
 
+	// biome-ignore lint/correctness/noUnusedPrivateClassMembers: Might comment this back in in the future
 	private async ensureQueriesExist() {
 		if (!this.client) {
 			throw new Error("ClickHouse client not initialized");
diff --git a/server/src/external/infisical/initInfisical.ts b/server/src/external/infisical/initInfisical.ts
index 209c13377..b762e0a91 100644
--- a/server/src/external/infisical/initInfisical.ts
+++ b/server/src/external/infisical/initInfisical.ts
@@ -1,34 +1,5 @@
-import { join } from "node:path";
 import { InfisicalSDK } from "@infisical/sdk";
-import { config } from "dotenv";
-
-export const loadLocalEnv = () => {
-	const processDir = process.cwd();
-	const serverDir = processDir.includes("server")
-		? processDir
-		: join(processDir, "server");
-
-	// Determine which env file to load based on ENV_FILE environment variable
-	// Defaults to .env if not specified
-	const envFileName = process.env.ENV_FILE || ".env";
-	const envPath = join(serverDir, envFileName);
-
-	// Load local .env file FIRST - these will take precedence over Infisical
-	const result = config({ path: envPath });
-	if (result.parsed) {
-		console.log(
-			`📄 Loading ${Object.keys(result.parsed).length} variables from ${envFileName}`,
-		);
-		for (const [key, value] of Object.entries(result.parsed)) {
-			process.env[key] = value;
-		}
-	} else {
-		console.log(
-			`ℹ️  No ${envFileName} file found (using only Infisical secrets)`,
-		);
-	}
-};
-
+import { loadLocalEnv } from "@/utils/envUtils.js";
 /**
  * Initialize Infisical and load secrets into process.env
  * This allows all existing code using process.env to work seamlessly
diff --git a/server/src/external/redis/initRedis.ts b/server/src/external/redis/initRedis.ts
index bf6bd1259..ca2333853 100644
--- a/server/src/external/redis/initRedis.ts
+++ b/server/src/external/redis/initRedis.ts
@@ -25,6 +25,7 @@ const redis = new Redis(regionalCacheUrl || process.env.CACHE_URL, {
 	tls: caText ? { ca: caText } : undefined,
 });
 
+// biome-ignore lint/correctness/noUnusedFunctionParameters: Might uncomment this back in in the future
 redis.on("error", (error) => {
 	// logger.error(`redis (cache) error: ${error.message}`);
 });
diff --git a/server/src/external/redis/loadCaCert.ts b/server/src/external/redis/loadCaCert.ts
index a73c70bc1..40e1d4844 100644
--- a/server/src/external/redis/loadCaCert.ts
+++ b/server/src/external/redis/loadCaCert.ts
@@ -19,7 +19,7 @@ export const loadCaCert = async ({
 		const ca = Bun.file(caPath || `/etc/secrets/${type}-cert.pem`);
 		const caText = await ca.text();
 
-		return undefined;
+		return caText;
 	} catch (_error) {
 		return;
 	}
diff --git a/server/src/external/resend/resendUtils.ts b/server/src/external/resend/resendUtils.ts
index 371808e85..c2b2a4146 100644
--- a/server/src/external/resend/resendUtils.ts
+++ b/server/src/external/resend/resendUtils.ts
@@ -24,7 +24,7 @@ export const sendTextEmail = async ({
 
 	try {
 		logger.info(`Sending email to ${to} with subject ${subject}`);
-		const { data, error } = await resend.emails.send({
+		const { error } = await resend.emails.send({
 			from: from,
 			to: to,
 			subject: subject,
diff --git a/server/src/external/stripe/createStripePrice/createStripeArrearProrated.ts b/server/src/external/stripe/createStripePrice/createStripeArrearProrated.ts
index 49f63ef07..a911e50fe 100644
--- a/server/src/external/stripe/createStripePrice/createStripeArrearProrated.ts
+++ b/server/src/external/stripe/createStripePrice/createStripeArrearProrated.ts
@@ -20,7 +20,6 @@ import { billingIntervalToStripe } from "../stripePriceUtils.js";
 import { priceToInArrearTiers } from "./createStripeInArrear.js";
 
 export interface StripeMeteredPriceParams {
-	db: DrizzleCli;
 	stripeCli: Stripe;
 	price: Price;
 	entitlements: EntitlementWithFeature[];
@@ -29,7 +28,6 @@ export interface StripeMeteredPriceParams {
 }
 
 export const createStripeMeteredPrice = async ({
-	db,
 	stripeCli,
 	price,
 	entitlements,
@@ -225,7 +223,6 @@ export const createStripeArrearProrated = async ({
 	// CREATE PLACEHOLDER PRICE FOR INARREAR PRORATED PRICING
 	if (billingType === BillingType.InArrearProrated) {
 		const placeholderPrice = await createStripeMeteredPrice({
-			db,
 			stripeCli,
 			price,
 			entitlements,
diff --git a/server/src/external/stripe/createStripePrice/createStripePrice.ts b/server/src/external/stripe/createStripePrice/createStripePrice.ts
index ec3870ce5..852917867 100644
--- a/server/src/external/stripe/createStripePrice/createStripePrice.ts
+++ b/server/src/external/stripe/createStripePrice/createStripePrice.ts
@@ -178,7 +178,6 @@ export const createStripePriceIFNotExist = async ({
 		} else if (!config.stripe_placeholder_price_id) {
 			logger.info(`Creating stripe placeholder price`);
 			const placeholderPrice = await createStripeMeteredPrice({
-				db,
 				stripeCli,
 				price,
 				entitlements,
diff --git a/server/src/external/stripe/handleStripeWebhookEvent.ts b/server/src/external/stripe/handleStripeWebhookEvent.ts
index 8fdb495a6..d4f6ed5be 100644
--- a/server/src/external/stripe/handleStripeWebhookEvent.ts
+++ b/server/src/external/stripe/handleStripeWebhookEvent.ts
@@ -201,8 +201,6 @@ export const handleStripeWebhookEvent = async ({
 
 			case "invoice.updated":
 				await handleInvoiceUpdated({
-					stripeCli,
-					env,
 					event,
 					req: ctx as unknown as ExtendedRequest,
 				});
@@ -251,7 +249,6 @@ export const handleStripeWebhookEvent = async ({
 					org,
 					env,
 					schedule: canceledSchedule,
-					logger,
 				});
 				break;
 			}
diff --git a/server/src/external/stripe/paymentMethodUtils.ts b/server/src/external/stripe/paymentMethodUtils.ts
deleted file mode 100644
index d1174b4a6..000000000
--- a/server/src/external/stripe/paymentMethodUtils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Stripe from "stripe";
-
-const classifyStripePaymentMethod = (paymentMethod: Stripe.PaymentMethod) => {
-	let cardPaymentMethods = [];
-};
-
-// Note: us_bank_account -> ACH
-// customer_balance -> Bank Account
diff --git a/server/src/external/stripe/priceToStripeItem/priceToArrearProrated.ts b/server/src/external/stripe/priceToStripeItem/priceToArrearProrated.ts
index 3fef8fd69..938df1423 100644
--- a/server/src/external/stripe/priceToStripeItem/priceToArrearProrated.ts
+++ b/server/src/external/stripe/priceToStripeItem/priceToArrearProrated.ts
@@ -1,5 +1,4 @@
-import { UsagePriceConfig } from "@autumn/shared";
-import { Price } from "@autumn/shared";
+import type { Price, UsagePriceConfig } from "@autumn/shared";
 
 export const priceToInArrearProrated = ({
 	price,
@@ -11,9 +10,9 @@ export const priceToInArrearProrated = ({
 	existingUsage: number;
 }) => {
 	const config = price.config as UsagePriceConfig;
-	let quantity = existingUsage || 0;
+	const quantity = existingUsage || 0;
 
-	if (quantity == 0 && isCheckout) {
+	if (quantity === 0 && isCheckout) {
 		return {
 			price: config.stripe_placeholder_price_id,
 		};
diff --git a/server/src/external/stripe/priceToStripeItem/priceToStripeItem.ts b/server/src/external/stripe/priceToStripeItem/priceToStripeItem.ts
index e63dd6fdc..4e4237bc7 100644
--- a/server/src/external/stripe/priceToStripeItem/priceToStripeItem.ts
+++ b/server/src/external/stripe/priceToStripeItem/priceToStripeItem.ts
@@ -124,7 +124,6 @@ export const priceToStripeItem = ({
 			price,
 			options,
 			isCheckout,
-			relatedEnt,
 		});
 	}
 
diff --git a/server/src/external/stripe/priceToStripeItem/priceToUsageInAdvance.ts b/server/src/external/stripe/priceToStripeItem/priceToUsageInAdvance.ts
index 40b6b7393..4fae7acd9 100644
--- a/server/src/external/stripe/priceToStripeItem/priceToUsageInAdvance.ts
+++ b/server/src/external/stripe/priceToStripeItem/priceToUsageInAdvance.ts
@@ -24,13 +24,8 @@ export const priceToOneOffAndTiered = ({
 	stripeProductId: string;
 }) => {
 	const config = price.config as UsagePriceConfig;
-	const quantity = options?.quantity!;
+	const quantity = options?.quantity ?? 0;
 	const overage = new Decimal(quantity).mul(config.billing_units!).toNumber();
-	// let overage = quantity * config.billing_units! - relatedEnt.allowance!;
-
-	// if (overage <= 0) {
-	//   return null;
-	// }
 
 	const amount = getPriceForOverage(price, overage);
 	if (!config.stripe_product_id) {
@@ -53,12 +48,10 @@ export const priceToOneOffAndTiered = ({
 
 export const priceToUsageInAdvance = ({
 	price,
-	relatedEnt,
 	options,
 	isCheckout,
 }: {
 	price: Price;
-	relatedEnt: EntitlementWithFeature;
 	options: FeatureOptions | undefined | null;
 	isCheckout: boolean;
 }) => {
@@ -69,9 +62,7 @@ export const priceToUsageInAdvance = ({
 	// 1. If adjustable quantity is set, use that, else if quantity is undefined, adjustable is true, else false
 	const adjustable = notNullish(options?.adjustable_quantity)
 		? options!.adjustable_quantity
-		: nullish(optionsQuantity)
-			? true
-			: false;
+		: nullish(optionsQuantity);
 
 	if (optionsQuantity === 0 && isCheckout) {
 		// 1. If quantity is 0 and is checkout, skip over line item
@@ -81,12 +72,6 @@ export const priceToUsageInAdvance = ({
 		finalQuantity = 1;
 	}
 
-	// Divide final quantity by billing units...?
-
-	// let minimum = new Decimal(relatedEnt.allowance!)
-	//   .div(config.billing_units || 1)
-	//   .toNumber();
-
 	const adjustableQuantity =
 		isCheckout && adjustable
 			? {
diff --git a/server/src/external/stripe/stripeCouponUtils/deleteCouponFromCus.ts b/server/src/external/stripe/stripeCouponUtils/deleteCouponFromCus.ts
index f98fcee84..f1ab69cb7 100644
--- a/server/src/external/stripe/stripeCouponUtils/deleteCouponFromCus.ts
+++ b/server/src/external/stripe/stripeCouponUtils/deleteCouponFromCus.ts
@@ -1,4 +1,4 @@
-import { Stripe } from "stripe";
+import type { Stripe } from "stripe";
 
 export const deleteCouponFromSub = async ({
 	stripeCli,
@@ -12,23 +12,14 @@ export const deleteCouponFromSub = async ({
 	logger: any;
 }) => {
 	try {
-		let stripeSub = await stripeCli.subscriptions.retrieve(stripeSubId);
-
-		let newDiscounts = stripeSub.discounts
-			?.filter((d: any) => d !== discountId)
-			.map((d: any) => ({
-				discount: d,
-			}));
+		const stripeSub = await stripeCli.subscriptions.retrieve(stripeSubId);
 
 		if (stripeSub.discounts.some((d: any) => d === discountId)) {
 			await stripeCli.subscriptions.deleteDiscount(stripeSubId);
-			// console.log("DELETED DISCOUNT FROM SUB", stripeSubId);
 		}
 	} catch (error: any) {
-		// if (!error.message.includes("no active discount for subscription")) {
 		logger.error(`Failed to delete discount from subscription ${stripeSubId}`);
 		logger.error(error.message);
-		// }
 	}
 };
 
@@ -46,7 +37,7 @@ export const deleteCouponFromCus = async ({
 	logger: any;
 }) => {
 	try {
-		let stripeSub = await stripeCli.subscriptions.retrieve(stripeSubId);
+		const stripeSub = await stripeCli.subscriptions.retrieve(stripeSubId);
 		if (stripeSub.discounts.some((d: any) => d === discountId)) {
 			await stripeCli.subscriptions.deleteDiscount(stripeSubId);
 		}
@@ -56,7 +47,7 @@ export const deleteCouponFromCus = async ({
 	}
 
 	try {
-		let stripeCus = (await stripeCli.customers.retrieve(
+		const stripeCus = (await stripeCli.customers.retrieve(
 			stripeCusId,
 		)) as Stripe.Customer;
 		if (stripeCus.discount?.id === discountId) {
diff --git a/server/src/external/stripe/stripeCusUtils.ts b/server/src/external/stripe/stripeCusUtils.ts
index 2c561b6b2..b3915b595 100644
--- a/server/src/external/stripe/stripeCusUtils.ts
+++ b/server/src/external/stripe/stripeCusUtils.ts
@@ -22,7 +22,7 @@ export const getStripeCus = async ({
 	try {
 		const stripeCus = await stripeCli.customers.retrieve(stripeId);
 		return stripeCus as Stripe.Customer;
-	} catch (error) {
+	} catch (_error) {
 		return undefined;
 	}
 };
@@ -57,7 +57,7 @@ export const createStripeCusIfNotExists = async ({
 			} else {
 				createNew = true;
 			}
-		} catch (error) {
+		} catch (_error) {
 			createNew = true;
 		}
 	}
diff --git a/server/src/external/stripe/stripeErrorUtils.ts b/server/src/external/stripe/stripeErrorUtils.ts
deleted file mode 100644
index 6d4a98abb..000000000
--- a/server/src/external/stripe/stripeErrorUtils.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const stripeErrToCusMsg = (error: any) => {
-	let code = error.code;
-	let msg = error.message;
-};
diff --git a/server/src/external/stripe/stripeInvoiceSubUtils.ts b/server/src/external/stripe/stripeInvoiceSubUtils.ts
deleted file mode 100644
index d62de10d0..000000000
--- a/server/src/external/stripe/stripeInvoiceSubUtils.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { freeTrialToStripeTimestamp } from "@/internal/products/free-trials/freeTrialUtils.js";
-import RecaseError from "@/utils/errorUtils.js";
-import {
-	Customer,
-	FreeTrial,
-	Organization,
-	Price,
-	ErrCode,
-	BillingInterval,
-} from "@autumn/shared";
-import Stripe from "stripe";
-import { getCusPaymentMethod } from "./stripeCusUtils.js";
-
-export const createStripeSubThroughInvoice = async ({
-	stripeCli,
-	customer,
-	org,
-	items,
-	freeTrial,
-	metadata = {},
-	prices,
-}: {
-	stripeCli: Stripe;
-	customer: Customer;
-	items: any;
-	freeTrial: FreeTrial | null;
-	org: Organization;
-	metadata?: any;
-	prices: Price[];
-}) => {
-	// 1. Get payment method
-	let paymentMethod;
-	try {
-		paymentMethod = await getCusPaymentMethod({
-			stripeCli,
-			stripeId: customer.processor.id,
-		});
-	} catch (error) {}
-
-	let paymentMethodData = {};
-	if (paymentMethod) {
-		paymentMethodData = {
-			default_payment_method: paymentMethod.id,
-		};
-	}
-
-	let subItems = items.filter(
-		(i: any, index: number) =>
-			prices[index].config!.interval !== BillingInterval.OneOff,
-	);
-	let invoiceItems = items.filter(
-		(i: any, index: number) =>
-			prices[index].config!.interval === BillingInterval.OneOff,
-	);
-
-	try {
-		const subscription = await stripeCli.subscriptions.create({
-			// ...paymentMethodData,
-			customer: customer.processor.id,
-			items: subItems as any,
-			trial_end: freeTrialToStripeTimestamp({ freeTrial }),
-			metadata,
-			add_invoice_items: invoiceItems,
-			collection_method: "send_invoice",
-			days_until_due: 30,
-		});
-
-		return subscription;
-	} catch (error: any) {
-		// console.log("Error creating stripe subscription", error?.message || error);
-		console.log("Warning: Failed to create stripe subscription");
-		console.log("Error code:", error.code);
-		console.log("Message:", error.message);
-		console.log("Decline code:", error.decline_code);
-
-		throw new RecaseError({
-			// code: ErrCode.StripeCardDeclined,
-			code: ErrCode.CreateStripeSubscriptionFailed,
-			message: `Stripe subscription failed (${error.code}): ${error.message}`,
-			statusCode: 500,
-		});
-
-		// if (isStripeCardDeclined(error)) {
-
-		// }
-
-		// console.log("Error creating stripe subscription", error?.message || error);
-		// console.log("Error code:", error.code);
-
-		// throw new RecaseError({
-		//   code: ErrCode.CreateStripeSubscriptionFailed,
-		//   message: "Failed to create stripe subscription",
-		//   statusCode: 500,
-		// });
-	}
-};
diff --git a/server/src/external/stripe/stripeMeterUtils.ts b/server/src/external/stripe/stripeMeterUtils.ts
index 6d859d1ca..69b9c55f6 100644
--- a/server/src/external/stripe/stripeMeterUtils.ts
+++ b/server/src/external/stripe/stripeMeterUtils.ts
@@ -1,8 +1,12 @@
-import { Customer, Feature } from "@autumn/shared";
+import {
+	BillingType,
+	type Customer,
+	type Feature,
+	type Price,
+	type UsagePriceConfig,
+} from "@autumn/shared";
+import type Stripe from "stripe";
 import { getBillingType } from "@/internal/products/prices/priceUtils.js";
-import { BillingType, Price, UsagePriceConfig } from "@autumn/shared";
-import { SupabaseClient } from "@supabase/supabase-js";
-import Stripe from "stripe";
 
 export const submitUsageToStripe = async ({
 	price,
@@ -21,10 +25,10 @@ export const submitUsageToStripe = async ({
 	feature: Feature;
 	logger: any;
 }) => {
-	let config = price.config as UsagePriceConfig;
-	let billingType = getBillingType(config);
+	const config = price.config as UsagePriceConfig;
+	const billingType = getBillingType(config);
 
-	if (billingType != BillingType.UsageInArrear) {
+	if (billingType !== BillingType.UsageInArrear) {
 		logger.warn(
 			`Price ${price.id} is not usage in arrear type, can't send usage`,
 		);
diff --git a/server/src/external/stripe/stripeOnboardingUtils.ts b/server/src/external/stripe/stripeOnboardingUtils.ts
index 97cbb7ffe..70e8b6f4e 100644
--- a/server/src/external/stripe/stripeOnboardingUtils.ts
+++ b/server/src/external/stripe/stripeOnboardingUtils.ts
@@ -6,11 +6,7 @@ export const checkKeyValid = async (apiKey: string) => {
 	const stripe = new Stripe(apiKey);
 
 	// Call customers.list
-	const customers = await stripe.customers.list();
-
-	// const account = await stripe.accounts.retrieve();
-	// console.log("Account", account);
-	// return account;
+	await stripe.customers.list();
 };
 
 export const createWebhookEndpoint = async (
diff --git a/server/src/external/stripe/stripeProductUtils.ts b/server/src/external/stripe/stripeProductUtils.ts
index e82ddd223..28e70d0da 100644
--- a/server/src/external/stripe/stripeProductUtils.ts
+++ b/server/src/external/stripe/stripeProductUtils.ts
@@ -52,7 +52,7 @@ export const deleteStripeProduct = async (
 
 	try {
 		await stripe.products.del(product.processor.id);
-	} catch (error) {
+	} catch (_error) {
 		throw new RecaseError({
 			message: "Failed to delete stripe product",
 			code: ErrCode.DeleteStripeProductFailed,
@@ -136,7 +136,7 @@ export const deleteAllStripeProducts = async ({
 			batch.map(async (p) => {
 				try {
 					await stripeCli.products.del(p.id);
-				} catch (error) {
+				} catch (_error) {
 					await stripeCli.products.update(p.id, {
 						active: false,
 					});
diff --git a/server/src/external/stripe/stripeSubUtils/getStripeSubItems.ts b/server/src/external/stripe/stripeSubUtils/getStripeSubItems.ts
index b4630b7c6..85b3891b2 100644
--- a/server/src/external/stripe/stripeSubUtils/getStripeSubItems.ts
+++ b/server/src/external/stripe/stripeSubUtils/getStripeSubItems.ts
@@ -232,7 +232,6 @@ export const getStripeSubItems2 = async ({
 		cusProducts,
 		customer,
 		internalEntityId,
-		apiVersion,
 		products,
 	} = attachParams;
 
@@ -320,7 +319,7 @@ export const getStripeSubItems2 = async ({
 
 export const sanitizeSubItems = (subItems: any[]) => {
 	return subItems.map((si) => {
-		const { autumnPrice, ...rest } = si;
+		const { autumnPrice: _autumnPrice, ...rest } = si;
 		return {
 			...rest,
 		};
diff --git a/server/src/external/stripe/stripeSubUtils/getStripeSubItems/getArrearItems.ts b/server/src/external/stripe/stripeSubUtils/getStripeSubItems/getArrearItems.ts
index d36df4b3a..adcefd313 100644
--- a/server/src/external/stripe/stripeSubUtils/getStripeSubItems/getArrearItems.ts
+++ b/server/src/external/stripe/stripeSubUtils/getStripeSubItems/getArrearItems.ts
@@ -1,13 +1,12 @@
-import { getBillingType } from "@/internal/products/prices/priceUtils.js";
 import {
-	BillingInterval,
+	type BillingInterval,
 	BillingType,
 	intervalsDifferent,
-	Organization,
-	UsagePriceConfig,
+	type Organization,
+	type Price,
+	type UsagePriceConfig,
 } from "@autumn/shared";
-
-import { Price } from "@autumn/shared";
+import { getBillingType } from "@/internal/products/prices/priceUtils.js";
 import { billingIntervalToStripe } from "../../stripePriceUtils.js";
 
 export const getArrearItems = ({
@@ -21,9 +20,9 @@ export const getArrearItems = ({
 	intervalCount: number;
 	org: Organization;
 }) => {
-	let placeholderItems: any[] = [];
+	const placeholderItems: any[] = [];
 	for (const price of prices) {
-		let billingType = getBillingType(price.config!);
+		const billingType = getBillingType(price.config!);
 		if (
 			intervalsDifferent({
 				intervalA: {
@@ -36,8 +35,8 @@ export const getArrearItems = ({
 			continue;
 		}
 
-		if (billingType == BillingType.UsageInArrear) {
-			let config = price.config! as UsagePriceConfig;
+		if (billingType === BillingType.UsageInArrear) {
+			const config = price.config! as UsagePriceConfig;
 			placeholderItems.push({
 				price_data: {
 					product: config.stripe_product_id!,
diff --git a/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts b/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts
index 9e40ed546..f96e43f09 100644
--- a/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts
+++ b/server/src/external/stripe/stripeSubUtils/getSubItemAmount.ts
@@ -1,7 +1,6 @@
-import RecaseError from "@/utils/errorUtils.js";
-import Stripe from "stripe";
 import { Decimal } from "decimal.js";
-import { notNullish, nullish } from "@/utils/genUtils.js";
+import type Stripe from "stripe";
+import { notNullish } from "@/utils/genUtils.js";
 
 const calculateTieredAmount = ({
 	tiers,
@@ -40,12 +39,12 @@ export const getSubItemAmount = ({
 }: {
 	subItem: Stripe.SubscriptionItem;
 }) => {
-	let price = subItem.price;
+	const price = subItem.price;
 
 	const quantity = subItem.quantity || 0;
 
-	if (price.billing_scheme == "tiered") {
-		let tieredAmount = calculateTieredAmount({
+	if (price.billing_scheme === "tiered") {
+		const tieredAmount = calculateTieredAmount({
 			tiers: price.tiers!,
 			quantity,
 		});
@@ -53,7 +52,7 @@ export const getSubItemAmount = ({
 		return tieredAmount;
 	}
 
-	if (price.billing_scheme == "per_unit") {
+	if (price.billing_scheme === "per_unit") {
 		if (price.unit_amount_decimal) {
 			return new Decimal(price.unit_amount_decimal).mul(quantity).toNumber();
 		} else {
diff --git a/server/src/external/stripe/stripeSubUtils/stripeScheduleItemUtils.ts b/server/src/external/stripe/stripeSubUtils/stripeScheduleItemUtils.ts
deleted file mode 100644
index b2968f4cb..000000000
--- a/server/src/external/stripe/stripeSubUtils/stripeScheduleItemUtils.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Price, UsagePriceConfig } from "@autumn/shared";
-import Stripe from "stripe";
-
-// export const findPriceInScheduleItems = ({
-//   prices,
-//   subItem,
-//   billingType,
-// }: {
-//   prices: Price[];
-//   subItem: Stripe.SubscriptionItem | Stripe.InvoiceLineItem;
-//   billingType?: BillingType;
-// }) => {
-//   return prices.find((p: Price) => {
-//     let config = p.config;
-//     let itemMatch =
-//       config.stripe_price_id == subItem.price?.id ||
-//       config.stripe_product_id == subItem.price?.product;
-
-//     const priceBillingType = getBillingType(config);
-//     let billingTypeMatch = billingType ? priceBillingType == billingType : true;
-
-//     return itemMatch && billingTypeMatch;
-//   });
-// };
-
-// export const findScheduleItemForPrice = ({
-//   price,
-//   items,
-// }: {
-//   price: Price;
-//   items: Stripe.SubscriptionSchedule.Phase.Item[];
-// }) => {
-//   return items.find((si) => {
-//     const config = price.config as UsagePriceConfig;
-//     return config.stripe_price_id == si.price?.id;
-//   });
-// };
diff --git a/server/src/external/stripe/stripeSubUtils/updateStripeSub/createProrationinvoice.ts b/server/src/external/stripe/stripeSubUtils/updateStripeSub/createProrationinvoice.ts
index 3ba055853..e8d78c7d3 100644
--- a/server/src/external/stripe/stripeSubUtils/updateStripeSub/createProrationinvoice.ts
+++ b/server/src/external/stripe/stripeSubUtils/updateStripeSub/createProrationinvoice.ts
@@ -69,7 +69,6 @@ export const createProrationInvoice = async ({
 }) => {
 	const { stripeCli, customer, paymentMethod } = attachParams;
 
-	const proratedItems = [];
 	// How to retrieve upcoming invoice items?
 	const items = await stripeCli.invoiceItems.list({
 		customer: customer.processor.id,
diff --git a/server/src/external/stripe/stripeWebhooks.ts b/server/src/external/stripe/stripeWebhooks.ts
index fb55703d3..ee66df404 100644
--- a/server/src/external/stripe/stripeWebhooks.ts
+++ b/server/src/external/stripe/stripeWebhooks.ts
@@ -20,7 +20,6 @@ stripeWebhookRouter.post(
 		let event: Stripe.Event;
 
 		const { orgId, env } = request.params;
-		const { db } = request;
 
 		let org: Organization;
 
diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted.ts
index 55451dacc..3040d7056 100644
--- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted.ts
+++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted.ts
@@ -78,7 +78,6 @@ export const handleCheckoutSessionCompleted = async ({
 	if (attachParams.setupPayment) {
 		await handleSetupCheckout({
 			req,
-			db,
 			attachParams,
 		});
 		return;
@@ -107,18 +106,15 @@ export const handleCheckoutSessionCompleted = async ({
 		db,
 		subscription: checkoutSub,
 		attachParams,
-		logger,
 	});
 
 	// Create other subscriptions
 	const { invoiceIds } = await handleRemainingSets({
 		stripeCli,
-		db,
 		org,
 		checkoutSession,
 		attachParams,
 		checkoutSub,
-		logger,
 	});
 
 	const anchorToUnix = checkoutSub
@@ -147,7 +143,7 @@ export const handleCheckoutSessionCompleted = async ({
 					product,
 					productOptions.entity_id || undefined,
 				),
-				subscriptionIds: checkoutSub ? [checkoutSub?.id!] : undefined,
+				subscriptionIds: checkoutSub ? [checkoutSub.id] : undefined,
 				anchorToUnix,
 				scenario: AttachScenario.New,
 				logger,
@@ -160,7 +156,7 @@ export const handleCheckoutSessionCompleted = async ({
 			await createFullCusProduct({
 				db,
 				attachParams: attachToInsertParams(attachParams, product),
-				subscriptionIds: checkoutSub ? [checkoutSub?.id!] : undefined,
+				subscriptionIds: checkoutSub ? [checkoutSub.id] : undefined,
 				anchorToUnix,
 				scenario: AttachScenario.New,
 				logger,
diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/getOptionsFromCheckout.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/getOptionsFromCheckout.ts
index 939627aac..3b9d06131 100644
--- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/getOptionsFromCheckout.ts
+++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/getOptionsFromCheckout.ts
@@ -1,12 +1,11 @@
-import { AttachParams } from "@/internal/customers/cusProducts/AttachParams.js";
+import { BillingType, type UsagePriceConfig } from "@autumn/shared";
+import type Stripe from "stripe";
+import type { AttachParams } from "@/internal/customers/cusProducts/AttachParams.js";
 import {
-	formatPrice,
 	getBillingType,
 	getPriceEntitlement,
 	priceIsOneOffAndTiered,
 } from "@/internal/products/prices/priceUtils.js";
-import { BillingType, UsagePriceConfig } from "@autumn/shared";
-import Stripe from "stripe";
 import { findStripeItemForPrice } from "../../stripeSubUtils/stripeSubItemUtils.js";
 
 export const getOptionsFromCheckoutSession = async ({
@@ -18,7 +17,7 @@ export const getOptionsFromCheckoutSession = async ({
 }) => {
 	const usageInAdvanceExists = attachParams.prices.some(
 		(price) =>
-			getBillingType(price.config as UsagePriceConfig) ==
+			getBillingType(price.config as UsagePriceConfig) ===
 			BillingType.UsageInAdvance,
 	);
 
@@ -31,9 +30,9 @@ export const getOptionsFromCheckoutSession = async ({
 
 	// Should still work with old method?
 	for (const price of prices) {
-		let config = price.config as UsagePriceConfig;
+		const config = price.config as UsagePriceConfig;
 
-		if (getBillingType(config) != BillingType.UsageInAdvance) continue;
+		if (getBillingType(config) !== BillingType.UsageInAdvance) continue;
 
 		const lineItem = findStripeItemForPrice({
 			price,
@@ -43,7 +42,7 @@ export const getOptionsFromCheckoutSession = async ({
 		let quantity = 0;
 
 		if (lineItem) {
-			let relatedEnt = getPriceEntitlement(price, ents);
+			const relatedEnt = getPriceEntitlement(price, ents);
 
 			if (priceIsOneOffAndTiered(price, relatedEnt)) {
 				// quantity = lineItem.quantity || 0;
@@ -54,10 +53,10 @@ export const getOptionsFromCheckoutSession = async ({
 		}
 
 		const index = optionsList.findIndex(
-			(feature) => feature.internal_feature_id == config.internal_feature_id,
+			(feature) => feature.internal_feature_id === config.internal_feature_id,
 		);
 
-		if (index == -1) {
+		if (index === -1) {
 			attachParams.optionsList.push({
 				feature_id: config.feature_id,
 				internal_feature_id: config.internal_feature_id,
diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts
index 1674431e1..bad88a72b 100644
--- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts
+++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleCheckoutSub.ts
@@ -16,13 +16,11 @@ export const handleCheckoutSub = async ({
 	db,
 	subscription,
 	attachParams,
-	logger,
 }: {
 	stripeCli: Stripe;
 	db: DrizzleCli;
 	subscription: Stripe.Subscription | null;
 	attachParams: AttachParams;
-	logger: any;
 }) => {
 	const { org } = attachParams;
 
diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleRemainingSets.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleRemainingSets.ts
index 01afe9ef8..78325e8cd 100644
--- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleRemainingSets.ts
+++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleRemainingSets.ts
@@ -1,25 +1,20 @@
 import { ApiVersion, isUsagePrice, type Organization } from "@autumn/shared";
 import type Stripe from "stripe";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
 import type { AttachParams } from "@/internal/customers/cusProducts/AttachParams.js";
 import { getEmptyPriceItem } from "../../priceToStripeItem/priceToStripeItem.js";
 
 export const handleRemainingSets = async ({
 	stripeCli,
-	db,
 	org,
 	checkoutSession,
 	attachParams,
 	checkoutSub,
-	logger,
 }: {
 	stripeCli: Stripe;
-	db: DrizzleCli;
 	org: Organization;
 	checkoutSession: Stripe.Checkout.Session;
 	attachParams: AttachParams;
 	checkoutSub: Stripe.Subscription | null;
-	logger: any;
 }) => {
 	const itemSets = attachParams.itemSets;
 	const remainingSets = itemSets ? itemSets.slice(1) : [];
diff --git a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleSetupCheckout.ts b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleSetupCheckout.ts
index c2aa69a8f..11d9e6f7a 100644
--- a/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleSetupCheckout.ts
+++ b/server/src/external/stripe/webhookHandlers/handleCheckoutCompleted/handleSetupCheckout.ts
@@ -1,5 +1,4 @@
 import { AttachBranch } from "@autumn/shared";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { createStripeCli } from "@/external/connect/createStripeCli.js";
 import { handleAddProduct } from "@/internal/customers/attach/attachFunctions/addProductFlow/handleAddProduct.js";
 import { handleOneOffFunction } from "@/internal/customers/attach/attachFunctions/addProductFlow/handleOneOffFunction.js";
@@ -11,11 +10,9 @@ import { getCusPaymentMethod } from "../../stripeCusUtils.js";
 
 export const handleSetupCheckout = async ({
 	req,
-	db,
 	attachParams,
 }: {
 	req: ExtendedRequest;
-	db: DrizzleCli;
 	attachParams: AttachParams;
 }) => {
 	const logger = req.logger;
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleContUsePrices.ts b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleContUsePrices.ts
index eeac29535..89e2d89af 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleContUsePrices.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleContUsePrices.ts
@@ -15,7 +15,6 @@ export const handleContUsePrices = async ({
 	db,
 	cusEnts,
 	cusPrice,
-	stripeCli,
 	invoice,
 	usageSub,
 	logger,
@@ -24,8 +23,6 @@ export const handleContUsePrices = async ({
 	db: DrizzleCli;
 	cusEnts: FullCustomerEntitlement[];
 	cusPrice: FullCustomerPrice;
-	stripeCli: Stripe;
-
 	invoice: Stripe.Invoice;
 	usageSub: Stripe.Subscription;
 	logger: any;
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleInvoiceCreated.ts b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleInvoiceCreated.ts
index 88b977c40..ef9df9090 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleInvoiceCreated.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handleInvoiceCreated.ts
@@ -2,24 +2,18 @@ import {
 	type AppEnv,
 	BillingType,
 	CusProductStatus,
-	type Customer,
 	type FullCusProduct,
-	type FullCustomerEntitlement,
-	type FullCustomerPrice,
 	type Organization,
 } from "@autumn/shared";
 import type Stripe from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { createStripeCli } from "@/external/connect/createStripeCli.js";
-import { EntityService } from "@/internal/api/entities/EntityService.js";
 import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
-import { CusEntService } from "@/internal/customers/cusProducts/cusEnts/CusEntitlementService.js";
 import { getRelatedCusEnt } from "@/internal/customers/cusProducts/cusPrices/cusPriceUtils.js";
 import { cusProductToSub } from "@/internal/customers/cusProducts/cusProductUtils/convertCusProduct.js";
 import { FeatureService } from "@/internal/features/FeatureService.js";
 import { isFixedPrice } from "@/internal/products/prices/priceUtils/usagePriceUtils/classifyUsagePrice.js";
 import { getBillingType } from "@/internal/products/prices/priceUtils.js";
-import { notNullish } from "@/utils/genUtils.js";
 import { deleteCachedApiCustomer } from "../../../../internal/customers/cusUtils/apiCusCacheUtils/deleteCachedApiCustomer.js";
 import {
 	getFullStripeInvoice,
@@ -31,139 +25,6 @@ import { handleContUsePrices } from "./handleContUsePrices.js";
 import { handlePrepaidPrices } from "./handlePrepaidPrices.js";
 import { handleUsagePrices } from "./handleUsagePrices.js";
 
-const handleInArrearProrated = async ({
-	db,
-	cusEnts,
-	cusPrice,
-	customer,
-	org,
-	env,
-	invoice,
-	usageSub,
-	logger,
-}: {
-	db: DrizzleCli;
-
-	cusEnts: FullCustomerEntitlement[];
-	cusPrice: FullCustomerPrice;
-	customer: Customer;
-	org: Organization;
-	env: AppEnv;
-	invoice: Stripe.Invoice;
-	usageSub: Stripe.Subscription;
-	logger: any;
-}) => {
-	const cusEnt = getRelatedCusEnt({
-		cusPrice,
-		cusEnts,
-	});
-
-	if (!cusEnt) {
-		console.log("No related cus ent found");
-		return;
-	}
-
-	// console.log("Invoice period start:\t", formatUnixToDateTime(invoice.period_start * 1000));
-	// console.log("Invoice period end:\t", formatUnixToDateTime(invoice.period_end * 1000));
-	// console.log("Sub period start:\t", formatUnixToDateTime(usageSub.current_period_start * 1000));
-	// console.log("Sub period end:\t", formatUnixToDateTime(usageSub.current_period_end * 1000));
-
-	// Check if invoice is for new subscription period by comparing billing period
-	const { start: periodStart, end: periodEnd } = subToPeriodStartEnd({
-		sub: usageSub,
-	});
-	const isNewPeriod = invoice.period_start !== periodStart;
-	if (!isNewPeriod) {
-		logger.info("Invoice is not for new subscription period, skipping...");
-		return;
-	}
-
-	const feature = cusEnt.entitlement.feature;
-	logger.info(
-		`Handling invoice.created for in arrear prorated, feature: ${feature.id}`,
-	);
-
-	const deletedEntities = await EntityService.list({
-		db,
-		internalCustomerId: customer.internal_id!,
-		inFeatureIds: [feature.internal_id!],
-		isDeleted: true,
-	});
-
-	if (deletedEntities.length === 0) {
-		logger.info("No deleted entities found");
-		return;
-	}
-
-	logger.info(
-		`✨ Handling in arrear prorated, customer ${customer.name}, org: ${org.slug}`,
-	);
-
-	logger.info(
-		`Deleting entities, feature ${feature.id}, customer ${customer.id}, org ${org.slug}`,
-		deletedEntities,
-	);
-
-	// Get linked cus ents
-
-	for (const linkedCusEnt of cusEnts) {
-		// isLinked
-		const isLinked = linkedCusEnt.entitlement.entity_feature_id === feature.id;
-
-		if (!isLinked) {
-			continue;
-		}
-
-		logger.info(
-			`Linked cus ent: ${linkedCusEnt.feature_id}, isLinked: ${isLinked}`,
-		);
-
-		// Delete cus ent ids
-		const newEntities = structuredClone(linkedCusEnt.entities!);
-		for (const entityId in newEntities) {
-			if (deletedEntities.some((e) => e.id === entityId)) {
-				delete newEntities[entityId];
-			}
-		}
-
-		const updated = await CusEntService.update({
-			db,
-			id: linkedCusEnt.id,
-			updates: {
-				entities: newEntities,
-			},
-		});
-		console.log(`Updated ${updated.length} cus ents`);
-
-		logger.info(
-			`Feature: ${feature.id}, customer: ${customer.id}, deleted entities from cus ent`,
-		);
-		linkedCusEnt.entities = newEntities;
-	}
-
-	await EntityService.deleteInInternalIds({
-		db,
-		internalIds: deletedEntities.map((e) => e.internal_id!),
-		orgId: org.id,
-		env,
-	});
-	logger.info(
-		`Feature: ${feature.id}, Deleted ${
-			deletedEntities.length
-		}, entities: ${deletedEntities.map((e) => `${e.id}`).join(", ")}`,
-	);
-
-	// Increase balance
-	if (notNullish(cusEnt.balance)) {
-		logger.info(`Incrementing balance for cus ent: ${cusEnt.id}`);
-		await CusEntService.increment({
-			db,
-			id: cusEnt.id,
-			amount: deletedEntities.length,
-		});
-	}
-};
-
 // For cancel at period end: invoice period start = sub period start (cur cycle), invoice period end = sub period end (a month later...)
 // For cancel immediately: invoice period start = sub period start (cur cycle), invoice period end cancel immediately date
 // For regular billing: invoice period end = sub period start (next cycle)
@@ -175,7 +36,6 @@ export const sendUsageAndReset = async ({
 	org,
 	env,
 	invoice,
-	stripeSubs,
 	logger,
 	submitUsage = true,
 	resetBalance = true,
@@ -185,7 +45,6 @@ export const sendUsageAndReset = async ({
 	org: Organization;
 	env: AppEnv;
 	invoice: Stripe.Invoice;
-	stripeSubs: Stripe.Subscription[];
 	logger: any;
 	submitUsage?: boolean;
 	resetBalance?: boolean;
@@ -249,7 +108,6 @@ export const sendUsageAndReset = async ({
 		if (billingType === BillingType.InArrearProrated) {
 			const handledContUse = await handleContUsePrices({
 				db,
-				stripeCli,
 				cusEnts,
 				cusPrice,
 				invoice,
@@ -264,11 +122,9 @@ export const sendUsageAndReset = async ({
 		if (billingType === BillingType.UsageInAdvance) {
 			const handledPrepaid = await handlePrepaidPrices({
 				db,
-				stripeCli,
 				cusPrice,
 				cusProduct: activeProduct,
 				usageSub: usageBasedSub,
-				customer,
 				invoice,
 				logger,
 				resetBalance,
@@ -333,7 +189,7 @@ export const handleInvoiceCreated = async ({
 			(p) => p.internal_entity_id,
 		)?.internal_entity_id;
 
-		const features = await FeatureService.list({
+		await FeatureService.list({
 			db,
 			orgId: org.id,
 			env,
@@ -389,7 +245,6 @@ export const handleInvoiceCreated = async ({
 				activeProduct,
 				org,
 				env,
-				stripeSubs,
 				invoice,
 				logger,
 				submitUsage: true, // Always submit usage during invoice.created
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handlePrepaidPrices.ts b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handlePrepaidPrices.ts
index c5e30d8a6..ef1a8fa0e 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handlePrepaidPrices.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoiceCreated/handlePrepaidPrices.ts
@@ -1,5 +1,4 @@
 import {
-	type Customer,
 	EntInterval,
 	type FeatureOptions,
 	type FullCusProduct,
@@ -20,21 +19,17 @@ import { subToPeriodStartEnd } from "../../stripeSubUtils/convertSubUtils.js";
 
 export const handlePrepaidPrices = async ({
 	db,
-	stripeCli,
 	cusProduct,
 	cusPrice,
 	usageSub,
-	customer,
 	invoice,
 	logger,
 	resetBalance = true,
 }: {
 	db: DrizzleCli;
-	stripeCli: Stripe;
 	cusProduct: FullCusProduct;
 	cusPrice: FullCustomerPrice;
 	usageSub: Stripe.Subscription;
-	customer: Customer;
 	invoice: Stripe.Invoice;
 	logger: any;
 	resetBalance?: boolean;
@@ -60,7 +55,7 @@ export const handlePrepaidPrices = async ({
 
 	const options = getEntOptions(cusProduct.options, cusEnt.entitlement);
 
-	const resetQuantity = options?.upcoming_quantity || options?.quantity!;
+	const resetQuantity = (options?.upcoming_quantity || options?.quantity) ?? 0;
 	const config = cusPrice.price.config as UsagePriceConfig;
 	const billingUnits = config.billing_units || 1;
 	const newAllowance =
@@ -106,7 +101,8 @@ export const handlePrepaidPrices = async ({
 		});
 
 		if (ent.interval === EntInterval.Lifetime) {
-			const difference = options?.quantity! - options?.upcoming_quantity!;
+			const difference =
+				(options?.quantity ?? 0) - (options?.upcoming_quantity ?? 0);
 			await CusEntService.decrement({
 				db,
 				id: cusEnt.id,
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoicePaid.ts b/server/src/external/stripe/webhookHandlers/handleInvoicePaid.ts
index 64d7c348b..a5ce49fbf 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoicePaid.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoicePaid.ts
@@ -28,12 +28,10 @@ import { handleInvoicePaidDiscount } from "./handleInvoicePaidDiscount.js";
 const handleOneOffInvoicePaid = async ({
 	db,
 	stripeInvoice,
-	logger,
 }: {
 	db: DrizzleCli;
 	stripeInvoice: Stripe.Invoice;
 	event: Stripe.Event;
-	logger: any;
 }) => {
 	// Search for invoice
 	const invoice = await InvoiceService.getByStripeId({
@@ -285,7 +283,6 @@ export const handleInvoicePaid = async ({
 			db,
 			stripeInvoice: invoice,
 			event,
-			logger,
 		});
 	}
 };
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoicePaidDiscount.ts b/server/src/external/stripe/webhookHandlers/handleInvoicePaidDiscount.ts
index 044b403a8..9d883cbbc 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoicePaidDiscount.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoicePaidDiscount.ts
@@ -34,29 +34,28 @@ export const handleInvoicePaidDiscount = async ({
 	logger: any;
 }) => {
 	// Handle coupon
-	const stripeCli = createStripeCli({ org, env });
-	if (expandedInvoice.discounts.length === 0) {
-		return;
-	}
+	const stripeCli = createStripeCli({ org, env, legacyVersion: true });
+	if (expandedInvoice.discounts.length === 0) return;
 
 	const stripeCus = await stripeCli.customers.retrieve(
 		expandedInvoice.customer as string,
 	);
 
+	const legacyInvoice = await stripeCli.invoices.retrieve(expandedInvoice.id, {
+		expand: ["total_discount_amounts", "discounts.coupon"],
+	});
+
 	try {
 		const totalDiscountAmounts = expandedInvoice.total_discount_amounts;
 
 		// Log coupon information for debugging
-		for (const discount of expandedInvoice.discounts) {
-			if (typeof discount === "string") {
-				continue;
-			}
+		for (const discount of legacyInvoice.discounts) {
+			if (typeof discount === "string" || !("coupon" in discount)) continue;
 
-			const curCoupon = discount.source.coupon;
+			const curCoupon = discount.coupon as Stripe.Coupon;
 
-			if (!curCoupon || typeof curCoupon === "string") {
+			if (!curCoupon || typeof curCoupon === "string" || !curCoupon.amount_off)
 				continue;
-			}
 
 			const rollSuffixIndex = curCoupon.id.indexOf("_roll_");
 			const couponId =
@@ -76,9 +75,7 @@ export const handleInvoicePaidDiscount = async ({
 				(autumnReward.type === RewardType.InvoiceCredits ||
 					autumnReward.type === RewardType.FreeProduct);
 
-			if (!shouldRollover) {
-				continue;
-			}
+			if (!shouldRollover) continue;
 
 			// Get ID of coupon
 			const originalCoupon = await stripeCli.coupons.retrieve(couponId, {
@@ -150,13 +147,7 @@ export const handleInvoicePaidDiscount = async ({
 				},
 			});
 
-			const legacyStripeCli = createStripeCli({
-				org,
-				env,
-				legacyVersion: true,
-			});
-
-			await legacyStripeCli.rawRequest(
+			await stripeCli.rawRequest(
 				"POST",
 				`/v1/customers/${expandedInvoice.customer}`,
 				{
diff --git a/server/src/external/stripe/webhookHandlers/handleInvoiceUpdated.ts b/server/src/external/stripe/webhookHandlers/handleInvoiceUpdated.ts
index 9702b588b..046459f44 100644
--- a/server/src/external/stripe/webhookHandlers/handleInvoiceUpdated.ts
+++ b/server/src/external/stripe/webhookHandlers/handleInvoiceUpdated.ts
@@ -1,5 +1,4 @@
 import {
-	type AppEnv,
 	type Invoice,
 	InvoiceStatus,
 	stripeToAtmnAmount,
@@ -13,6 +12,7 @@ import { InvoiceService } from "@/internal/invoices/InvoiceService.js";
 import { MetadataService } from "@/internal/metadata/MetadataService.js";
 import { getFullStripeInvoice, invoiceToSubId } from "../stripeInvoiceUtils.js";
 
+// biome-ignore lint/correctness/noUnusedVariables: Might be useful in the future
 const handleInvoiceCheckoutVoided = async ({
 	db,
 	stripeCli,
@@ -81,14 +81,10 @@ const handleInvoiceCheckoutVoided = async ({
 };
 
 export const handleInvoiceUpdated = async ({
-	env,
 	event,
-	stripeCli,
 	req,
 }: {
-	env: AppEnv;
 	event: Stripe.Event;
-	stripeCli: Stripe;
 	req: any;
 }) => {
 	const invoiceObject = event.data.object as Stripe.Invoice;
@@ -97,13 +93,6 @@ export const handleInvoiceUpdated = async ({
 		stripeId: invoiceObject.id!,
 	});
 
-	// const invoice = await getFullStripeInvoice({
-	//   stripeCli,
-	//   stripeId: invoiceObject.id!,
-	// });
-
-	const prevAttributes = event.data.previous_attributes as any;
-
 	const updates: Partial<Invoice> = {};
 
 	if (invoiceObject.status === "void") {
diff --git a/server/src/external/stripe/webhookHandlers/handleSubDeleted.ts b/server/src/external/stripe/webhookHandlers/handleSubDeleted.ts
index 580c4a1ac..51976c1a4 100644
--- a/server/src/external/stripe/webhookHandlers/handleSubDeleted.ts
+++ b/server/src/external/stripe/webhookHandlers/handleSubDeleted.ts
@@ -1,10 +1,10 @@
-import Stripe from "stripe";
+import type Stripe from "stripe";
+import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
+import type { ExtendedRequest } from "@/utils/models/Request.js";
 import {
 	getFullStripeSub,
 	subIsPrematurelyCanceled,
 } from "../stripeSubUtils.js";
-import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
-import { ExtendedRequest } from "@/utils/models/Request.js";
 import { handleCusProductDeleted } from "./handleSubDeleted/handleCusProductDeleted.js";
 
 export const handleSubDeleted = async ({
@@ -60,7 +60,7 @@ export const handleSubDeleted = async ({
 	}
 
 	// Prematurely canceled if cancel_at_period_end is false or cancel_at is more than 20 seconds apart from current_period_end
-	let prematurelyCanceled = subIsPrematurelyCanceled(subscription);
+	const prematurelyCanceled = subIsPrematurelyCanceled(subscription);
 
 	// const batchUpdate = [];
 	for (const cusProduct of activeCusProducts) {
diff --git a/server/src/external/stripe/webhookHandlers/handleSubScheduleCanceled.ts b/server/src/external/stripe/webhookHandlers/handleSubScheduleCanceled.ts
index 40a0d3d62..b1c602f3f 100644
--- a/server/src/external/stripe/webhookHandlers/handleSubScheduleCanceled.ts
+++ b/server/src/external/stripe/webhookHandlers/handleSubScheduleCanceled.ts
@@ -1,7 +1,6 @@
 import type { AppEnv, Organization } from "@autumn/shared";
 import type Stripe from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { createStripeCli } from "@/external/connect/createStripeCli.js";
 import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
 
 export const handleSubscriptionScheduleCanceled = async ({
@@ -9,13 +8,11 @@ export const handleSubscriptionScheduleCanceled = async ({
 	schedule,
 	env,
 	org,
-	logger,
 }: {
 	db: DrizzleCli;
 	schedule: Stripe.SubscriptionSchedule;
 	org: Organization;
 	env: AppEnv;
-	logger: any;
 }) => {
 	const cusProductsOnSchedule = await CusProductService.getByScheduleId({
 		db,
@@ -25,59 +22,4 @@ export const handleSubscriptionScheduleCanceled = async ({
 	});
 
 	if (cusProductsOnSchedule.length === 0) return;
-
-	for (const cusProduct of cusProductsOnSchedule) {
-		const stripeCli = createStripeCli({ org, env });
-
-		// if (cusProduct.status === CusProductStatus.Scheduled) {
-		//   // let otherScheduledIds = cusProduct.scheduled_ids?.filter(
-		//   //   (id: string) => id !== schedule.id
-		//   // );
-
-		//   // for (const id of otherScheduledIds || []) {
-		//   //   try {
-		//   //     await stripeCli.subscriptionSchedules.cancel(id);
-		//   //     console.log("   - Cancelled scheduled id", id);
-		//   //   } catch (error) {
-		//   //     console.error("Failed to cancel subscription schedule:", id, error);
-		//   //   }
-		//   // }
-
-		//   await CusProductService.delete({
-		//     db,
-		//     cusProductId: cusProduct.id,
-		//   });
-		// } else {
-		//   // Here -> Should do something different, maybe... reactivate future product?
-		//   await CusProductService.update({
-		//     db,
-		//     cusProductId: cusProduct.id,
-		//     updates: {
-		//       scheduled_ids: cusProduct.scheduled_ids?.filter(
-		//         (id: string) => id !== schedule.id
-		//       ),
-		//     },
-		//   });
-		// }
-	}
-
-	// // Delete from subscriptions
-	// try {
-	//   let autumnSub = await SubService.getFromScheduleId({
-	//     db,
-	//     scheduleId: schedule.id,
-	//   });
-
-	//   if (autumnSub && !autumnSub.stripe_id) {
-	//     await SubService.deleteFromScheduleId({
-	//       db,
-	//       scheduleId: schedule.id,
-	//     });
-	//   }
-	// } catch (error) {
-	//   logger.error(
-	//     `handleSubScheduleCanceled: failed to delete from subscriptions table`,
-	//     error
-	//   );
-	// }
 };
diff --git a/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSchedulePhaseCompleted.ts b/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSchedulePhaseCompleted.ts
index f41ddedd5..3955a3860 100644
--- a/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSchedulePhaseCompleted.ts
+++ b/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSchedulePhaseCompleted.ts
@@ -102,7 +102,7 @@ export const handleSchedulePhaseCompleted = async ({
 
 			// Maybe activate default product?
 			await deleteCachedApiCustomer({
-				customerId: cusProduct.internal_customer_id || "",
+				customerId: cusProduct.customer?.id || "",
 				orgId: org.id,
 				env,
 				source: "handleSchedulePhaseCompleted",
diff --git a/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSubRenewed.ts b/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSubRenewed.ts
index 7268116da..73e30fc69 100644
--- a/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSubRenewed.ts
+++ b/server/src/external/stripe/webhookHandlers/handleSubUpdated/handleSubRenewed.ts
@@ -1,6 +1,5 @@
 import { AttachScenario, type FullCusProduct } from "@autumn/shared";
 import type Stripe from "stripe";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { addProductsUpdatedWebhookTask } from "@/internal/analytics/handlers/handleProductsUpdated.js";
 import { isMultiProductSub } from "@/internal/customers/attach/mergeUtils/mergeUtils.js";
 import { getSubScenarioFromCache } from "@/internal/customers/cusCache/subCacheUtils.js";
@@ -32,26 +31,6 @@ const isSubRenewed = ({
 	};
 };
 
-const updateCusProductRenewed = async ({
-	db,
-	sub,
-}: {
-	db: DrizzleCli;
-	sub: Stripe.Subscription;
-}) => {
-	if (sub.schedule) {
-		return;
-	}
-
-	await CusProductService.updateByStripeSubId({
-		db,
-		stripeSubId: sub.id,
-		updates: { canceled_at: null, canceled: false },
-	});
-
-	return;
-};
-
 export const handleSubRenewed = async ({
 	req,
 	prevAttributes,
@@ -131,5 +110,5 @@ export const handleSubRenewed = async ({
 				),
 			});
 		}
-	} catch (error) {}
+	} catch (_error) {}
 };
diff --git a/server/src/external/stripe/webhookUtils/webhookUtils.ts b/server/src/external/stripe/webhookUtils/webhookUtils.ts
index 91b79954b..f34ab452d 100644
--- a/server/src/external/stripe/webhookUtils/webhookUtils.ts
+++ b/server/src/external/stripe/webhookUtils/webhookUtils.ts
@@ -1,15 +1,14 @@
-import {
-	AttachParams,
-	InsertCusProductParams,
-} from "@/internal/customers/cusProducts/AttachParams.js";
 import {
 	cusProductToEnts,
 	cusProductToPrices,
 	cusProductToProduct,
+	type Entity,
+	type FullCusProduct,
+	type FullCustomer,
 } from "@autumn/shared";
-import { ExtendedRequest } from "@/utils/models/Request.js";
-import { Entity, FullCusProduct, FullCustomer } from "@autumn/shared";
-import Stripe from "stripe";
+import type Stripe from "stripe";
+import type { AttachParams } from "@/internal/customers/cusProducts/AttachParams.js";
+import type { ExtendedRequest } from "@/utils/models/Request.js";
 
 export const webhookToAttachParams = ({
 	req,
diff --git a/server/src/external/supabase/storageUtils.ts b/server/src/external/supabase/storageUtils.ts
index b881246e7..7df7c08b3 100644
--- a/server/src/external/supabase/storageUtils.ts
+++ b/server/src/external/supabase/storageUtils.ts
@@ -1,4 +1,3 @@
-import { SupabaseClient } from "@supabase/supabase-js";
 import { createSupabaseClient } from "../supabaseUtils.js";
 
 export const readFile = async ({
diff --git a/server/src/external/supabaseUtils.ts b/server/src/external/supabaseUtils.ts
index 8e39d6810..4624c2397 100644
--- a/server/src/external/supabaseUtils.ts
+++ b/server/src/external/supabaseUtils.ts
@@ -1,38 +1,4 @@
 import { createClient } from "@supabase/supabase-js";
-import fetchRetry from "fetch-retry";
-
-// Wrap the global fetch with fetch-retry
-const fetchWithRetry = fetchRetry(fetch, {
-	retries: 3,
-	retryDelay: (attempt) => Math.min(1000 * 2 ** attempt, 30000), // Exponential backoff starting at 1s, max 30s
-	retryOn: (attempt, error, response) => {
-		// Retry on gateway errors (502) and Cloudflare errors (520)
-
-		let shouldRetry = false;
-		try {
-			if (
-				error?.message?.includes("cloudflare") ||
-				error?.message?.includes("fetch failed")
-			) {
-				shouldRetry = true;
-			}
-		} catch (error) {}
-
-		if (
-			(response && (response.status === 502 || response.status === 520)) ||
-			shouldRetry
-		) {
-			console.warn(
-				`Retrying request... Attempt #${attempt + 1} - Status: ${
-					response?.status
-				}`,
-			);
-			return true;
-		}
-
-		return false;
-	},
-});
 
 export const createSupabaseClient = () => {
 	try {
diff --git a/server/src/external/svix/svixHelpers.ts b/server/src/external/svix/svixHelpers.ts
index 174280a37..c2724bf10 100644
--- a/server/src/external/svix/svixHelpers.ts
+++ b/server/src/external/svix/svixHelpers.ts
@@ -65,7 +65,9 @@ export const sendSvixEvent = safeSvix({
 
 export const sendCustomSvixEvent = safeSvix({
 	fn: async ({
+		// biome-ignore lint/correctness/noUnusedFunctionParameters: Might be useful in the future
 		org,
+		// biome-ignore lint/correctness/noUnusedFunctionParameters: Might be useful in the future
 		env,
 		eventType,
 		data,
diff --git a/server/src/external/vercel/handlers/handleListBillingPlans.ts b/server/src/external/vercel/handlers/handleListBillingPlans.ts
index d7855ba0a..9362a5a3c 100644
--- a/server/src/external/vercel/handlers/handleListBillingPlans.ts
+++ b/server/src/external/vercel/handlers/handleListBillingPlans.ts
@@ -137,6 +137,7 @@ export const listVercelPlansForOrg = async ({
 	org,
 	env,
 	metadata,
+	// biome-ignore lint/correctness/noUnusedFunctionParameters: Might be useful in the future
 	canCancel = true,
 }: {
 	db: DrizzleCli;
diff --git a/server/src/external/vercel/handlers/installations/handleGetInstallation.ts b/server/src/external/vercel/handlers/installations/handleGetInstallation.ts
index 35cce8b58..fa29cd0fc 100644
--- a/server/src/external/vercel/handlers/installations/handleGetInstallation.ts
+++ b/server/src/external/vercel/handlers/installations/handleGetInstallation.ts
@@ -8,7 +8,7 @@ export const handleGetInstallation = createRoute({
 	handler: async (c) => {
 		const ctx = c.get("ctx");
 		const { integrationConfigurationId } = c.req.param();
-		const { db, org, logger } = ctx;
+		const { db, org } = ctx;
 
 		const customer = await CusService.getByVercelId({
 			db,
diff --git a/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoicePaid.ts b/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoicePaid.ts
index 59d408175..fddb51982 100644
--- a/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoicePaid.ts
+++ b/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoicePaid.ts
@@ -37,13 +37,7 @@ export const handleMarketplaceInvoicePaid = async ({
 		invoiceDate: string;
 	};
 }) => {
-	const {
-		installationId,
-		invoiceId,
-		externalInvoiceId,
-		invoiceTotal,
-		invoiceDate,
-	} = payload;
+	const { installationId, invoiceId, externalInvoiceId, invoiceDate } = payload;
 
 	const stripeCli = createStripeCli({ org, env });
 
@@ -160,7 +154,6 @@ export const handleMarketplaceInvoicePaid = async ({
 		}
 
 		if (isRenewal) {
-			// Call sendUsageAndReset which handles all balance resets
 			const activeProduct = existingCusProducts[0];
 
 			await sendUsageAndReset({
@@ -169,7 +162,6 @@ export const handleMarketplaceInvoicePaid = async ({
 				org,
 				env,
 				invoice,
-				stripeSubs: [subscription],
 				logger,
 				submitUsage: false, // Usage already submitted in invoice.created
 				resetBalance: true, // Payment confirmed - now safe to reset balance
diff --git a/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoidNotPaid.ts b/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoidNotPaid.ts
index 739792fe4..1003145d3 100644
--- a/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoidNotPaid.ts
+++ b/server/src/external/vercel/handlers/marketplace/handleMarketplaceInvoidNotPaid.ts
@@ -26,13 +26,7 @@ export const handleMarketplaceInvoiceNotPaid = async ({
 		invoiceDate: string;
 	};
 }) => {
-	const {
-		installationId,
-		invoiceId,
-		externalInvoiceId,
-		invoiceTotal,
-		invoiceDate,
-	} = payload;
+	const { installationId, invoiceId, externalInvoiceId, invoiceDate } = payload;
 
 	const stripeCli = createStripeCli({ org, env });
 
diff --git a/server/src/external/vercel/misc/vercelAuth.ts b/server/src/external/vercel/misc/vercelAuth.ts
index 27d456560..2bc205032 100644
--- a/server/src/external/vercel/misc/vercelAuth.ts
+++ b/server/src/external/vercel/misc/vercelAuth.ts
@@ -146,7 +146,7 @@ export const vercelOidcAuthMiddleware = async (c: any, next: any) => {
 	let token: string;
 	try {
 		token = getAuthorizationToken(authHeader);
-	} catch (error) {
+	} catch (_error) {
 		return c.json(
 			{ error: "Unauthorized", code: "invalid_auth_header_format" },
 			401,
@@ -160,7 +160,7 @@ export const vercelOidcAuthMiddleware = async (c: any, next: any) => {
 	} catch (error: any) {
 		return c.json(
 			{
-				error: "Unauthorized" + error.message,
+				error: `Unauthorized: ${error.message}`,
 				code:
 					error instanceof AuthError
 						? "auth_failed"
diff --git a/server/src/external/vercel/misc/vercelInvoicing.ts b/server/src/external/vercel/misc/vercelInvoicing.ts
index 8ab6c3674..f9a965b74 100644
--- a/server/src/external/vercel/misc/vercelInvoicing.ts
+++ b/server/src/external/vercel/misc/vercelInvoicing.ts
@@ -265,7 +265,7 @@ export const getVercelAttachBody = ({
 	const attachParams: AttachParams = {
 		stripeCli,
 		stripeCus: stripeCustomer,
-		now: Date.now(),
+		now: now ?? Date.now(),
 		paymentMethod: customPaymentMethod, // Pass Vercel custom payment method
 		org,
 		customer,
diff --git a/server/src/external/vercel/misc/vercelMiddleware.ts b/server/src/external/vercel/misc/vercelMiddleware.ts
index fcdaad7e8..990732748 100644
--- a/server/src/external/vercel/misc/vercelMiddleware.ts
+++ b/server/src/external/vercel/misc/vercelMiddleware.ts
@@ -47,7 +47,7 @@ export const logVercelWebhook = ({
 };
 
 export const vercelLogMiddleware = async (c: Context<HonoEnv>, next: Next) => {
-	const { db, logger, org } = c.get("ctx");
+	const { logger, org } = c.get("ctx");
 	const body = await c.req.json();
 
 	logVercelWebhook({ logger, org, event: body });
diff --git a/server/src/external/webhooks/clerkWebhooks.ts b/server/src/external/webhooks/clerkWebhooks.ts
deleted file mode 100644
index 8cf6a47f8..000000000
--- a/server/src/external/webhooks/clerkWebhooks.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Request, Response } from "express";
-import { Webhook } from "svix";
-import { OrgService } from "@/internal/orgs/OrgService.js";
-import RecaseError, { handleRequestError } from "@/utils/errorUtils.js";
-
-import { AppEnv } from "autumn-js";
-
-import { deleteSvixApp } from "@/external/svix/svixHelpers.js";
-import { deleteStripeWebhook } from "@/internal/orgs/orgUtils.js";
-
-import { eq } from "drizzle-orm";
-import { DrizzleCli } from "@/db/initDrizzle.js";
-import { Organization, organizations } from "@autumn/shared";
-
-// const verifyClerkWebhook = async (req: Request, res: Response) => {
-//   const wh = new Webhook(process.env.CLERK_SIGNING_SECRET!);
-
-//   const headers = req.headers;
-//   const payload = req.body;
-
-//   const svix_id = headers["svix-id"];
-//   const svix_timestamp = headers["svix-timestamp"];
-//   const svix_signature = headers["svix-signature"];
-
-//   if (!svix_id || !svix_timestamp || !svix_signature) {
-//     res.status(400).json({
-//       success: false,
-//       message: "Error: Missing svix headers",
-//     });
-//     return;
-//   }
-
-//   let evt: any;
-//   try {
-//     evt = wh.verify(payload, {
-//       "svix-id": svix_id as string,
-//       "svix-timestamp": svix_timestamp as string,
-//       "svix-signature": svix_signature as string,
-//     });
-//   } catch (err) {
-//     console.log("Error: Could not verify webhook");
-//     res.status(400).json({
-//       success: false,
-//       message: "Error: Could not verify webhook",
-//     });
-//     return;
-//   }
-
-//   return evt;
-// };
-
-// export const handleClerkWebhook = async (req: any, res: any) => {
-//   let event = await verifyClerkWebhook(req, res);
-
-//   if (!event) {
-//     return;
-//   }
-
-//   const eventType = event.type;
-//   const eventData = event.data;
-
-//   try {
-//     switch (eventType) {
-//       case "organization.created":
-//         await saveOrgToDB({
-//           db: req.db,
-//           id: eventData.id,
-//           slug: eventData.slug,
-//           createdAt: eventData.created_at,
-//         });
-//         break;
-
-//       case "organization.deleted":
-//         await handleOrgDeleted({
-//           db: req.db,
-//           eventData,
-//         });
-//         break;
-
-//       default:
-//         break;
-//     }
-//   } catch (error) {
-//     handleRequestError({
-//       req,
-//       error,
-//       res,
-//       action: "Handle Clerk Webhook",
-//     });
-//     return;
-//   }
-
-//   return void res.status(200).json({
-//     success: true,
-//     message: "Webhook received",
-//   });
-// };
diff --git a/server/src/honoMiddlewares/analyticsMiddleware.ts b/server/src/honoMiddlewares/analyticsMiddleware.ts
index 9872cdcd4..59052eb8f 100644
--- a/server/src/honoMiddlewares/analyticsMiddleware.ts
+++ b/server/src/honoMiddlewares/analyticsMiddleware.ts
@@ -27,12 +27,10 @@ const parseCustomerIdFromUrl = ({
 const logResponse = async ({
 	ctx,
 	c,
-	method,
 	skipUrls,
 }: {
 	ctx: any;
 	c: Context<HonoEnv>;
-	method: string;
 	skipUrls: string[];
 }) => {
 	try {
@@ -116,7 +114,7 @@ export const analyticsMiddleware = async (c: Context<HonoEnv>, next: Next) => {
 
 	// Log response asynchronously without blocking (runs after response is sent)
 	Promise.resolve()
-		.then(() => logResponse({ ctx, c, method, skipUrls }))
+		.then(() => logResponse({ ctx, c, skipUrls }))
 		.catch((error) => {
 			console.error("Failed to log response to logtail");
 			console.error(error);
diff --git a/server/src/honoMiddlewares/baseMiddleware.ts b/server/src/honoMiddlewares/baseMiddleware.ts
index b4c632518..b4dc6f9b3 100644
--- a/server/src/honoMiddlewares/baseMiddleware.ts
+++ b/server/src/honoMiddlewares/baseMiddleware.ts
@@ -31,7 +31,6 @@ export const baseMiddleware = async (c: Context<HonoEnv>, next: Next) => {
 	};
 
 	const method = c.req.method;
-	const path = c.req.path;
 
 	let body = null;
 	if (method === "POST" || method === "PUT" || method === "PATCH") {
diff --git a/server/src/init.ts b/server/src/init.ts
index ef2f5fdcd..4523d1bbe 100644
--- a/server/src/init.ts
+++ b/server/src/init.ts
@@ -189,7 +189,7 @@ const init = async () => {
 	app.use("/webhooks", webhooksRouter);
 
 	app.use(express.json());
-	app.use(async (req: any, res: any, next: any) => {
+	app.use(async (req: any, _res: any, next: any) => {
 		req.logger.info(`${req.method} ${req.originalUrl}`, {
 			context: {
 				body: req.body,
@@ -228,7 +228,7 @@ if (process.env.NODE_ENV === "development") {
 			cluster.fork();
 		}
 
-		cluster.on("exit", (worker, code, signal) => {
+		cluster.on("exit", (worker, _code, _signal) => {
 			logger.error(`WORKER DIED: ${worker.process.pid}`);
 			cluster.fork();
 		});
diff --git a/server/src/internal/admin/adminRouter.ts b/server/src/internal/admin/adminRouter.ts
index f82f2cbbe..d466b5802 100644
--- a/server/src/internal/admin/adminRouter.ts
+++ b/server/src/internal/admin/adminRouter.ts
@@ -1,8 +1,8 @@
-import { handleFrontendReqError } from "@/utils/errorUtils.js";
-import { ExtendedRequest } from "@/utils/models/Request.js";
 import { member, organizations, user } from "@autumn/shared";
 import { and, desc, eq, gt, gte, ilike, inArray, lt, or } from "drizzle-orm";
 import { Router } from "express";
+import { handleFrontendReqError } from "@/utils/errorUtils.js";
+import type { ExtendedRequest } from "@/utils/models/Request.js";
 
 export const adminRouter: Router = Router();
 
@@ -12,7 +12,7 @@ adminRouter.get("/users", async (req: any, res: any) => {
 	try {
 		const { db } = req as ExtendedRequest;
 
-		let { sortKey, search, after, before } = req.query;
+		let { search, after, before } = req.query;
 
 		if (after) {
 			after = {
@@ -136,9 +136,9 @@ adminRouter.get("/orgs", async (req: any, res: any) => {
 			.orderBy(desc(organizations.createdAt), desc(organizations.id))
 			.limit(21);
 
-		let orgIds = orgs.map((org) => org.id);
+		const orgIds = orgs.map((org) => org.id);
 
-		let memberships = await db
+		const memberships = await db
 			.select()
 			.from(member)
 			.leftJoin(user, eq(member.userId, user.id))
diff --git a/server/src/internal/admin/adminUtils/userAnalytics.ts b/server/src/internal/admin/adminUtils/userAnalytics.ts
deleted file mode 100644
index 6b35c17b6..000000000
--- a/server/src/internal/admin/adminUtils/userAnalytics.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { DrizzleCli } from "@/db/initDrizzle.js";
-import { ExtendedRequest } from "@/utils/models/Request.js";
-import { user } from "@autumn/shared";
-import { count } from "drizzle-orm";
-
-// Required stats (by interval):
-// 1. User count
-// 2. Retained count
-// 3. Churned count
-
-export const getUserCount = async ({ db }: { db: DrizzleCli }) => {
-	const userCount = await db.select({ count: count() }).from(user);
-	return userCount[0].count;
-};
diff --git a/server/src/internal/analytics/ActionService.ts b/server/src/internal/analytics/ActionService.ts
index 7d719ef5a..5275e105c 100644
--- a/server/src/internal/analytics/ActionService.ts
+++ b/server/src/internal/analytics/ActionService.ts
@@ -1,5 +1,5 @@
-import { DrizzleCli } from "@/db/initDrizzle.js";
 import { type ActionInsert, actions } from "@autumn/shared";
+import type { DrizzleCli } from "@/db/initDrizzle.js";
 
 export class ActionService {
 	static async insert(db: DrizzleCli, data: ActionInsert | ActionInsert[]) {
diff --git a/server/src/internal/analytics/AnalyticsService.ts b/server/src/internal/analytics/AnalyticsService.ts
index b3ac8f106..6bd20c0e7 100644
--- a/server/src/internal/analytics/AnalyticsService.ts
+++ b/server/src/internal/analytics/AnalyticsService.ts
@@ -73,7 +73,7 @@ export class AnalyticsService {
 	}
 
 	static async getTopUser({ req }: { req: ExtendedRequest }) {
-		const { clickhouseClient, org, env, db } = req;
+		const { clickhouseClient, org, env } = req;
 
 		const query = `
 SELECT 
@@ -136,7 +136,7 @@ WHERE
 		req: ExtendedRequest;
 		eventName?: string;
 	}) {
-		const { clickhouseClient, org, env, db } = req;
+		const { clickhouseClient, org, env } = req;
 
 		const query = `
 SELECT SUM(
@@ -165,7 +165,7 @@ WHERE event_name = {eventName:String}
 	}
 
 	static async getTotalCustomers({ req }: { req: ExtendedRequest }) {
-		const { clickhouseClient, org, env, db } = req;
+		const { clickhouseClient, org, env } = req;
 		const query = `SELECT COUNT(DISTINCT id) AS total_customers 
 FROM customers
 WHERE org_id = {org_id:String} 
@@ -213,8 +213,6 @@ WHERE org_id = {org_id:String}
 		const getBCResults =
 			isBillingCycle && !aggregateAll && customer
 				? ((await getBillingCycleStartDate(
-						env,
-						org?.id,
 						customer,
 						db,
 						intervalType as "1bc" | "3bc",
@@ -335,8 +333,6 @@ order by dr.period;
 		const getBCResults =
 			isBillingCycle && !aggregateAll && customer
 				? ((await getBillingCycleStartDate(
-						env,
-						org?.id,
 						customer,
 						db,
 						intervalType as "1bc" | "3bc",
@@ -380,15 +376,6 @@ order by dr.period;
     limit 10000
     `;
 
-		const filledQuery = query
-			.replace("{organizationId:String}", org?.id ?? "")
-			.replace("{customerId:String}", params.customer_id ?? "")
-			.replace("{startDate:String}", finalStartDate)
-			.replace("{endDate:String}", finalEndDate)
-			.replace("{env:String}", env);
-
-		// console.log("filledQuery", filledQuery);
-
 		const result = await clickhouseClient.query({
 			query: query,
 			query_params: {
diff --git a/server/src/internal/analytics/RevenueService.ts b/server/src/internal/analytics/RevenueService.ts
index 7e8b60070..c842f5ec4 100644
--- a/server/src/internal/analytics/RevenueService.ts
+++ b/server/src/internal/analytics/RevenueService.ts
@@ -1,4 +1,4 @@
-import { ExtendedRequest } from "@/utils/models/Request.js";
+import type { ExtendedRequest } from "@/utils/models/Request.js";
 
 export class RevenueService {
 	static clickhouseAvailable =
diff --git a/server/src/internal/analytics/analyticsRouter.ts b/server/src/internal/analytics/analyticsRouter.ts
index b80f4a6fe..456dd39cf 100644
--- a/server/src/internal/analytics/analyticsRouter.ts
+++ b/server/src/internal/analytics/analyticsRouter.ts
@@ -11,7 +11,6 @@ import { routeHandler } from "@/utils/routerUtils.js";
 const analyticsRouter = Router();
 
 const RangeEnum = z.enum(["24h", "7d", "30d", "90d", "last_cycle"]);
-type Range = z.infer<typeof RangeEnum>;
 
 analyticsRouter.post("", (req, res) =>
 	routeHandler({
diff --git a/server/src/internal/analytics/analyticsUtils.ts b/server/src/internal/analytics/analyticsUtils.ts
index dd8694675..bfd61d6c1 100644
--- a/server/src/internal/analytics/analyticsUtils.ts
+++ b/server/src/internal/analytics/analyticsUtils.ts
@@ -1,23 +1,17 @@
-import { DrizzleCli } from "@/db/initDrizzle.js";
 import {
-	ErrCode,
-	FullCustomer,
-	FullCusProduct,
-	CusProductStatus,
-	Subscription,
-	AppEnv,
-	FullProduct,
-	CustomerEntitlement,
-	FullCustomerEntitlement,
+	cusProductToProduct,
 	EntInterval,
+	type FullCusProduct,
+	type FullCustomer,
+	type FullCustomerEntitlement,
+	type FullProduct,
+	type Subscription,
 } from "@autumn/shared";
-import { cusProductToProduct } from "@autumn/shared";
+import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { ACTIVE_STATUSES } from "@/internal/customers/cusProducts/CusProductService.js";
 import { isFreeProduct } from "../products/productUtils.js";
 
 export async function getBillingCycleStartDate(
-	env: AppEnv,
-	orgId: string,
 	customer?: FullCustomer,
 	db?: DrizzleCli,
 	intervalType?: "1bc" | "3bc",
@@ -199,22 +193,26 @@ export function calculateStartDateFromInterval(
 			return formatDateToString(
 				new Date(nextResetAt! - 7 * 24 * 60 * 60 * 1000),
 			);
-		case EntInterval.Month:
+		case EntInterval.Month: {
 			const monthResetDate = new Date(nextResetAt!);
 			monthResetDate.setMonth(monthResetDate.getMonth() - 1);
 			return formatDateToString(monthResetDate);
-		case EntInterval.Quarter:
+		}
+		case EntInterval.Quarter: {
 			const quarterResetDate = new Date(nextResetAt!);
 			quarterResetDate.setMonth(quarterResetDate.getMonth() - 3);
 			return formatDateToString(quarterResetDate);
-		case EntInterval.SemiAnnual:
+		}
+		case EntInterval.SemiAnnual: {
 			const semiAnnualResetDate = new Date(nextResetAt!);
 			semiAnnualResetDate.setMonth(semiAnnualResetDate.getMonth() - 6);
 			return formatDateToString(semiAnnualResetDate);
-		case EntInterval.Year:
+		}
+		case EntInterval.Year: {
 			const yearResetDate = new Date(nextResetAt!);
 			yearResetDate.setFullYear(yearResetDate.getFullYear() - 1);
 			return formatDateToString(yearResetDate);
+		}
 		default:
 			return null;
 	}
diff --git a/server/src/internal/analytics/handlers/handleProductsUpdated.ts b/server/src/internal/analytics/handlers/handleProductsUpdated.ts
index 8fc24274a..13af3c0e6 100644
--- a/server/src/internal/analytics/handlers/handleProductsUpdated.ts
+++ b/server/src/internal/analytics/handlers/handleProductsUpdated.ts
@@ -178,8 +178,6 @@ export const handleProductsUpdated = async ({
 	// 	});
 	// }
 
-	console.log("Sending svix event for products updated");
-
 	// 2. Send Svix event
 	await sendSvixEvent({
 		org,
diff --git a/server/src/internal/analytics/internalAnalyticsRouter.ts b/server/src/internal/analytics/internalAnalyticsRouter.ts
index 9cd4b7fa5..c6de26618 100644
--- a/server/src/internal/analytics/internalAnalyticsRouter.ts
+++ b/server/src/internal/analytics/internalAnalyticsRouter.ts
@@ -74,7 +74,7 @@ analyticsRouter.get("/event_names", async (req: any, res: any) =>
 );
 
 const getTopEvents = async ({ req }: { req: ExtendedRequest }) => {
-	const { org, env, features } = req;
+	const { features } = req;
 
 	const topEventNamesRes = await AnalyticsService.getTopEventNames({
 		req,
diff --git a/server/src/internal/api/check/handlers/getFeatureCheckPreview.ts b/server/src/internal/api/check/handlers/getFeatureCheckPreview.ts
deleted file mode 100644
index 54e7082ec..000000000
--- a/server/src/internal/api/check/handlers/getFeatureCheckPreview.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface FeatureCheckPreviewParams {
-	customerId: string;
-	featureId: string;
-	quantity: number;
-}
-
-export const getFeatureCheckPreview = async ({
-	customerId,
-	featureId,
-	quantity,
-}: FeatureCheckPreviewParams) => {};
diff --git a/server/src/internal/balances/track/syncUtils/syncItem.ts b/server/src/internal/balances/track/syncUtils/syncItem.ts
index 8b162b421..06da73e94 100644
--- a/server/src/internal/balances/track/syncUtils/syncItem.ts
+++ b/server/src/internal/balances/track/syncUtils/syncItem.ts
@@ -98,8 +98,6 @@ export const syncItem = async ({
 		redisEntity = apiCustomer;
 	}
 
-	console.log("Redis entity: ", redisEntity);
-
 	// Get fresh customer from DB (no locking - let deduction handle it)
 	const fullCus = await CusService.getFull({
 		db,
diff --git a/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCustomer.ts b/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCustomer.ts
index f8f45cce6..81eb80e48 100644
--- a/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCustomer.ts
+++ b/server/src/internal/customers/cusUtils/apiCusCacheUtils/setCachedApiCustomer.ts
@@ -2,6 +2,7 @@ import {
 	type ApiEntityV1,
 	addToExpand,
 	CusExpand,
+	type EntityLegacyData,
 	type FullCustomer,
 	filterEntityLevelCusProducts,
 	filterOutEntitiesFromCusProducts,
@@ -58,14 +59,17 @@ export const setCachedApiCustomer = async ({
 	});
 
 	// Build entities first
-	const entityBatch: { entityId: string; entityData: ApiEntityV1 }[] = [];
+	const entityBatch: {
+		entityId: string;
+		entityData: ApiEntityV1 & { legacyData: EntityLegacyData };
+	}[] = [];
 	const entityFullCus = {
 		...fullCus,
 		customer_products: entityLevelCusProducts,
 	};
 
 	for (const entity of fullCus.entities) {
-		const { apiEntity } = await getApiEntityBase({
+		const { apiEntity, legacyData: entityLegacyData } = await getApiEntityBase({
 			ctx: ctxWithExpand,
 			fullCus: entityFullCus,
 			entity,
@@ -74,17 +78,27 @@ export const setCachedApiCustomer = async ({
 
 		entityBatch.push({
 			entityId: entity.id,
-			entityData: apiEntity,
+			entityData: {
+				...apiEntity,
+				legacyData: entityLegacyData,
+			},
 		});
 	}
 
 	// Then write to Redis
 	const masterApiCustomerData = {
 		...masterApiCustomer,
-		entities: fullCus.entities,
+		entities: fullCus.entities.filter((e) => e.id !== null),
 		legacyData,
 	};
 
+	if (masterApiCustomerData.id === null) return;
+
+	// console.log(
+	// 	`Setting cached api customer ${customerId}, masterApiCustomerData: `,
+	// 	masterApiCustomerData,
+	// );
+
 	await tryRedisWrite(async () => {
 		await redis.eval(
 			SET_CUSTOMER_SCRIPT,
@@ -95,11 +109,15 @@ export const setCachedApiCustomer = async ({
 			customerId,
 		);
 
+		const filteredEntityBatch = entityBatch.filter(
+			(e) => e.entityData.id !== null,
+		);
+
 		if (entityBatch.length > 0) {
 			await redis.eval(
 				SET_ENTITIES_BATCH_SCRIPT,
 				0,
-				JSON.stringify(entityBatch),
+				JSON.stringify(filteredEntityBatch),
 				org.id,
 				env,
 			);
diff --git a/server/src/internal/customers/cusUtils/cusResponseUtils/getCusRewards.ts b/server/src/internal/customers/cusUtils/cusResponseUtils/getCusRewards.ts
index 2a38fd614..b64834efa 100644
--- a/server/src/internal/customers/cusUtils/cusResponseUtils/getCusRewards.ts
+++ b/server/src/internal/customers/cusUtils/cusResponseUtils/getCusRewards.ts
@@ -10,6 +10,7 @@ import {
 import type Stripe from "stripe";
 import { createStripeCli } from "@/external/connect/createStripeCli.js";
 import { getStripeSubs } from "@/external/stripe/stripeSubUtils.js";
+import { getOriginalCouponId } from "../../../rewards/rewardUtils";
 
 export const getCusRewards = async ({
 	org,
@@ -35,16 +36,17 @@ export const getCusRewards = async ({
 	const stripeCli = createStripeCli({
 		org,
 		env,
+		legacyVersion: true,
 	});
 
 	const [stripeCus, stripeSubs] = await Promise.all([
-		stripeCli.customers.retrieve(
-			fullCus.processor?.id,
-		) as Promise<Stripe.Customer>,
+		stripeCli.customers.retrieve(fullCus.processor?.id, {
+			expand: ["discount.coupon"],
+		}) as Promise<Stripe.Customer>,
 		getStripeSubs({
 			stripeCli,
 			subIds,
-			expand: ["discounts", "discounts.source.coupon"],
+			expand: ["discounts", "discounts.coupon"],
 		}),
 	]);
 
@@ -59,14 +61,12 @@ export const getCusRewards = async ({
 	const rewards = {
 		discounts: stripeDiscounts
 			.map((d) => {
-				if (typeof d.source.coupon === "string") {
+				if (!("coupon" in d) || typeof d.coupon === "string") {
 					return null;
 				}
 
-				const coupon = d.source.coupon;
-				if (!coupon) {
-					return null;
-				}
+				const coupon = d.coupon as Stripe.Coupon;
+				const couponId = getOriginalCouponId(coupon.id);
 
 				let duration_type: CouponDurationType;
 				let duration_value = 0;
@@ -81,7 +81,7 @@ export const getCusRewards = async ({
 					duration_type = CouponDurationType.OneOff;
 				}
 				return {
-					id: coupon.id,
+					id: couponId,
 					name: coupon.name ?? "",
 					type: coupon.amount_off
 						? RewardType.FixedDiscount
diff --git a/server/src/internal/dev/devRouter.ts b/server/src/internal/dev/devRouter.ts
index 2a019f939..b84a3b663 100644
--- a/server/src/internal/dev/devRouter.ts
+++ b/server/src/internal/dev/devRouter.ts
@@ -158,7 +158,7 @@ export const handleCreateOtp = async (req: any, res: any) =>
 		res,
 		action: "Create OTP",
 		handler: async () => {
-			const { orgId, env, db } = req;
+			const { orgId } = req;
 
 			// Check if there's already an OTP to use
 			const maybeCacheKey = `orgOTPExists:${orgId}`;
@@ -208,7 +208,10 @@ export const handleGetOtp = async (req: any, res: any) =>
 			const { db, env } = req;
 			const { otp } = req.params;
 			const cacheKey = `otp:${otp}`;
-			const cacheData = await CacheManager.getJson(cacheKey);
+			const cacheData = await CacheManager.getJson<{
+				orgId: string;
+				stripeFlowAuthKey: string;
+			}>(cacheKey);
 			if (!cacheData) {
 				res.status(404).json({ error: "OTP not found" });
 				return;
@@ -291,7 +294,7 @@ devRouter.post("/cli/stripe", async (req: any, res: any) => {
 				return;
 			}
 
-			const cacheData = await CacheManager.getJson(key);
+			const cacheData = await CacheManager.getJson<{ orgId: string }>(key);
 			if (!cacheData) {
 				res.status(404).json({ message: "Key not found" });
 				return;
diff --git a/server/src/internal/entities/entityUtils/apiEntityCacheUtils/getCachedApiEntity.ts b/server/src/internal/entities/entityUtils/apiEntityCacheUtils/getCachedApiEntity.ts
index 75a35369d..434e67afd 100644
--- a/server/src/internal/entities/entityUtils/apiEntityCacheUtils/getCachedApiEntity.ts
+++ b/server/src/internal/entities/entityUtils/apiEntityCacheUtils/getCachedApiEntity.ts
@@ -123,7 +123,7 @@ export const getCachedApiEntity = async ({
 			ctx,
 			entity,
 			fullCus: fullCus,
-			withAutumnId: !skipCache,
+			withAutumnId: true,
 		});
 
 		const { apiEntity: pureApiEntity } = await getApiEntityBase({
diff --git a/server/src/internal/entities/handlers/handleCreateEntity/handleCreateEntity2.ts b/server/src/internal/entities/handlers/handleCreateEntity/handleCreateEntity2.ts
index e4e73731c..b113625a9 100644
--- a/server/src/internal/entities/handlers/handleCreateEntity/handleCreateEntity2.ts
+++ b/server/src/internal/entities/handlers/handleCreateEntity/handleCreateEntity2.ts
@@ -96,6 +96,7 @@ export const createEntities = async ({
 
 		const clonedFullCus = structuredClone(fullCus);
 		clonedFullCus.entity = entity;
+
 		const apiEntity = await getApiEntity({
 			ctx,
 			customerId,
diff --git a/server/src/internal/products/handlers/handleCreatePlan.ts b/server/src/internal/products/handlers/handleCreatePlan.ts
index e5f2e0ab4..c70216b59 100644
--- a/server/src/internal/products/handlers/handleCreatePlan.ts
+++ b/server/src/internal/products/handlers/handleCreatePlan.ts
@@ -96,7 +96,7 @@ export const handleCreatePlan = createRoute({
 	// body: CreateProductV2ParamsSchema,
 	versionedBody: {
 		latest: CreatePlanParamsSchema,
-		[ApiVersion.V1_2]: CreateProductV2ParamsSchema,
+		[ApiVersion.V1_Beta]: CreateProductV2ParamsSchema,
 	},
 	resource: AffectedResource.Product,
 	handler: async (c) => {
diff --git a/server/src/internal/products/handlers/handleUpdateProduct/handleUpdatePlan.ts b/server/src/internal/products/handlers/handleUpdateProduct/handleUpdatePlan.ts
index fb0d41945..faaf2c8af 100644
--- a/server/src/internal/products/handlers/handleUpdateProduct/handleUpdatePlan.ts
+++ b/server/src/internal/products/handlers/handleUpdateProduct/handleUpdatePlan.ts
@@ -39,11 +39,11 @@ import { handleUpdateProductDetails } from "./updateProductDetails.js";
 export const handleUpdatePlan = createRoute({
 	versionedBody: {
 		latest: UpdatePlanParamsSchema,
-		[ApiVersion.V1_2]: UpdateProductV2ParamsSchema,
+		[ApiVersion.V1_Beta]: UpdateProductV2ParamsSchema,
 	},
 	versionedQuery: {
 		latest: UpdatePlanQuerySchema,
-		[ApiVersion.V1_2]: UpdateProductQuerySchema,
+		[ApiVersion.V1_Beta]: UpdateProductQuerySchema,
 	},
 	resource: AffectedResource.Product,
 	handler: async (c) => {
@@ -57,6 +57,7 @@ export const handleUpdatePlan = createRoute({
 
 		// Convert to ProductV2 format only if client sent V2 Plan format
 		// V1.2 clients already send ProductV2, no conversion needed
+
 		const v1_2Body = ctx.apiVersion.gte(new ApiVersionClass(ApiVersion.V2_0))
 			? planToProductV2({ plan: body as ApiPlan, features: ctx.features })
 			: (body as UpdateProductV2Params);
diff --git a/server/src/internal/products/productRouter.ts b/server/src/internal/products/productRouter.ts
index b2865e80e..8ccff1cb9 100644
--- a/server/src/internal/products/productRouter.ts
+++ b/server/src/internal/products/productRouter.ts
@@ -6,6 +6,7 @@ import { handleDeleteProduct as handleDeleteProductHono } from "./handlers/handl
 import { handleGetPlan } from "./handlers/handleGetPlan.js";
 import { handleGetPlanDeleteInfo } from "./handlers/handleGetPlanDeleteInfo.js";
 import { handleListPlans } from "./handlers/handleListPlans.js";
+import { handleMigrateProductV2 } from "./handlers/handleMigrateProductV2.js";
 import { handlePlanHasCustomers } from "./handlers/handlePlanHasCustomers.js";
 import { handleUpdatePlan } from "./handlers/handleUpdateProduct/handleUpdatePlan.js";
 
@@ -16,11 +17,15 @@ honoProductBetaRouter.get("", ...handleListPlans);
 export const honoProductRouter = new Hono<HonoEnv>();
 export const migrationRouter = new Hono<HonoEnv>();
 
+// Migrations
+migrationRouter.post("/migrations", ...handleMigrateProductV2);
+
 // CRUD
 honoProductRouter.get("", ...handleListPlans);
 honoProductRouter.post("", ...handleCreatePlan);
 honoProductRouter.get("/:product_id", ...handleGetPlan);
 honoProductRouter.post("/:product_id", ...handleUpdatePlan); // will be deprecated
+honoProductRouter.patch("/:product_id", ...handleUpdatePlan); // will be deprecated
 honoProductRouter.delete("/:product_id", ...handleDeleteProductHono);
 
 // Others
diff --git a/server/src/internal/saved-views/ViewsService.ts b/server/src/internal/saved-views/ViewsService.ts
index dbf1d20dd..163742880 100644
--- a/server/src/internal/saved-views/ViewsService.ts
+++ b/server/src/internal/saved-views/ViewsService.ts
@@ -48,7 +48,8 @@ export class ViewsService {
 
 				// Also save to a list for easy retrieval
 				const listKey = `saved_views_list:${orgId}:${env}`;
-				const existingViews = (await CacheManager.getJson(listKey)) || [];
+				const existingViews =
+					(await CacheManager.getJson<string[]>(listKey)) || [];
 				existingViews.push(viewId);
 				await CacheManager.setJson(listKey, existingViews, "forever"); // No TTL
 
@@ -74,12 +75,18 @@ export class ViewsService {
 				const env = req.env;
 
 				const listKey = `saved_views_list:${orgId}:${env}`;
-				const viewIds = (await CacheManager.getJson(listKey)) || [];
+				const viewIds = (await CacheManager.getJson<string[]>(listKey)) || [];
 
 				const views = [];
 				for (const viewId of viewIds) {
 					const key = `saved_views:${orgId}:${env}:${viewId}`;
-					const view = await CacheManager.getJson(key);
+					const view = await CacheManager.getJson<{
+						id: string;
+						name: string;
+						filters: any;
+						created_at: string;
+					}>(key);
+
 					if (view) {
 						views.push({
 							id: view.id,
@@ -120,7 +127,8 @@ export class ViewsService {
 
 				// Remove from list
 				const listKey = `saved_views_list:${orgId}:${env}`;
-				const existingViews = (await CacheManager.getJson(listKey)) || [];
+				const existingViews =
+					(await CacheManager.getJson<string[]>(listKey)) || [];
 				const updatedViews = existingViews.filter(
 					(id: string) => id !== viewId,
 				);
diff --git a/server/src/utils/envUtils.ts b/server/src/utils/envUtils.ts
new file mode 100644
index 000000000..2798e226f
--- /dev/null
+++ b/server/src/utils/envUtils.ts
@@ -0,0 +1,29 @@
+import { join } from "node:path";
+import { config } from "dotenv";
+
+export const loadLocalEnv = () => {
+	const processDir = process.cwd();
+	const serverDir = processDir.includes("server")
+		? processDir
+		: join(processDir, "server");
+
+	// Determine which env file to load based on ENV_FILE environment variable
+	// Defaults to .env if not specified
+	const envFileName = process.env.ENV_FILE || ".env";
+	const envPath = join(serverDir, envFileName);
+
+	// Load local .env file FIRST - these will take precedence over Infisical
+	const result = config({ path: envPath });
+	if (result.parsed) {
+		console.log(
+			`📄 Loading ${Object.keys(result.parsed).length} variables from ${envFileName}`,
+		);
+		for (const [key, value] of Object.entries(result.parsed)) {
+			process.env[key] = value;
+		}
+	} else {
+		console.log(
+			`ℹ️  No ${envFileName} file found (using only Infisical secrets)`,
+		);
+	}
+};
diff --git a/server/tests/00_setup.ts b/server/tests/00_setup.ts
index 7d30961e5..9134dce61 100644
--- a/server/tests/00_setup.ts
+++ b/server/tests/00_setup.ts
@@ -5,17 +5,6 @@ dotenv.config();
 import { AppEnv } from "@autumn/shared";
 import { clearOrg, setupOrg } from "@tests/utils/setup.js";
 import { initDrizzle } from "@/db/initDrizzle.js";
-import {
-	advanceProducts,
-	attachProducts,
-	creditSystems,
-	entityProducts,
-	features,
-	oneTimeProducts,
-	products,
-	referralPrograms,
-	rewards,
-} from "./global.js";
 
 const ORG_SLUG = process.env.TESTS_ORG!;
 const DEFAULT_ENV = AppEnv.Sandbox;
diff --git a/server/tests/advanced/coupons/coupon1.test.ts b/server/tests/advanced/coupons/coupon1.test.ts
index 23a293bb0..e822de7bb 100644
--- a/server/tests/advanced/coupons/coupon1.test.ts
+++ b/server/tests/advanced/coupons/coupon1.test.ts
@@ -117,9 +117,13 @@ const simulateOneCycle = async ({
 
 	expect(cusDiscount).toBeDefined();
 
-	expect(getOriginalCouponId(cusDiscount.coupon?.id)).toBe(rewardId);
+	expect(getOriginalCouponId(cusDiscount?.source.coupon?.id ?? "")).toBe(
+		rewardId,
+	);
 
-	expect(cusDiscount.coupon?.amount_off).toBe(Math.round(couponAmount * 100));
+	// expect(cusDiscount?.source.coupon?.amount_off).toBe(
+	// 	Math.round(couponAmount * 100),
+	// );
 
 	return {
 		couponAmount,
@@ -192,18 +196,15 @@ describe(
 
 			expect(customer.invoices![0].total).toBe(0);
 
-			console.log("Customer", customer);
-
 			const cusDiscount = await getDiscount({
 				stripeCli,
 				stripeId: customer.stripe_id!,
 			});
 
-			// console.log("CusDiscount", cusDiscount);
-
 			expect(cusDiscount).toBeDefined();
-			expect(getOriginalCouponId(cusDiscount.coupon?.id)).toBe(rewardId);
-			expect(cusDiscount.coupon?.amount_off).toBe(couponAmount * 100);
+			expect(getOriginalCouponId(cusDiscount?.source.coupon?.id ?? "")).toBe(
+				rewardId,
+			);
 		});
 
 		test("should run one cycle and have correct invoice + coupon amount", async () => {
diff --git a/server/tests/advanced/coupons/coupon2.test.ts b/server/tests/advanced/coupons/coupon2.test.ts
index 3fd238800..f6a26379a 100644
--- a/server/tests/advanced/coupons/coupon2.test.ts
+++ b/server/tests/advanced/coupons/coupon2.test.ts
@@ -7,10 +7,6 @@ import {
 	type Organization,
 	RewardType,
 } from "@autumn/shared";
-import chalk from "chalk";
-import { addHours, addMonths } from "date-fns";
-import { Decimal } from "decimal.js";
-import type Stripe from "stripe";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { hoursToFinalizeInvoice } from "@tests/utils/constants.js";
 import { getExpectedInvoiceTotal } from "@tests/utils/expectUtils/expectInvoiceUtils.js";
@@ -23,6 +19,10 @@ import {
 	addPrefixToProducts,
 	getBasePrice,
 } from "@tests/utils/testProductUtils/testProductUtils.js";
+import chalk from "chalk";
+import { addHours, addMonths } from "date-fns";
+import { Decimal } from "decimal.js";
+import type Stripe from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { getOriginalCouponId } from "@/internal/rewards/rewardUtils.js";
@@ -133,8 +133,10 @@ describe(
 				stripeId: customer.stripe_id!,
 			});
 
-			expect(getOriginalCouponId(cusDiscount.coupon?.id)).toBe(reward.id);
-			expect(cusDiscount.coupon?.amount_off).toBe(couponAmount * 100);
+			expect(getOriginalCouponId(cusDiscount?.source.coupon?.id ?? "")).toBe(
+				reward.id,
+			);
+			// expect(cusDiscount?.source.coupon?.amount_off).toBe(couponAmount * 100);
 		});
 
 		// CYCLE 1
@@ -182,11 +184,13 @@ describe(
 				stripeId: customer.stripe_id!,
 			});
 
-			expect(getOriginalCouponId(cusDiscount.coupon?.id)).toBe(reward.id);
-
-			expect(cusDiscount.coupon?.amount_off).toBe(
-				Math.round(couponAmount * 100),
+			expect(getOriginalCouponId(cusDiscount?.source.coupon?.id ?? "")).toBe(
+				reward.id,
 			);
+
+			// expect(cusDiscount?.source.coupon?.amount_off).toBe(
+			// 	Math.round(couponAmount * 100),
+			// );
 		});
 	},
 );
diff --git a/server/tests/advanced/coupons/coupon3.test.ts b/server/tests/advanced/coupons/coupon3.test.ts
index be2b09478..42c7745c8 100644
--- a/server/tests/advanced/coupons/coupon3.test.ts
+++ b/server/tests/advanced/coupons/coupon3.test.ts
@@ -7,8 +7,6 @@ import {
 	type Organization,
 	RewardType,
 } from "@autumn/shared";
-import chalk from "chalk";
-import type Stripe from "stripe";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { expectAttachCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import { createProducts, createReward } from "@tests/utils/productUtils.js";
@@ -17,6 +15,7 @@ import {
 	addPrefixToProducts,
 	getBasePrice,
 } from "@tests/utils/testProductUtils/testProductUtils.js";
+import chalk from "chalk";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import {
@@ -63,8 +62,6 @@ const reward: CreateReward = {
 const testCase = "coupon3";
 describe(chalk.yellow(`${testCase} - Testing attach coupon`), () => {
 	const customerId = testCase;
-	let stripeCli: Stripe;
-	let testClockId: string;
 
 	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
 	let org: Organization;
@@ -77,16 +74,13 @@ describe(chalk.yellow(`${testCase} - Testing attach coupon`), () => {
 		org = ctx.org;
 		env = ctx.env;
 		db = ctx.db;
-		stripeCli = ctx.stripeCli;
 
-		const { testClockId: testClockId1 } = await initCustomerV3({
+		await initCustomerV3({
 			ctx,
 			customerId,
 			attachPm: "success",
 		});
 
-		testClockId = testClockId1;
-
 		addPrefixToProducts({
 			products: [pro, oneOff],
 			prefix: testCase,
@@ -112,7 +106,7 @@ describe(chalk.yellow(`${testCase} - Testing attach coupon`), () => {
 
 	// CYCLE 0
 	test("should attach pro with reward ID", async () => {
-		const res = await autumn.attach({
+		await autumn.attach({
 			customer_id: customerId,
 			product_id: pro.id,
 			reward: rewardId,
diff --git a/server/tests/advanced/customInterval/customInterval1.backup.ts b/server/tests/advanced/customInterval/customInterval1.backup.ts
deleted file mode 100644
index a053aae4e..000000000
--- a/server/tests/advanced/customInterval/customInterval1.backup.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addHours, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { hoursToFinalizeInvoice } from "@tests/utils/constants.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import { getBasePrice } from "@tests/utils/testProductUtils/testProductUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval1";
-
-export const pro = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "pro",
-});
-
-export const premium = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-		// constructArrearItem({ featureId: TestFeature.Words }),
-		// constructArrearProratedItem({
-		//   featureId: TestFeature.Users,
-		//   pricePerUnit: 30,
-		// }),
-	],
-	intervalCount: 2,
-	type: "premium",
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval and interval count`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, premium],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, premium],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	const usage = 100012;
-	it("should upgrade to premium product and have correct invoice next cycle", async () => {
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addMonths(new Date(), 1).getTime(),
-			waitForSeconds: 15,
-		});
-
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: premium,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		expect(customer.invoices.length).to.equal(2);
-
-		const nextUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addHours(
-				addMonths(new Date(curUnix), 1),
-				hoursToFinalizeInvoice,
-			).getTime(),
-			waitForSeconds: 30,
-		});
-
-		const customer2 = await autumn.customers.get(customerId);
-		const invoices = customer2.invoices;
-		expect(invoices.length).to.equal(3);
-		expect(invoices[0].product_ids).to.include(premium.id);
-		expect(invoices[0].total).to.equal(getBasePrice({ product: premium }));
-
-		const wordsFeature = customer2.features[TestFeature.Words];
-		// @ts-expect-error
-		expect(wordsFeature.interval_count).to.equal(2);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval1.ts b/server/tests/advanced/customInterval/customInterval1.ts
deleted file mode 100644
index a053aae4e..000000000
--- a/server/tests/advanced/customInterval/customInterval1.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addHours, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { hoursToFinalizeInvoice } from "@tests/utils/constants.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import { getBasePrice } from "@tests/utils/testProductUtils/testProductUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval1";
-
-export const pro = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "pro",
-});
-
-export const premium = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-		// constructArrearItem({ featureId: TestFeature.Words }),
-		// constructArrearProratedItem({
-		//   featureId: TestFeature.Users,
-		//   pricePerUnit: 30,
-		// }),
-	],
-	intervalCount: 2,
-	type: "premium",
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval and interval count`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, premium],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, premium],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	const usage = 100012;
-	it("should upgrade to premium product and have correct invoice next cycle", async () => {
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addMonths(new Date(), 1).getTime(),
-			waitForSeconds: 15,
-		});
-
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: premium,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		expect(customer.invoices.length).to.equal(2);
-
-		const nextUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addHours(
-				addMonths(new Date(curUnix), 1),
-				hoursToFinalizeInvoice,
-			).getTime(),
-			waitForSeconds: 30,
-		});
-
-		const customer2 = await autumn.customers.get(customerId);
-		const invoices = customer2.invoices;
-		expect(invoices.length).to.equal(3);
-		expect(invoices[0].product_ids).to.include(premium.id);
-		expect(invoices[0].total).to.equal(getBasePrice({ product: premium }));
-
-		const wordsFeature = customer2.features[TestFeature.Words];
-		// @ts-expect-error
-		expect(wordsFeature.interval_count).to.equal(2);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval2.backup.ts b/server/tests/advanced/customInterval/customInterval2.backup.ts
deleted file mode 100644
index 256e0e0d9..000000000
--- a/server/tests/advanced/customInterval/customInterval2.backup.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addHours, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { hoursToFinalizeInvoice } from "@tests/utils/constants.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { getExpectedInvoiceTotal } from "@tests/utils/expectUtils/expectInvoiceUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructRawProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval2";
-
-export const pro = constructRawProduct({
-	id: "pro",
-	items: [
-		constructArrearItem({
-			includedUsage: 0,
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-	],
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on arrear prorated price`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	const usage = 100012;
-	it("should upgrade to premium product and have correct invoice next cycle", async () => {
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: usage,
-		});
-
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addHours(
-				addMonths(new Date(), 2),
-				hoursToFinalizeInvoice,
-			).getTime(),
-			waitForSeconds: 30,
-		});
-
-		const invoiceAmount = await getExpectedInvoiceTotal({
-			customerId,
-			productId: pro.id,
-			usage: [{ featureId: TestFeature.Words, value: usage }],
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		expect(customer.invoices.length).to.equal(2);
-		expect(invoiceAmount).to.equal(customer.invoices[0].total);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval2.ts b/server/tests/advanced/customInterval/customInterval2.ts
deleted file mode 100644
index 256e0e0d9..000000000
--- a/server/tests/advanced/customInterval/customInterval2.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addHours, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { hoursToFinalizeInvoice } from "@tests/utils/constants.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { getExpectedInvoiceTotal } from "@tests/utils/expectUtils/expectInvoiceUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructRawProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval2";
-
-export const pro = constructRawProduct({
-	id: "pro",
-	items: [
-		constructArrearItem({
-			includedUsage: 0,
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-	],
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on arrear prorated price`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	const usage = 100012;
-	it("should upgrade to premium product and have correct invoice next cycle", async () => {
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: usage,
-		});
-
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addHours(
-				addMonths(new Date(), 2),
-				hoursToFinalizeInvoice,
-			).getTime(),
-			waitForSeconds: 30,
-		});
-
-		const invoiceAmount = await getExpectedInvoiceTotal({
-			customerId,
-			productId: pro.id,
-			usage: [{ featureId: TestFeature.Words, value: usage }],
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		expect(customer.invoices.length).to.equal(2);
-		expect(invoiceAmount).to.equal(customer.invoices[0].total);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval3.backup.ts b/server/tests/advanced/customInterval/customInterval3.backup.ts
deleted file mode 100644
index bdb9ad2b4..000000000
--- a/server/tests/advanced/customInterval/customInterval3.backup.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addDays, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { calculateProrationAmount } from "@/internal/invoices/prorationUtils.js";
-import {
-	constructFeatureItem,
-	constructPrepaidItem,
-} from "@/utils/scriptUtils/constructItem.js";
-import {
-	constructProduct,
-	constructRawProduct,
-} from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval3";
-
-export const pro = constructProduct({
-	type: "pro",
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-	],
-	intervalCount: 2,
-});
-
-const prepaidWordsItem = constructPrepaidItem({
-	featureId: TestFeature.Words,
-	price: 10,
-	billingUnits: 1,
-	includedUsage: 0,
-	intervalCount: 2,
-});
-
-export const addOn = constructRawProduct({
-	id: "addOn",
-	items: [prepaidWordsItem],
-	isAddOn: true,
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on add on merged product`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, addOn],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, addOn],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	it("should upgrade to attached add on and have correct invoice next cycle", async () => {
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addDays(new Date(), 20).getTime(),
-			waitForSeconds: 15,
-		});
-
-		const wordBillingSets = 2;
-		const wordsBillingUnits = prepaidWordsItem.billing_units! * wordBillingSets;
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: addOn.id,
-			options: [
-				{
-					feature_id: TestFeature.Words,
-					quantity: wordsBillingUnits,
-				},
-			],
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const proProduct = customer.products.find((p) => p.id === pro.id);
-		const invoices = customer.invoices;
-		expectProductAttached({
-			customer,
-			product: pro,
-		});
-
-		expectProductAttached({
-			customer,
-			product: addOn,
-		});
-
-		const expectedPrice = wordsBillingUnits * prepaidWordsItem.price!;
-		const proratedPrice = calculateProrationAmount({
-			amount: expectedPrice,
-			periodStart: new Date().getTime(),
-			periodEnd: addMonths(new Date(), 2).getTime(),
-			now: curUnix!,
-		});
-
-		expect(invoices[0].product_ids).to.include(addOn.id);
-		expect(invoices[0].total).to.approximately(proratedPrice, 0.1);
-
-		const expectedAddonEnd = addMonths(new Date(), 2);
-		const approximate = 1000 * 60 * 60 * 24; // +- 1 day
-		const addOnProduct = customer.products.find((p) => p.id === addOn.id);
-
-		expect(addOnProduct?.current_period_end).to.be.approximately(
-			expectedAddonEnd.getTime(),
-			approximate,
-		);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval3.ts b/server/tests/advanced/customInterval/customInterval3.ts
deleted file mode 100644
index bdb9ad2b4..000000000
--- a/server/tests/advanced/customInterval/customInterval3.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addDays, addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { calculateProrationAmount } from "@/internal/invoices/prorationUtils.js";
-import {
-	constructFeatureItem,
-	constructPrepaidItem,
-} from "@/utils/scriptUtils/constructItem.js";
-import {
-	constructProduct,
-	constructRawProduct,
-} from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval3";
-
-export const pro = constructProduct({
-	type: "pro",
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			intervalCount: 2,
-		}),
-	],
-	intervalCount: 2,
-});
-
-const prepaidWordsItem = constructPrepaidItem({
-	featureId: TestFeature.Words,
-	price: 10,
-	billingUnits: 1,
-	includedUsage: 0,
-	intervalCount: 2,
-});
-
-export const addOn = constructRawProduct({
-	id: "addOn",
-	items: [prepaidWordsItem],
-	isAddOn: true,
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing custom interval on add on merged product`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, addOn],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, addOn],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	it("should upgrade to attached add on and have correct invoice next cycle", async () => {
-		const curUnix = await advanceTestClock({
-			stripeCli,
-			testClockId,
-			advanceTo: addDays(new Date(), 20).getTime(),
-			waitForSeconds: 15,
-		});
-
-		const wordBillingSets = 2;
-		const wordsBillingUnits = prepaidWordsItem.billing_units! * wordBillingSets;
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: addOn.id,
-			options: [
-				{
-					feature_id: TestFeature.Words,
-					quantity: wordsBillingUnits,
-				},
-			],
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const proProduct = customer.products.find((p) => p.id === pro.id);
-		const invoices = customer.invoices;
-		expectProductAttached({
-			customer,
-			product: pro,
-		});
-
-		expectProductAttached({
-			customer,
-			product: addOn,
-		});
-
-		const expectedPrice = wordsBillingUnits * prepaidWordsItem.price!;
-		const proratedPrice = calculateProrationAmount({
-			amount: expectedPrice,
-			periodStart: new Date().getTime(),
-			periodEnd: addMonths(new Date(), 2).getTime(),
-			now: curUnix!,
-		});
-
-		expect(invoices[0].product_ids).to.include(addOn.id);
-		expect(invoices[0].total).to.approximately(proratedPrice, 0.1);
-
-		const expectedAddonEnd = addMonths(new Date(), 2);
-		const approximate = 1000 * 60 * 60 * 24; // +- 1 day
-		const addOnProduct = customer.products.find((p) => p.id === addOn.id);
-
-		expect(addOnProduct?.current_period_end).to.be.approximately(
-			expectedAddonEnd.getTime(),
-			approximate,
-		);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval4.backup.ts b/server/tests/advanced/customInterval/customInterval4.backup.ts
deleted file mode 100644
index 4eb464492..000000000
--- a/server/tests/advanced/customInterval/customInterval4.backup.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import {
-	expectDowngradeCorrect,
-	expectNextCycleCorrect,
-} from "@tests/utils/expectUtils/expectScheduleUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { getBasePrice } from "@tests/utils/testProductUtils/testProductUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval4";
-
-export const pro = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "pro",
-});
-
-export const premium = constructProduct({
-	id: "premium",
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "premium",
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing downgrades for custom intervals`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, premium],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, premium],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach premium product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: premium,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	it("should have correct next cycle at on checkout", async () => {
-		const checkout = await autumn.checkout({
-			customer_id: customerId,
-			product_id: pro.id,
-		});
-
-		const expectedNextCycle = addMonths(new Date(), 2);
-		expect(checkout.next_cycle?.starts_at).to.be.approximately(
-			expectedNextCycle.getTime(),
-			1000 * 60 * 60 * 24,
-		);
-
-		expect(checkout.total).to.equal(0);
-	});
-
-	let preview: any;
-	it("should downgrade to pro", async () => {
-		const { preview: preview_ } = await expectDowngradeCorrect({
-			autumn,
-			customerId,
-			curProduct: premium,
-			newProduct: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		preview = preview_;
-	});
-
-	it("should have pro attached on next cycle", async () => {
-		await expectNextCycleCorrect({
-			preview: preview!,
-			autumn,
-			stripeCli,
-			customerId,
-			testClockId,
-			product: pro,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const invoices = customer.invoices;
-		expect(invoices.length).to.equal(2);
-		expect(invoices[0].total).to.equal(getBasePrice({ product: pro }));
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval4.ts b/server/tests/advanced/customInterval/customInterval4.ts
deleted file mode 100644
index 4eb464492..000000000
--- a/server/tests/advanced/customInterval/customInterval4.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addMonths } from "date-fns";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import {
-	expectDowngradeCorrect,
-	expectNextCycleCorrect,
-} from "@tests/utils/expectUtils/expectScheduleUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { getBasePrice } from "@tests/utils/testProductUtils/testProductUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval4";
-
-export const pro = constructProduct({
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "pro",
-});
-
-export const premium = constructProduct({
-	id: "premium",
-	items: [
-		constructFeatureItem({
-			featureId: TestFeature.Words,
-			includedUsage: 500,
-		}),
-	],
-	intervalCount: 2,
-	type: "premium",
-});
-
-describe(`${chalk.yellowBright(`${testCase}: Testing downgrades for custom intervals`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro, premium],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro, premium],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach premium product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: premium,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-	});
-
-	it("should have correct next cycle at on checkout", async () => {
-		const checkout = await autumn.checkout({
-			customer_id: customerId,
-			product_id: pro.id,
-		});
-
-		const expectedNextCycle = addMonths(new Date(), 2);
-		expect(checkout.next_cycle?.starts_at).to.be.approximately(
-			expectedNextCycle.getTime(),
-			1000 * 60 * 60 * 24,
-		);
-
-		expect(checkout.total).to.equal(0);
-	});
-
-	let preview: any;
-	it("should downgrade to pro", async () => {
-		const { preview: preview_ } = await expectDowngradeCorrect({
-			autumn,
-			customerId,
-			curProduct: premium,
-			newProduct: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		preview = preview_;
-	});
-
-	it("should have pro attached on next cycle", async () => {
-		await expectNextCycleCorrect({
-			preview: preview!,
-			autumn,
-			stripeCli,
-			customerId,
-			testClockId,
-			product: pro,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const invoices = customer.invoices;
-		expect(invoices.length).to.equal(2);
-		expect(invoices[0].total).to.equal(getBasePrice({ product: pro }));
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval5.backup.ts b/server/tests/advanced/customInterval/customInterval5.backup.ts
deleted file mode 100644
index fdee88bf5..000000000
--- a/server/tests/advanced/customInterval/customInterval5.backup.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import type { Customer } from "autumn-js";
-import { expect } from "chai";
-import chalk from "chalk";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { timeout } from "@/utils/genUtils.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval5";
-
-const includedUsage = 500;
-const monthlyWords = constructFeatureItem({
-	featureId: TestFeature.Words,
-	includedUsage,
-});
-
-const biMonthlyWords = constructFeatureItem({
-	featureId: TestFeature.Words,
-	intervalCount: 2,
-	includedUsage,
-});
-
-export const pro = constructProduct({
-	items: [monthlyWords, biMonthlyWords],
-	intervalCount: 2,
-	type: "pro",
-});
-
-const getBreakdown = ({
-	customer,
-	intervalCount,
-}: {
-	customer: Customer;
-	intervalCount: number;
-}) => {
-	const wordsFeature = customer.features[TestFeature.Words];
-	return wordsFeature.breakdown?.find(
-		(b: any) => b.interval_count === intervalCount,
-	);
-};
-
-describe(`${chalk.yellowBright(`${testCase}: Testing multi interval features with custom intervals`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const wordsFeature = customer.features[TestFeature.Words];
-		// @ts-expect-error
-		expect(wordsFeature.interval_count).to.equal(null);
-		expect(wordsFeature.breakdown?.length).to.equal(2);
-
-		expect(
-			wordsFeature.breakdown?.some(
-				(b: any) => b.interval_count === 1 && b.interval === "month",
-			),
-		).to.equal(true);
-		expect(
-			wordsFeature.breakdown?.some(
-				(b: any) => b.interval_count === 2 && b.interval === "month",
-			),
-		).to.equal(true);
-	});
-
-	const trackVal = 300;
-	it("should have correct breakdown after usage", async () => {
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: trackVal,
-		});
-
-		await timeout(3000);
-
-		const customer = await autumn.customers.get(customerId);
-
-		// Should deduct
-		const monthlyBreakdown = getBreakdown({ customer, intervalCount: 1 });
-		const biMonthlyBreakdown = getBreakdown({ customer, intervalCount: 2 });
-
-		expect(monthlyBreakdown?.balance).to.equal(includedUsage - trackVal);
-		expect(biMonthlyBreakdown?.balance).to.equal(includedUsage);
-
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: trackVal,
-		});
-
-		await timeout(3000);
-
-		const customer2 = await autumn.customers.get(customerId);
-		const monthlyBreakdown2 = getBreakdown({
-			customer: customer2,
-			intervalCount: 1,
-		});
-		const biMonthlyBreakdown2 = getBreakdown({
-			customer: customer2,
-			intervalCount: 2,
-		});
-
-		expect(monthlyBreakdown2?.balance).to.equal(0);
-		expect(biMonthlyBreakdown2?.balance).to.equal(includedUsage - 100);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval5.test.ts b/server/tests/advanced/customInterval/customInterval5.test.ts
index e7d8978ef..b0d254909 100644
--- a/server/tests/advanced/customInterval/customInterval5.test.ts
+++ b/server/tests/advanced/customInterval/customInterval5.test.ts
@@ -1,11 +1,11 @@
 import { beforeAll, describe, expect, test } from "bun:test";
 import { LegacyVersion } from "@autumn/shared";
-import type { Customer } from "autumn-js";
-import chalk from "chalk";
-import type Stripe from "stripe";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import type { Customer } from "autumn-js";
+import chalk from "chalk";
+import type Stripe from "stripe";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { timeout } from "@/utils/genUtils.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
@@ -86,7 +86,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing multi interval features wit
 		const customer = await autumn.customers.get(customerId);
 		const wordsFeature = customer.features[TestFeature.Words];
 		// @ts-expect-error
-		expect(wordsFeature.interval_count).toBe(null);
+		expect(wordsFeature.interval_count).toBe(1);
 		expect(wordsFeature.breakdown?.length).toBe(2);
 
 		expect(
diff --git a/server/tests/advanced/customInterval/customInterval5.ts b/server/tests/advanced/customInterval/customInterval5.ts
deleted file mode 100644
index fdee88bf5..000000000
--- a/server/tests/advanced/customInterval/customInterval5.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { type AppEnv, LegacyVersion, type Organization } from "@autumn/shared";
-import type { Customer } from "autumn-js";
-import { expect } from "chai";
-import chalk from "chalk";
-import type Stripe from "stripe";
-import { addPrefixToProducts } from "@tests/attach/utils.js";
-import { setupBefore } from "@tests/before.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { timeout } from "@/utils/genUtils.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-const testCase = "customInterval5";
-
-const includedUsage = 500;
-const monthlyWords = constructFeatureItem({
-	featureId: TestFeature.Words,
-	includedUsage,
-});
-
-const biMonthlyWords = constructFeatureItem({
-	featureId: TestFeature.Words,
-	intervalCount: 2,
-	includedUsage,
-});
-
-export const pro = constructProduct({
-	items: [monthlyWords, biMonthlyWords],
-	intervalCount: 2,
-	type: "pro",
-});
-
-const getBreakdown = ({
-	customer,
-	intervalCount,
-}: {
-	customer: Customer;
-	intervalCount: number;
-}) => {
-	const wordsFeature = customer.features[TestFeature.Words];
-	return wordsFeature.breakdown?.find(
-		(b: any) => b.interval_count === intervalCount,
-	);
-};
-
-describe(`${chalk.yellowBright(`${testCase}: Testing multi interval features with custom intervals`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		addPrefixToProducts({
-			products: [pro],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			autumn,
-			products: [pro],
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach pro product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: pro,
-			stripeCli,
-			db,
-			org,
-			env,
-		});
-
-		const customer = await autumn.customers.get(customerId);
-		const wordsFeature = customer.features[TestFeature.Words];
-		// @ts-expect-error
-		expect(wordsFeature.interval_count).to.equal(null);
-		expect(wordsFeature.breakdown?.length).to.equal(2);
-
-		expect(
-			wordsFeature.breakdown?.some(
-				(b: any) => b.interval_count === 1 && b.interval === "month",
-			),
-		).to.equal(true);
-		expect(
-			wordsFeature.breakdown?.some(
-				(b: any) => b.interval_count === 2 && b.interval === "month",
-			),
-		).to.equal(true);
-	});
-
-	const trackVal = 300;
-	it("should have correct breakdown after usage", async () => {
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: trackVal,
-		});
-
-		await timeout(3000);
-
-		const customer = await autumn.customers.get(customerId);
-
-		// Should deduct
-		const monthlyBreakdown = getBreakdown({ customer, intervalCount: 1 });
-		const biMonthlyBreakdown = getBreakdown({ customer, intervalCount: 2 });
-
-		expect(monthlyBreakdown?.balance).to.equal(includedUsage - trackVal);
-		expect(biMonthlyBreakdown?.balance).to.equal(includedUsage);
-
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Words,
-			value: trackVal,
-		});
-
-		await timeout(3000);
-
-		const customer2 = await autumn.customers.get(customerId);
-		const monthlyBreakdown2 = getBreakdown({
-			customer: customer2,
-			intervalCount: 1,
-		});
-		const biMonthlyBreakdown2 = getBreakdown({
-			customer: customer2,
-			intervalCount: 2,
-		});
-
-		expect(monthlyBreakdown2?.balance).to.equal(0);
-		expect(biMonthlyBreakdown2?.balance).to.equal(includedUsage - 100);
-	});
-});
diff --git a/server/tests/advanced/customInterval/customInterval6.backup.ts b/server/tests/advanced/customInterval/customInterval6.backup.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/server/tests/advanced/customInterval/customInterval6.ts b/server/tests/advanced/customInterval/customInterval6.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/server/tests/advanced/multiFeature/multiFeature1.ts b/server/tests/advanced/multiFeature/multiFeature1.ts
deleted file mode 100644
index 5602fbecc..000000000
--- a/server/tests/advanced/multiFeature/multiFeature1.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import {
-	type AppEnv,
-	BillingInterval,
-	LegacyVersion,
-	ProductItemFeatureType,
-	UsageModel,
-} from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { setupBefore } from "@tests/before.js";
-import { features } from "@tests/global.js";
-import {
-	getPrepaidCusEnt,
-	getUsageCusEnt,
-} from "@tests/utils/cusProductUtils/cusEntSearchUtils.js";
-import { getMainCusProduct } from "@tests/utils/cusProductUtils/cusProductUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { constructFeaturePriceItem } from "@/internal/products/product-items/productItemUtils.js";
-import { timeout } from "@/utils/genUtils.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-// Scenario 1: prepaid + pay per use monthly -> prepaid + pay per use monthly
-const pro = {
-	id: "multiFeature1Pro",
-	name: "Multi Feature 1 Pro",
-	items: {
-		prepaid: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 50,
-			price: 10,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.Prepaid,
-		}),
-		payPerUse: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 0,
-			price: 0.5,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.PayPerUse,
-		}),
-	},
-};
-
-const premium = {
-	id: "multiFeature1Premium",
-	name: "Multi Feature 1 Premium",
-	items: {
-		// Prepaid
-		prepaid: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 100,
-			price: 15,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.Prepaid,
-		}),
-
-		// Pay per use
-		payPerUse: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 0,
-			price: 1,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.PayPerUse,
-		}),
-	},
-};
-
-export const getPrepaidAndUsageCusEnts = async ({
-	customerId,
-	db,
-	orgId,
-	env,
-	featureId,
-}: {
-	customerId: string;
-	db: DrizzleCli;
-	orgId: string;
-	env: AppEnv;
-	featureId: string;
-}) => {
-	const mainCusProduct = await getMainCusProduct({
-		customerId,
-		db,
-		orgId,
-		env,
-	});
-
-	const prepaidCusEnt = getPrepaidCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	const usageCusEnt = getUsageCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	return { prepaidCusEnt, usageCusEnt };
-};
-
-const testCase = "multiFeature1";
-describe(`${chalk.yellowBright(
-	"multiFeature1: Testing prepaid + pay per use -> prepaid + pay per use",
-)}`, () => {
-	let autumn: AutumnInt = new AutumnInt();
-	const autumn2: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_2 });
-	const customerId = testCase;
-
-	const prepaidQuantity = 10;
-	const prepaidAllowance = pro.items.prepaid.included_usage + prepaidQuantity;
-	let totalUsage = 0;
-
-	const premiumPrepaidAllowance =
-		premium.items.prepaid.included_usage + prepaidQuantity;
-
-	const optionsList = [
-		{
-			feature_id: features.metered1.id,
-			quantity: prepaidQuantity,
-		},
-	];
-
-	before(async function () {
-		await setupBefore(this);
-
-		await initCustomer({
-			autumn: this.autumnJs,
-			customerId,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: "success",
-		});
-
-		autumn = this.autumn;
-
-		await createProducts({
-			autumn,
-			products: [pro, premium],
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-		});
-	});
-
-	it("should attach pro product to customer", async function () {
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: pro.id,
-			options: optionsList,
-		});
-
-		const { prepaidCusEnt, usageCusEnt } = await getPrepaidAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(prepaidCusEnt?.balance).to.equal(
-			prepaidQuantity + pro.items.prepaid.included_usage,
-		);
-
-		expect(usageCusEnt?.balance).to.equal(pro.items.payPerUse.included_usage);
-	});
-
-	it("should use prepaid allowance first", async function () {
-		const value = 60;
-
-		await autumn.track({
-			customer_id: customerId,
-			value,
-			feature_id: features.metered1.id,
-		});
-
-		totalUsage += value;
-
-		await timeout(3000);
-
-		const { prepaidCusEnt, usageCusEnt } = await getPrepaidAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(prepaidCusEnt?.balance).to.equal(prepaidAllowance - value);
-		expect(usageCusEnt?.balance).to.equal(pro.items.payPerUse.included_usage);
-	});
-
-	it("should have correct usage / invoice after upgrade", async function () {
-		const value = 60;
-		await autumn.track({
-			customer_id: customerId,
-			value,
-			feature_id: features.metered1.id,
-		});
-
-		totalUsage += value;
-
-		await timeout(10000);
-
-		const { usageCusEnt } = await getPrepaidAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: premium.id,
-			options: optionsList,
-		});
-
-		const { prepaidCusEnt, usageCusEnt: newUsageCusEnt } =
-			await getPrepaidAndUsageCusEnts({
-				customerId,
-				db: this.db,
-				orgId: this.org.id,
-				env: this.env,
-				featureId: features.metered1.id,
-			});
-
-		// Check invoice too
-		const { invoices } = await autumn2.customers.get(customerId);
-
-		const invoice1Amount =
-			(premium.items.prepaid.price ?? 0) * prepaidQuantity -
-			(pro.items.prepaid.price ?? 0) * prepaidQuantity;
-
-		const invoice0Amount = value * (pro.items.payPerUse.price ?? 0);
-
-		const totalAmount = invoice1Amount + invoice0Amount;
-
-		expect(invoices![0].total).to.equal(totalAmount);
-
-		const leftover = premiumPrepaidAllowance - totalUsage + value;
-		expect(prepaidCusEnt?.balance).to.equal(Math.max(0, leftover));
-		expect(newUsageCusEnt?.balance).to.equal(0);
-	});
-});
diff --git a/server/tests/advanced/multiFeature/multiFeature2.ts b/server/tests/advanced/multiFeature/multiFeature2.ts
deleted file mode 100644
index 3b160391e..000000000
--- a/server/tests/advanced/multiFeature/multiFeature2.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import {
-	type AppEnv,
-	BillingInterval,
-	EntInterval,
-	LegacyVersion,
-	ProductItemFeatureType,
-	UsageModel,
-} from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { setupBefore } from "@tests/before.js";
-import { features } from "@tests/global.js";
-import {
-	getLifetimeFreeCusEnt,
-	getUsageCusEnt,
-} from "@tests/utils/cusProductUtils/cusEntSearchUtils.js";
-import { getMainCusProduct } from "@tests/utils/cusProductUtils/cusProductUtils.js";
-import { createProduct } from "@tests/utils/productUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import {
-	constructFeatureItem,
-	constructFeaturePriceItem,
-} from "@/internal/products/product-items/productItemUtils.js";
-import { timeout } from "@/utils/genUtils.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-
-// Scenario 1: prepaid + pay per use monthly -> prepaid + pay per use monthly
-const pro = {
-	id: "multiFeature2Pro",
-	name: "Multi Feature 2 Pro",
-	items: {
-		lifetime: constructFeatureItem({
-			feature_id: features.metered1.id,
-			included_usage: 50,
-			interval: EntInterval.Lifetime,
-		}),
-		payPerUse: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 0,
-			price: 0.5,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.PayPerUse,
-		}),
-	},
-};
-
-const premium = {
-	id: "multiFeature2Premium",
-	name: "Multi Feature 2 Premium",
-	items: {
-		// Pay per use
-		payPerUse: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 0,
-			price: 1,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.PayPerUse,
-		}),
-	},
-};
-
-export const getLifetimeAndUsageCusEnts = async ({
-	customerId,
-	db,
-	orgId,
-	env,
-	featureId,
-}: {
-	customerId: string;
-	db: DrizzleCli;
-	orgId: string;
-	env: AppEnv;
-	featureId: string;
-}) => {
-	const mainCusProduct = await getMainCusProduct({
-		customerId: customerId,
-		db,
-		orgId,
-		env,
-	});
-
-	const lifetimeCusEnt = getLifetimeFreeCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	const usageCusEnt = getUsageCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	return { lifetimeCusEnt, usageCusEnt };
-};
-
-const testCase = "multiFeature2";
-describe(`${chalk.yellowBright(
-	"multiFeature2: Testing lifetime + pay per use -> pay per use",
-)}`, () => {
-	let autumn: AutumnInt = new AutumnInt();
-	const autumn2: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_2 });
-	const customerId = testCase;
-
-	let totalUsage = 0;
-
-	before(async function () {
-		await setupBefore(this);
-
-		await initCustomer({
-			autumn: this.autumnJs,
-			customerId,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: "success",
-		});
-
-		autumn = this.autumn;
-
-		await createProduct({
-			autumn,
-			product: pro,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-		});
-
-		await createProduct({
-			autumn,
-			product: premium,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-		});
-	});
-
-	it("should attach pro product to customer", async function () {
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: pro.id,
-		});
-
-		const { lifetimeCusEnt, usageCusEnt } = await getLifetimeAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(lifetimeCusEnt?.balance).to.equal(pro.items.lifetime.included_usage);
-
-		expect(usageCusEnt?.balance).to.equal(pro.items.payPerUse.included_usage);
-	});
-
-	it("should use lifetime allowance first", async function () {
-		const value = pro.items.lifetime.included_usage as number;
-
-		await autumn.events.send({
-			customerId,
-			value,
-			featureId: features.metered1.id,
-		});
-
-		totalUsage += value;
-
-		await timeout(3000);
-
-		const { lifetimeCusEnt, usageCusEnt } = await getLifetimeAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(lifetimeCusEnt?.balance).to.equal(
-			(pro.items.lifetime.included_usage as number) - value,
-		);
-		expect(usageCusEnt?.balance).to.equal(pro.items.payPerUse.included_usage);
-	});
-
-	it("should have correct usage after upgrade", async function () {
-		const value = 20;
-
-		await autumn.track({
-			customer_id: customerId,
-			value,
-			feature_id: features.metered1.id,
-		});
-
-		await timeout(3000);
-
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: premium.id,
-		});
-
-		// return;
-		const { lifetimeCusEnt, usageCusEnt: newUsageCusEnt } =
-			await getLifetimeAndUsageCusEnts({
-				customerId,
-				db: this.db,
-				orgId: this.org.id,
-				env: this.env,
-				featureId: features.metered1.id,
-			});
-
-		expect(lifetimeCusEnt).to.not.exist;
-		expect(newUsageCusEnt?.balance).to.equal(-50);
-
-		// Check invoice too
-		const res = await autumn2.customers.get(customerId);
-		const invoices = res.invoices;
-
-		const invoice0Amount = value * (pro.items.payPerUse.price ?? 0);
-		expect(invoices![0].total).to.equal(
-			invoice0Amount,
-			"Invoice 0 should be 0",
-		);
-	});
-});
diff --git a/server/tests/advanced/multiFeature/multiFeature3.ts b/server/tests/advanced/multiFeature/multiFeature3.ts
deleted file mode 100644
index 228007203..000000000
--- a/server/tests/advanced/multiFeature/multiFeature3.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/** biome-ignore-all lint/suspicious/noExportsInTest: needed */
-import {
-	type AppEnv,
-	BillingInterval,
-	EntInterval,
-	ProductItemFeatureType,
-	UsageModel,
-} from "@autumn/shared";
-import { expect } from "chai";
-import chalk from "chalk";
-import { addMonths } from "date-fns";
-import { setupBefore } from "@tests/before.js";
-import { features } from "@tests/global.js";
-import {
-	getLifetimeFreeCusEnt,
-	getUsageCusEnt,
-} from "@tests/utils/cusProductUtils/cusEntSearchUtils.js";
-import { getMainCusProduct } from "@tests/utils/cusProductUtils/cusProductUtils.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import {
-	constructFeatureItem,
-	constructFeaturePriceItem,
-} from "@/internal/products/product-items/productItemUtils.js";
-import { timeout } from "@/utils/genUtils.js";
-import { initCustomerV2 } from "@/utils/scriptUtils/initCustomer.js";
-
-// Scenario 1: prepaid + pay per use monthly -> prepaid + pay per use monthly
-const pro = {
-	id: "multiFeature3Pro",
-	name: "Multi Feature 3 Pro",
-	items: {
-		lifetime: constructFeatureItem({
-			feature_id: features.metered1.id,
-			included_usage: 50,
-			interval: EntInterval.Lifetime,
-		}),
-		payPerUse: constructFeaturePriceItem({
-			feature_id: features.metered1.id,
-			feature_type: ProductItemFeatureType.SingleUse,
-			included_usage: 0,
-			price: 0.5,
-			interval: BillingInterval.Month,
-			usage_model: UsageModel.PayPerUse,
-		}),
-	},
-};
-
-export const getLifetimeAndUsageCusEnts = async ({
-	customerId,
-	db,
-	orgId,
-	env,
-	featureId,
-}: {
-	customerId: string;
-	db: DrizzleCli;
-	orgId: string;
-	env: AppEnv;
-	featureId: string;
-}) => {
-	const mainCusProduct = await getMainCusProduct({
-		customerId,
-		db,
-		orgId,
-		env,
-	});
-
-	const lifetimeCusEnt = getLifetimeFreeCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	const usageCusEnt = getUsageCusEnt({
-		cusProduct: mainCusProduct!,
-		featureId,
-	});
-
-	return { lifetimeCusEnt, usageCusEnt };
-};
-
-// UNCOMMENT FROM HERE
-describe(`${chalk.yellowBright(
-	"multi-feature/multi_feature3: Testing lifetime + pay per use, advance test clock",
-)}`, () => {
-	const autumn: AutumnInt = new AutumnInt();
-	const customerId = "multiFeature3Customer";
-
-	let totalUsage = 0;
-
-	let testClockId: string;
-	before(async function () {
-		await setupBefore(this);
-
-		const res = await initCustomerV2({
-			autumn,
-			customerId,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: "success",
-		});
-
-		testClockId = res.testClockId;
-
-		await createProducts({
-			autumn,
-			products: [pro],
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-		});
-	});
-
-	it("should attach pro product to customer", async function () {
-		await autumn.attach({
-			customer_id: customerId,
-			product_id: pro.id,
-		});
-
-		const { lifetimeCusEnt, usageCusEnt } = await getLifetimeAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(lifetimeCusEnt?.balance).to.equal(pro.items.lifetime.included_usage);
-
-		expect(usageCusEnt?.balance).to.equal(pro.items.payPerUse.included_usage);
-	});
-
-	const overageValue = 30;
-	it("should use lifetime allowance + overage", async function () {
-		let value = pro.items.lifetime.included_usage as number;
-		value += overageValue;
-
-		await autumn.track({
-			customer_id: customerId,
-			value,
-			feature_id: features.metered1.id,
-		});
-
-		totalUsage += value;
-
-		await timeout(3000);
-
-		const { lifetimeCusEnt, usageCusEnt } = await getLifetimeAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(lifetimeCusEnt?.balance).to.equal(0);
-		expect(usageCusEnt?.balance).to.equal(-overageValue);
-	});
-
-	it("cycle 1:should have correct usage after first cycle", async function () {
-		const advanceTo = addMonths(new Date(), 1).getTime();
-		await advanceTestClock({
-			stripeCli: this.stripeCli,
-			testClockId,
-			advanceTo,
-		});
-
-		const { lifetimeCusEnt, usageCusEnt } = await getLifetimeAndUsageCusEnts({
-			customerId,
-			db: this.db,
-			orgId: this.org.id,
-			env: this.env,
-			featureId: features.metered1.id,
-		});
-
-		expect(lifetimeCusEnt?.balance).to.equal(0);
-		expect(usageCusEnt?.balance).to.equal(0);
-	});
-});
diff --git a/server/tests/advanced/referrals/paid/referrals13.backup.ts b/server/tests/advanced/referrals/paid/referrals13.backup.ts
deleted file mode 100644
index 5f1aefaaf..000000000
--- a/server/tests/advanced/referrals/paid/referrals13.backup.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import {
-	type AppEnv,
-	CusExpand,
-	CusProductStatus,
-	ErrCode,
-	type Organization,
-	type ReferralCode,
-	type RewardRedemption,
-} from "@autumn/shared";
-import { assert } from "chai";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { setupBefore } from "@tests/before.js";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
-
-import { CusService } from "@/internal/customers/CusService.js";
-import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-import { products, referralPrograms } from "../../../global.js";
-
-export const group = "referrals13";
-
-describe(`${chalk.yellowBright(
-	"referrals13: Testing referrals - referrer on Pro, gets discount on next cycle - coupon-based",
-)}`, () => {
-	const mainCustomerId = "main-referral-13";
-	const redeemer = "referral13-r1";
-	const redeemerPM = "success";
-	const autumn: AutumnInt = new AutumnInt();
-	let stripeCli: Stripe;
-	const testClockIds: string[] = [];
-	let referralCode: ReferralCode;
-
-	let redemption: RewardRedemption;
-	let db: DrizzleCli;
-	let org: Organization;
-	let env: AppEnv;
-
-	before(async function () {
-		await setupBefore(this);
-		stripeCli = this.stripeCli;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		try {
-			await Promise.all([
-				autumn.customers.delete(mainCustomerId),
-				autumn.customers.delete(redeemer),
-				RewardRedemptionService._resetCustomerRedemptions({
-					db,
-					internalCustomerId: [mainCustomerId, redeemer],
-				}),
-			]);
-		} catch {}
-
-		// Initialize main customer with Pro product already attached
-		const res = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: mainCustomerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		testClockIds.push(res.testClockId);
-
-		// Attach Pro product to main customer first
-		await autumn.attach({
-			customer_id: mainCustomerId,
-			product_id: products.pro.id,
-		});
-
-		const redeemerRes = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: redeemer,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: redeemerPM,
-			withTestClock: true,
-		});
-
-		testClockIds.push(redeemerRes.testClockId);
-	});
-
-	it("should advance clock 10 days before redeeming", async () => {
-		// Advance 10 days after Pro is attached
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 10,
-					waitForSeconds: 10,
-					stripeCli,
-				}),
-			),
-		);
-	});
-
-	it("should create code once", async () => {
-		referralCode = await autumn.referrals.createCode({
-			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
-		});
-
-		assert.exists(referralCode.code);
-	});
-
-	it("should create redemption for redeemer and fail if redeemed again", async () => {
-		redemption = await autumn.referrals.redeem({
-			customerId: redeemer,
-			code: referralCode.code,
-		});
-
-		// Try redeem for redeemer again
-		try {
-			await autumn.referrals.redeem({
-				customerId: redeemer,
-				code: referralCode.code,
-			});
-			assert.fail("Should not be able to redeem again");
-		} catch (error) {
-			assert.instanceOf(error, AutumnError);
-			assert.equal(error.code, ErrCode.CustomerAlreadyRedeemedReferralCode);
-		}
-	});
-
-	it("should have referrer already on Pro, and redeemer gets free product", async () => {
-		const redemptionResult = await autumn.redemptions.get(redemption.id);
-		assert.equal(redemptionResult.redeemer_applied, true);
-
-		const mainProds = (await autumn.customers.get(mainCustomerId)).products;
-		const redeemerProds = (await autumn.customers.get(redeemer)).products;
-
-		// Main customer (referrer) should have the pro product (already attached)
-		assert.equal(mainProds.length, 1);
-		assert.equal(mainProds[0].id, products.pro.id);
-
-		// Redeemer should only have the free product (no pro product given in referrer-only program)
-		assert.equal(redeemerProds.length, 1);
-		assert.equal(redeemerProds[0].id, products.free.id);
-
-		expectProductV1Attached({
-			customer: await autumn.customers.get(mainCustomerId),
-			product: products.pro,
-			status: CusProductStatus.Active,
-		});
-
-		// Verify redeemer only has free product
-		expectProductV1Attached({
-			customer: await autumn.customers.get(redeemer),
-			product: products.free,
-			status: CusProductStatus.Active,
-		});
-	});
-
-	it("should advance test clock and verify referrer gets discount on next Pro cycle", async () => {
-		// Advance 31 days from current time to trigger next billing cycle
-		// Coupon was applied on day 10, lasts 30 days, so should still be active on day 31
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 31,
-					waitForSeconds: 25,
-					stripeCli,
-				}),
-			),
-		);
-
-		// Test that main customer's Pro invoice has discount applied
-		const mainCustomerWithInvoices = await autumn.customers.get(
-			mainCustomerId,
-			{
-				expand: [CusExpand.Invoices, CusExpand.Rewards],
-			},
-		);
-
-		const proInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
-		);
-
-		const expectedTotal = products.pro.prices[0].config.amount;
-
-		const actualTotal = proInvoice?.total;
-
-		if (proInvoice) {
-			// Should have a discount applied - invoice total should be less than full Pro price ($10)
-			assert.isBelow(
-				actualTotal!,
-				expectedTotal, // $10 in cents
-				"Pro invoice should have discount applied, making it less than full price",
-			);
-
-			// For referrer-only reward, the discount should make it significantly cheaper or free
-			assert.isAtMost(
-				actualTotal!,
-				expectedTotal / 2, // $5 or less in cents - assuming at least 50% discount
-				"Referrer should get substantial discount on Pro product",
-			);
-		}
-
-		const dbCustomers = await Promise.all(
-			[mainCustomerId, redeemer].map((x) =>
-				CusService.getFull({
-					db,
-					idOrInternalId: x,
-					orgId: org.id,
-					env,
-					inStatuses: [
-						CusProductStatus.Active,
-						CusProductStatus.PastDue,
-						CusProductStatus.Expired,
-					],
-				}),
-			),
-		);
-
-		const expectedProducts = [
-			[
-				// Main referrer - keeps Pro with discount applied
-				{ name: "Free", status: CusProductStatus.Expired },
-				{ name: "Pro", status: CusProductStatus.Active },
-			],
-			[
-				// Redeemer - only has free product (no reward in referrer-only program)
-				{ name: "Free", status: CusProductStatus.Active },
-			],
-		];
-
-		dbCustomers.forEach((customer, index) => {
-			const expectedProductsForCustomer = expectedProducts[index];
-			expectedProductsForCustomer.forEach((expectedProduct) => {
-				const matchingProduct = customer.customer_products.find(
-					(cp) =>
-						cp.product.name === expectedProduct.name &&
-						cp.status === expectedProduct.status,
-				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
-
-				assert.exists(
-					matchingProduct,
-					`Customer ${customer.name} should have ${expectedProduct.name} product with status ${expectedProduct.status}. ${unMatchedProduct ? `However ${unMatchedProduct.product.name} with status ${unMatchedProduct.status} was found instead` : ""}`,
-				);
-			});
-		});
-	});
-});
diff --git a/server/tests/advanced/referrals/paid/referrals13.test.ts b/server/tests/advanced/referrals/paid/referrals13.test.ts
index 5b8354de2..34aab64cf 100644
--- a/server/tests/advanced/referrals/paid/referrals13.test.ts
+++ b/server/tests/advanced/referrals/paid/referrals13.test.ts
@@ -1,27 +1,92 @@
+import { beforeAll, describe, expect, test } from "bun:test";
 import {
 	type AppEnv,
+	CouponDurationType,
+	type CreateReward,
+	type CreateRewardProgram,
 	CusExpand,
 	CusProductStatus,
 	ErrCode,
 	type Organization,
 	type ReferralCode,
+	RewardReceivedBy,
 	type RewardRedemption,
+	RewardTriggerEvent,
+	RewardType,
 } from "@autumn/shared";
-import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { TestFeature } from "@tests/setup/v2Features.js";
+import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { createReferralProgram } from "@tests/utils/productUtils.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import type { Stripe } from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { CusService } from "@/internal/customers/CusService.js";
 import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
+import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
+import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
-import { products, referralPrograms } from "../../../global.js";
+import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
 
 export const group = "referrals13";
 
+const testCase = "referrals13";
+
+// Define products inline
+const freeProd = constructProduct({
+	id: "free",
+	type: "free",
+	isDefault: true,
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 5,
+		}),
+	],
+});
+
+const proProd = constructProduct({
+	id: "pro",
+	type: "pro",
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Dashboard,
+			isBoolean: true,
+		}),
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 10,
+		}),
+	],
+});
+
+// Reward: pro_amount discount (coupon-based)
+const proAmountReward: CreateReward = {
+	id: `${testCase}ProAmount`,
+	name: "Pro Amount Discount",
+	type: RewardType.PercentageDiscount,
+	promo_codes: [],
+	discount_config: {
+		discount_value: 10, // $10 off (pro_amount)
+		duration_type: CouponDurationType.Months,
+		duration_value: 1,
+		apply_to_all: true,
+		price_ids: [],
+	},
+};
+
+// Referral program: triggers immediately, applies to referrer only
+const paidProductImmediateReferrer: CreateRewardProgram = {
+	id: `${testCase}ImmediateReferrer`,
+	when: RewardTriggerEvent.CustomerCreation,
+	product_ids: [proProd.id],
+	internal_reward_id: proAmountReward.id,
+	max_redemptions: 10,
+	received_by: RewardReceivedBy.Referrer,
+};
+
 describe(`${chalk.yellowBright(
 	"referrals13: Testing referrals - referrer on Pro, gets discount on next cycle - coupon-based",
 )}`, () => {
@@ -55,6 +120,24 @@ describe(`${chalk.yellowBright(
 			]);
 		} catch {}
 
+		// Initialize products first
+		await initProductsV0({
+			ctx,
+			products: [freeProd, proProd],
+			prefix: testCase,
+			customerId: mainCustomerId,
+		});
+
+		// Create referral program
+		await createReferralProgram({
+			db,
+			orgId: org.id,
+			env,
+			autumn: new AutumnInt({ secretKey: ctx.orgSecretKey }),
+			reward: proAmountReward,
+			rewardProgram: paidProductImmediateReferrer,
+		});
+
 		// Initialize main customer with Pro product already attached
 		const res = await initCustomerV3({
 			ctx,
@@ -67,7 +150,7 @@ describe(`${chalk.yellowBright(
 		// Attach Pro product to main customer first
 		await autumn.attach({
 			customer_id: mainCustomerId,
-			product_id: products.pro.id,
+			product_id: proProd.id,
 		});
 
 		const redeemerRes = await initCustomerV3({
@@ -97,7 +180,7 @@ describe(`${chalk.yellowBright(
 	test("should create code once", async () => {
 		referralCode = await autumn.referrals.createCode({
 			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
+			referralId: paidProductImmediateReferrer.id,
 		});
 
 		expect(referralCode.code).toBeDefined();
@@ -118,7 +201,9 @@ describe(`${chalk.yellowBright(
 			throw new Error("Should not be able to redeem again");
 		} catch (error) {
 			expect(error).toBeInstanceOf(AutumnError);
-			expect((error as AutumnError).code).toBe(ErrCode.CustomerAlreadyRedeemedReferralCode);
+			expect((error as AutumnError).code).toBe(
+				ErrCode.CustomerAlreadyRedeemedReferralCode,
+			);
 		}
 	});
 
@@ -131,22 +216,22 @@ describe(`${chalk.yellowBright(
 
 		// Main customer (referrer) should have the pro product (already attached)
 		expect(mainProds.length).toBe(1);
-		expect(mainProds[0].id).toBe(products.pro.id);
+		expect(mainProds[0].id).toBe(proProd.id);
 
 		// Redeemer should only have the free product (no pro product given in referrer-only program)
 		expect(redeemerProds.length).toBe(1);
-		expect(redeemerProds[0].id).toBe(products.free.id);
+		expect(redeemerProds[0].id).toBe(freeProd.id);
 
-		expectProductV1Attached({
+		expectProductAttached({
 			customer: await autumn.customers.get(mainCustomerId),
-			product: products.pro,
+			product: proProd,
 			status: CusProductStatus.Active,
 		});
 
 		// Verify redeemer only has free product
-		expectProductV1Attached({
+		expectProductAttached({
 			customer: await autumn.customers.get(redeemer),
-			product: products.free,
+			product: freeProd,
 			status: CusProductStatus.Active,
 		});
 	});
@@ -174,15 +259,15 @@ describe(`${chalk.yellowBright(
 		);
 
 		const proInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
+			x.product_ids.includes(proProd.id),
 		);
 
-		const expectedTotal = products.pro.prices[0].config.amount;
+		const expectedTotal = 20; // Pro product base price
 
 		const actualTotal = proInvoice?.total;
 
 		if (proInvoice) {
-			// Should have a discount applied - invoice total should be less than full Pro price ($10)
+			// Should have a discount applied - invoice total should be less than full Pro price
 			expect(actualTotal!).toBeLessThan(expectedTotal);
 
 			// For referrer-only reward, the discount should make it significantly cheaper or free
@@ -225,9 +310,6 @@ describe(`${chalk.yellowBright(
 						cp.product.name === expectedProduct.name &&
 						cp.status === expectedProduct.status,
 				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
 
 				expect(matchingProduct).toBeDefined();
 			});
diff --git a/server/tests/advanced/referrals/paid/referrals14.backup.ts b/server/tests/advanced/referrals/paid/referrals14.backup.ts
deleted file mode 100644
index 123f098bf..000000000
--- a/server/tests/advanced/referrals/paid/referrals14.backup.ts
+++ /dev/null
@@ -1,264 +0,0 @@
-import {
-	type AppEnv,
-	CusExpand,
-	CusProductStatus,
-	ErrCode,
-	type Organization,
-	type ReferralCode,
-	type RewardRedemption,
-} from "@autumn/shared";
-import { assert } from "chai";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { setupBefore } from "@tests/before.js";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { CusService } from "@/internal/customers/CusService.js";
-import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-import { products, referralPrograms } from "../../../global.js";
-
-export const group = "referrals14";
-
-describe(`${chalk.yellowBright(
-	"referrals14: Testing referrals - referrer on Premium (higher tier), gets pro_amount discount - coupon-based",
-)}`, () => {
-	const mainCustomerId = "main-referral-14";
-	const redeemer = "referral14-r1";
-	const redeemerPM = "success";
-	const autumn: AutumnInt = new AutumnInt();
-	let stripeCli: Stripe;
-	const testClockIds: string[] = [];
-	let referralCode: ReferralCode;
-
-	let redemption: RewardRedemption;
-	let db: DrizzleCli;
-	let org: Organization;
-	let env: AppEnv;
-
-	before(async function () {
-		await setupBefore(this);
-		stripeCli = this.stripeCli;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		try {
-			await Promise.all([
-				autumn.customers.delete(mainCustomerId, { deleteInStripe: true }),
-				autumn.customers.delete(redeemer, { deleteInStripe: true }),
-				RewardRedemptionService._resetCustomerRedemptions({
-					db,
-					internalCustomerId: [mainCustomerId, redeemer],
-				}),
-			]);
-		} catch {}
-
-		// Initialize main customer with Premium product already attached
-		const res = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: mainCustomerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		testClockIds.push(res.testClockId);
-
-		// Attach Premium product to main customer first (higher tier than Pro)
-		await autumn.attach({
-			customer_id: mainCustomerId,
-			product_id: products.premium.id,
-		});
-
-		const redeemerRes = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: redeemer,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: redeemerPM,
-			withTestClock: true,
-		});
-
-		testClockIds.push(redeemerRes.testClockId);
-
-		// Advance 10 days after Premium is attached, then redeem the code
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 10,
-					waitForSeconds: 5,
-					stripeCli,
-				}),
-			),
-		);
-	});
-
-	it("should create code once", async () => {
-		referralCode = await autumn.referrals.createCode({
-			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
-		});
-
-		assert.exists(referralCode.code);
-
-		// Get referral code again
-		const referralCode2 = await autumn.referrals.createCode({
-			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
-		});
-
-		assert.equal(referralCode2.code, referralCode.code);
-	});
-
-	it("should create redemption for redeemer and fail if redeemed again", async () => {
-		redemption = await autumn.referrals.redeem({
-			customerId: redeemer,
-			code: referralCode.code,
-		});
-
-		// Try redeem for redeemer again
-		try {
-			await autumn.referrals.redeem({
-				customerId: redeemer,
-				code: referralCode.code,
-			});
-			assert.fail("Should not be able to redeem again");
-		} catch (error) {
-			assert.instanceOf(error, AutumnError);
-			assert.equal(error.code, ErrCode.CustomerAlreadyRedeemedReferralCode);
-		}
-	});
-
-	it("should have referrer already on Premium, and redeemer gets free product", async () => {
-		const redemptionResult = await autumn.redemptions.get(redemption.id);
-		assert.equal(redemptionResult.redeemer_applied, true);
-
-		const mainCus = await autumn.customers.get(mainCustomerId);
-		const redeemerCus = await autumn.customers.get(redeemer);
-		const mainProds = mainCus.products;
-		const redeemerProds = redeemerCus.products;
-
-		// Main customer (referrer) should have the premium product (already attached)
-		assert.equal(mainProds.length, 1);
-		assert.equal(mainProds[0].id, products.premium.id);
-
-		// Redeemer should only have the free product (no pro product given in referrer-only program)
-		assert.equal(redeemerProds.length, 1);
-		assert.equal(redeemerProds[0].id, products.free.id);
-
-		expectProductV1Attached({
-			customer: mainCus,
-			product: products.premium,
-			status: CusProductStatus.Active,
-		});
-
-		// Verify redeemer only has free product
-		expectProductV1Attached({
-			customer: redeemerCus,
-			product: products.free,
-			status: CusProductStatus.Active,
-		});
-	});
-
-	it("should advance test clock and verify referrer gets pro_amount discount on Premium cycle", async () => {
-		// Advance 21 more days (total 31 days from start) to trigger next billing cycle
-		// Coupon was applied on day 10, lasts 30 days, so should still be active on day 31
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 31,
-					waitForSeconds: 25,
-					stripeCli,
-				}),
-			),
-		);
-
-		// Test that main customer's Premium invoice has pro_amount discount applied
-		const mainCustomerWithInvoices = await autumn.customers.get(
-			mainCustomerId,
-			{
-				expand: [CusExpand.Invoices],
-			},
-		);
-
-		const premiumInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.premium.id),
-		);
-		if (premiumInvoice) {
-			// Premium costs $50, Pro costs $10 - so referrer should get $10 discount on Premium
-			// Expected: Premium ($50) - Pro amount ($10) = $40
-			console.log(products.premium.prices);
-			const premiumPrice = products.premium.prices[0].config.amount; // $50
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-			const expectedTotal = premiumPrice - proAmount; // $40
-
-			// The invoice total should be exactly Premium price minus pro_amount
-			assert.equal(
-				premiumInvoice.total,
-				expectedTotal,
-				`Premium invoice should be $40 (Premium $50 - Pro amount $10 discount). Got $${premiumInvoice.total}`,
-			);
-
-			// Verify that the discount was applied (total is less than full Premium price)
-			assert.isBelow(
-				premiumInvoice.total,
-				premiumPrice,
-				"Referrer on Premium should get pro_amount discount, making it less than full Premium price",
-			);
-		}
-
-		const dbCustomers = await Promise.all(
-			[mainCustomerId, redeemer].map((x) =>
-				CusService.getFull({
-					db,
-					idOrInternalId: x,
-					orgId: org.id,
-					env,
-					inStatuses: [
-						CusProductStatus.Active,
-						CusProductStatus.PastDue,
-						CusProductStatus.Expired,
-					],
-				}),
-			),
-		);
-
-		const expectedProducts = [
-			[
-				// Main referrer - keeps Premium with pro_amount discount applied
-				{ name: "Free", status: CusProductStatus.Expired },
-				{ name: "Premium", status: CusProductStatus.Active },
-			],
-			[
-				// Redeemer - only has free product (no reward in referrer-only program)
-				{ name: "Free", status: CusProductStatus.Active },
-			],
-		];
-
-		dbCustomers.forEach((customer, index) => {
-			const expectedProductsForCustomer = expectedProducts[index];
-			expectedProductsForCustomer.forEach((expectedProduct) => {
-				const matchingProduct = customer.customer_products.find(
-					(cp) =>
-						cp.product.name === expectedProduct.name &&
-						cp.status === expectedProduct.status,
-				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
-
-				assert.exists(
-					matchingProduct,
-					`Customer ${customer.name} should have ${expectedProduct.name} product with status ${expectedProduct.status}. ${unMatchedProduct ? `However ${unMatchedProduct.product.name} with status ${unMatchedProduct.status} was found instead` : ""}`,
-				);
-			});
-		});
-	});
-});
diff --git a/server/tests/advanced/referrals/paid/referrals14.test.ts b/server/tests/advanced/referrals/paid/referrals14.test.ts
index 5861e8fe1..f98792490 100644
--- a/server/tests/advanced/referrals/paid/referrals14.test.ts
+++ b/server/tests/advanced/referrals/paid/referrals14.test.ts
@@ -1,27 +1,111 @@
+import { beforeAll, describe, expect, test } from "bun:test";
 import {
 	type AppEnv,
+	CouponDurationType,
+	type CreateReward,
+	type CreateRewardProgram,
 	CusExpand,
 	CusProductStatus,
 	ErrCode,
 	type Organization,
 	type ReferralCode,
+	RewardReceivedBy,
 	type RewardRedemption,
+	RewardTriggerEvent,
+	RewardType,
 } from "@autumn/shared";
-import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { TestFeature } from "@tests/setup/v2Features.js";
+import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { createReferralProgram } from "@tests/utils/productUtils.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import type { Stripe } from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { CusService } from "@/internal/customers/CusService.js";
 import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
+import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
+import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
-import { products, referralPrograms } from "../../../global.js";
+import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
 
 export const group = "referrals14";
 
+const testCase = "referrals14";
+
+// Define products inline
+const freeProd = constructProduct({
+	id: "free",
+	type: "free",
+	isDefault: true,
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 5,
+		}),
+	],
+});
+
+const proProd = constructProduct({
+	id: "pro",
+	type: "pro",
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Dashboard,
+			isBoolean: true,
+		}),
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 10,
+		}),
+	],
+});
+
+const premiumProd = constructProduct({
+	id: "premium",
+	type: "premium",
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Dashboard,
+			isBoolean: true,
+		}),
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 50,
+		}),
+		constructFeatureItem({
+			featureId: TestFeature.Admin,
+			unlimited: true,
+		}),
+	],
+});
+
+// Reward: pro_amount discount (coupon-based)
+const proAmountReward: CreateReward = {
+	id: `${testCase}ProAmount`,
+	name: "Pro Amount Discount",
+	type: RewardType.PercentageDiscount,
+	promo_codes: [],
+	discount_config: {
+		discount_value: 10, // $10 off (pro_amount)
+		duration_type: CouponDurationType.Months,
+		duration_value: 1,
+		apply_to_all: true,
+		price_ids: [],
+	},
+};
+
+// Referral program: triggers immediately, applies to referrer only
+const paidProductImmediateReferrer: CreateRewardProgram = {
+	id: `${testCase}ImmediateReferrer`,
+	when: RewardTriggerEvent.CustomerCreation,
+	product_ids: [proProd.id, premiumProd.id],
+	internal_reward_id: proAmountReward.id,
+	max_redemptions: 10,
+	received_by: RewardReceivedBy.Referrer,
+};
+
 describe(`${chalk.yellowBright(
 	"referrals14: Testing referrals - referrer on Premium (higher tier), gets pro_amount discount - coupon-based",
 )}`, () => {
@@ -55,6 +139,24 @@ describe(`${chalk.yellowBright(
 			]);
 		} catch {}
 
+		// Initialize products first
+		await initProductsV0({
+			ctx,
+			products: [freeProd, proProd, premiumProd],
+			prefix: testCase,
+			customerId: mainCustomerId,
+		});
+
+		// Create referral program
+		await createReferralProgram({
+			db,
+			orgId: org.id,
+			env,
+			autumn: new AutumnInt({ secretKey: ctx.orgSecretKey }),
+			reward: proAmountReward,
+			rewardProgram: paidProductImmediateReferrer,
+		});
+
 		// Initialize main customer with Premium product already attached
 		const res = await initCustomerV3({
 			ctx,
@@ -67,7 +169,7 @@ describe(`${chalk.yellowBright(
 		// Attach Premium product to main customer first (higher tier than Pro)
 		await autumn.attach({
 			customer_id: mainCustomerId,
-			product_id: products.premium.id,
+			product_id: premiumProd.id,
 		});
 
 		const redeemerRes = await initCustomerV3({
@@ -95,7 +197,7 @@ describe(`${chalk.yellowBright(
 	test("should create code once", async () => {
 		referralCode = await autumn.referrals.createCode({
 			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
+			referralId: paidProductImmediateReferrer.id,
 		});
 
 		expect(referralCode.code).toBeDefined();
@@ -103,7 +205,7 @@ describe(`${chalk.yellowBright(
 		// Get referral code again
 		const referralCode2 = await autumn.referrals.createCode({
 			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateReferrer.id,
+			referralId: paidProductImmediateReferrer.id,
 		});
 
 		expect(referralCode2.code).toBe(referralCode.code);
@@ -124,7 +226,9 @@ describe(`${chalk.yellowBright(
 			throw new Error("Should not be able to redeem again");
 		} catch (error) {
 			expect(error).toBeInstanceOf(AutumnError);
-			expect((error as AutumnError).code).toBe(ErrCode.CustomerAlreadyRedeemedReferralCode);
+			expect((error as AutumnError).code).toBe(
+				ErrCode.CustomerAlreadyRedeemedReferralCode,
+			);
 		}
 	});
 
@@ -139,22 +243,26 @@ describe(`${chalk.yellowBright(
 
 		// Main customer (referrer) should have the premium product (already attached)
 		expect(mainProds.length).toBe(1);
-		expect(mainProds[0].id).toBe(products.premium.id);
+		expect(mainProds[0].id).toBe(premiumProd.id);
 
 		// Redeemer should only have the free product (no pro product given in referrer-only program)
 		expect(redeemerProds.length).toBe(1);
-		expect(redeemerProds[0].id).toBe(products.free.id);
+		expect(redeemerProds[0].id).toBe(freeProd.id);
 
-		expectProductV1Attached({
+		// expectProductV1Attached({
+		// 	customer: mainCus,
+		// 	product: premiumProd,
+		// 	status: CusProductStatus.Active,
+		// });
+		expectProductAttached({
 			customer: mainCus,
-			product: products.premium,
+			product: premiumProd,
 			status: CusProductStatus.Active,
 		});
 
-		// Verify redeemer only has free product
-		expectProductV1Attached({
+		expectProductAttached({
 			customer: redeemerCus,
-			product: products.free,
+			product: freeProd,
 			status: CusProductStatus.Active,
 		});
 	});
@@ -182,13 +290,13 @@ describe(`${chalk.yellowBright(
 		);
 
 		const premiumInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.premium.id),
+			x.product_ids.includes(premiumProd.id),
 		);
 		if (premiumInvoice) {
-			// Premium costs $50, Pro costs $10 - so referrer should get $10 discount on Premium
-			// Expected: Premium ($50) - Pro amount ($10) = $40
-			const premiumPrice = products.premium.prices[0].config.amount; // $50
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
+			// Premium costs $50, Pro costs $20 - so referrer should get $10 discount on Premium
+			// Expected: Premium ($50) - discount amount ($10) = $40
+			const premiumPrice = 50; // Premium product base price
+			const proAmount = 10; // Discount amount (pro_amount)
 			const expectedTotal = premiumPrice - proAmount; // $40
 
 			// The invoice total should be exactly Premium price minus pro_amount
@@ -234,9 +342,6 @@ describe(`${chalk.yellowBright(
 						cp.product.name === expectedProduct.name &&
 						cp.status === expectedProduct.status,
 				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
 
 				expect(matchingProduct).toBeDefined();
 			});
diff --git a/server/tests/advanced/referrals/paid/referrals15.backup.ts b/server/tests/advanced/referrals/paid/referrals15.backup.ts
deleted file mode 100644
index 2213852a3..000000000
--- a/server/tests/advanced/referrals/paid/referrals15.backup.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import {
-	type AppEnv,
-	CusExpand,
-	CusProductStatus,
-	ErrCode,
-	type Organization,
-	type ReferralCode,
-	type RewardRedemption,
-} from "@autumn/shared";
-import { assert } from "chai";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { setupBefore } from "@tests/before.js";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
-import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { CusService } from "@/internal/customers/CusService.js";
-import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-import { products, referralPrograms } from "../../../global.js";
-
-export const group = "referrals15";
-
-describe(`${chalk.yellowBright(
-	"referrals15: Testing referrals - referrer starts with no product, gets pro_amount discount - immediate, both - coupon-based",
-)}`, () => {
-	const mainCustomerId = "main-referral-15";
-	const redeemer = "referral15-r1";
-	const redeemerPM = "success";
-	const autumn: AutumnInt = new AutumnInt();
-	let stripeCli: Stripe;
-	const testClockIds: string[] = [];
-	let referralCode: ReferralCode;
-
-	let redemption: RewardRedemption;
-	let db: DrizzleCli;
-	let org: Organization;
-	let env: AppEnv;
-
-	before(async function () {
-		await setupBefore(this);
-		stripeCli = this.stripeCli;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		try {
-			await Promise.all([
-				autumn.customers.delete(mainCustomerId, { deleteInStripe: true }),
-				autumn.customers.delete(redeemer, { deleteInStripe: true }),
-				RewardRedemptionService._resetCustomerRedemptions({
-					db,
-					internalCustomerId: [mainCustomerId, redeemer],
-				}),
-			]);
-		} catch {}
-
-		// Initialize main customer with NO paid product (just free tier)
-		const res = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: mainCustomerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		testClockIds.push(res.testClockId);
-
-		const redeemerRes = await initCustomer({
-			autumn: this.autumnJs,
-			customerId: redeemer,
-			db: this.db,
-			org: this.org,
-			env: this.env,
-			attachPm: redeemerPM,
-			withTestClock: true,
-		});
-
-		testClockIds.push(redeemerRes.testClockId);
-	});
-
-	it("should advance clock 10 days before redeeming", async () => {
-		// Advance 10 days after setup
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 10,
-					waitForSeconds: 10,
-					stripeCli,
-				}),
-			),
-		);
-	});
-
-	it("should create code once", async () => {
-		referralCode = await autumn.referrals.createCode({
-			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateAll.id,
-		});
-
-		assert.exists(referralCode.code);
-
-		// Get referral code again
-		const referralCode2 = await autumn.referrals.createCode({
-			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateAll.id,
-		});
-
-		assert.equal(referralCode2.code, referralCode.code);
-	});
-
-	it("should create redemption for redeemer and fail if redeemed again", async () => {
-		redemption = await autumn.referrals.redeem({
-			customerId: redeemer,
-			code: referralCode.code,
-		});
-
-		// Try redeem for redeemer again
-		try {
-			await autumn.referrals.redeem({
-				customerId: redeemer,
-				code: referralCode.code,
-			});
-			assert.fail("Should not be able to redeem again");
-		} catch (error) {
-			assert.instanceOf(error, AutumnError);
-			assert.equal(error.code, ErrCode.CustomerAlreadyRedeemedReferralCode);
-		}
-	});
-
-	it("should have both referrer and redeemer get pro product", async () => {
-		const redemptionResult = await autumn.redemptions.get(redemption.id);
-		assert.equal(redemptionResult.redeemer_applied, true);
-
-		const mainCus = await autumn.customers.get(mainCustomerId);
-		const redeemerCus = await autumn.customers.get(redeemer);
-		const mainProds = mainCus.products;
-		const redeemerProds = redeemerCus.products;
-
-		// Main customer (referrer) should now have the pro product
-		assert.equal(mainProds.length, 1);
-		assert.equal(mainProds[0].id, products.pro.id);
-
-		// Redeemer should also have the pro product (both get reward)
-		assert.equal(redeemerProds.length, 1);
-		assert.equal(redeemerProds[0].id, products.pro.id);
-
-		expectProductV1Attached({
-			customer: mainCus,
-			product: products.pro,
-			status: CusProductStatus.Active,
-		});
-
-		expectProductV1Attached({
-			customer: redeemerCus,
-			product: products.pro,
-			status: CusProductStatus.Active,
-		});
-	});
-
-	it("should advance test clock and verify both customers get pro_amount discount on Pro cycle", async () => {
-		// Advance 31 days from current time to trigger next billing cycle
-		// Coupon was applied on day 10, lasts 30 days, so should still be active on day 31
-		await Promise.all(
-			testClockIds.map((x) =>
-				advanceTestClock({
-					testClockId: x,
-					numberOfDays: 31,
-					waitForSeconds: 25,
-					stripeCli,
-				}),
-			),
-		);
-
-		// Test that both customers' Pro invoices have pro_amount discount applied
-		const [mainCustomerWithInvoices, redeemerWithInvoices] = await Promise.all([
-			autumn.customers.get(mainCustomerId, {
-				expand: [CusExpand.Invoices],
-			}),
-			autumn.customers.get(redeemer, {
-				expand: [CusExpand.Invoices],
-			}),
-		]);
-
-		// console.log(
-		// 	"Main Customer Invoices:\n",
-		// 	mainCustomerWithInvoices.invoices
-		// 		.map(
-		// 			(x) =>
-		// 				`${x.product_ids.join(", ")}: ${x.total} | ${new Date(x.created_at).toLocaleDateString()}`,
-		// 		)
-		// 		.join("\n"),
-		// );
-
-		// console.log(
-		// 	"Redeemer Invoices:\n",
-		// 	redeemerWithInvoices.invoices
-		// 		.map(
-		// 			(x) =>
-		// 				`${x.product_ids.join(", ")}: ${x.total} | ${new Date(x.created_at).toLocaleDateString()}`,
-		// 		)
-		// 		.join("\n"),
-		// );
-
-		// Check main customer (referrer) invoice
-		const mainProInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
-		);
-		if (mainProInvoice) {
-			// Pro costs $10, so with pro_amount discount it should be $0 (Pro - Pro amount = $0)
-			const proPrice = products.pro.prices[0].config.amount; // $10
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-			const expectedTotal = proPrice - proAmount; // $0
-
-			// console.log("Main customer expected total:", expectedTotal);
-			// console.log("Main customer Pro invoice total:", mainProInvoice.total);
-
-			assert.equal(
-				mainProInvoice.total,
-				expectedTotal,
-				`Main customer Pro invoice should be $0 (Pro $10 - Pro amount $10 discount). Got $${mainProInvoice.total}`,
-			);
-		}
-
-		// Check redeemer invoice
-		const redeemerProInvoice = redeemerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
-		);
-		if (redeemerProInvoice) {
-			// Pro costs $10, so with pro_amount discount it should be $0 (Pro - Pro amount = $0)
-			const proPrice = products.pro.prices[0].config.amount; // $10
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-			const expectedTotal = proPrice - proAmount; // $0
-
-			// console.log("Redeemer expected total:", expectedTotal);
-			// console.log("Redeemer Pro invoice total:", redeemerProInvoice.total);
-
-			assert.equal(
-				redeemerProInvoice.total,
-				expectedTotal,
-				`Redeemer Pro invoice should be $0 (Pro $10 - Pro amount $10 discount). Got $${redeemerProInvoice.total}`,
-			);
-		}
-
-		const dbCustomers = await Promise.all(
-			[mainCustomerId, redeemer].map((x) =>
-				CusService.getFull({
-					db,
-					idOrInternalId: x,
-					orgId: org.id,
-					env,
-					inStatuses: [
-						CusProductStatus.Active,
-						CusProductStatus.PastDue,
-						CusProductStatus.Expired,
-					],
-				}),
-			),
-		);
-
-		const expectedProducts = [
-			[
-				// Main referrer - has Pro with pro_amount discount applied
-				{ name: "Free", status: CusProductStatus.Expired },
-				{ name: "Pro", status: CusProductStatus.Active },
-			],
-			[
-				// Redeemer - also has Pro with pro_amount discount applied
-				{ name: "Free", status: CusProductStatus.Expired },
-				{ name: "Pro", status: CusProductStatus.Active },
-			],
-		];
-
-		dbCustomers.forEach((customer, index) => {
-			const expectedProductsForCustomer = expectedProducts[index];
-			expectedProductsForCustomer.forEach((expectedProduct) => {
-				const matchingProduct = customer.customer_products.find(
-					(cp) =>
-						cp.product.name === expectedProduct.name &&
-						cp.status === expectedProduct.status,
-				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
-
-				assert.exists(
-					matchingProduct,
-					`Customer ${customer.name} should have ${expectedProduct.name} product with status ${expectedProduct.status}. ${unMatchedProduct ? `However ${unMatchedProduct.product.name} with status ${unMatchedProduct.status} was found instead` : ""}`,
-				);
-			});
-		});
-	});
-});
diff --git a/server/tests/advanced/referrals/paid/referrals15.test.ts b/server/tests/advanced/referrals/paid/referrals15.test.ts
index 34deaa7d8..c4940956f 100644
--- a/server/tests/advanced/referrals/paid/referrals15.test.ts
+++ b/server/tests/advanced/referrals/paid/referrals15.test.ts
@@ -1,27 +1,92 @@
+import { beforeAll, describe, expect, test } from "bun:test";
 import {
 	type AppEnv,
+	CouponDurationType,
+	type CreateReward,
+	type CreateRewardProgram,
 	CusExpand,
 	CusProductStatus,
 	ErrCode,
 	type Organization,
 	type ReferralCode,
+	RewardReceivedBy,
 	type RewardRedemption,
+	RewardTriggerEvent,
+	RewardType,
 } from "@autumn/shared";
-import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
-import type { Stripe } from "stripe";
-import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { TestFeature } from "@tests/setup/v2Features.js";
+import { expectProductAttached } from "@tests/utils/expectUtils/expectProductAttached.js";
+import { createReferralProgram } from "@tests/utils/productUtils.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import type { Stripe } from "stripe";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
 import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { CusService } from "@/internal/customers/CusService.js";
 import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
+import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
+import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
-import { products, referralPrograms } from "../../../global.js";
+import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
 
 export const group = "referrals15";
 
+const testCase = "referrals15";
+
+// Define products inline
+const freeProd = constructProduct({
+	id: "free",
+	type: "free",
+	isDefault: true,
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 5,
+		}),
+	],
+});
+
+const proProd = constructProduct({
+	id: "pro",
+	type: "pro",
+	items: [
+		constructFeatureItem({
+			featureId: TestFeature.Dashboard,
+			isBoolean: true,
+		}),
+		constructFeatureItem({
+			featureId: TestFeature.Messages,
+			includedUsage: 10,
+		}),
+	],
+});
+
+// Reward: pro_amount discount (coupon-based)
+const proAmountReward: CreateReward = {
+	id: `${testCase}ProAmount`,
+	name: "Pro Amount Discount",
+	type: RewardType.PercentageDiscount,
+	promo_codes: [],
+	discount_config: {
+		discount_value: 10, // $10 off (pro_amount)
+		duration_type: CouponDurationType.Months,
+		duration_value: 1,
+		apply_to_all: true,
+		price_ids: [],
+	},
+};
+
+// Referral program: triggers immediately, applies to both referrer and redeemer
+const paidProductImmediateAll: CreateRewardProgram = {
+	id: `${testCase}ImmediateAll`,
+	when: RewardTriggerEvent.CustomerCreation,
+	product_ids: [proProd.id],
+	internal_reward_id: proAmountReward.id,
+	max_redemptions: 10,
+	received_by: RewardReceivedBy.All,
+};
+
 describe(`${chalk.yellowBright(
 	"referrals15: Testing referrals - referrer starts with no product, gets pro_amount discount - immediate, both - coupon-based",
 )}`, () => {
@@ -55,6 +120,24 @@ describe(`${chalk.yellowBright(
 			]);
 		} catch {}
 
+		// Initialize products first
+		await initProductsV0({
+			ctx,
+			products: [freeProd, proProd],
+			prefix: testCase,
+			customerId: mainCustomerId,
+		});
+
+		// Create referral program
+		await createReferralProgram({
+			db,
+			orgId: org.id,
+			env,
+			autumn: new AutumnInt({ secretKey: ctx.orgSecretKey }),
+			reward: proAmountReward,
+			rewardProgram: paidProductImmediateAll,
+		});
+
 		// Initialize main customer with NO paid product (just free tier)
 		const res = await initCustomerV3({
 			ctx,
@@ -91,7 +174,7 @@ describe(`${chalk.yellowBright(
 	test("should create code once", async () => {
 		referralCode = await autumn.referrals.createCode({
 			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateAll.id,
+			referralId: paidProductImmediateAll.id,
 		});
 
 		expect(referralCode.code).toBeDefined();
@@ -99,7 +182,7 @@ describe(`${chalk.yellowBright(
 		// Get referral code again
 		const referralCode2 = await autumn.referrals.createCode({
 			customerId: mainCustomerId,
-			referralId: referralPrograms.paidProductImmediateAll.id,
+			referralId: paidProductImmediateAll.id,
 		});
 
 		expect(referralCode2.code).toBe(referralCode.code);
@@ -120,7 +203,9 @@ describe(`${chalk.yellowBright(
 			throw new Error("Should not be able to redeem again");
 		} catch (error) {
 			expect(error).toBeInstanceOf(AutumnError);
-			expect((error as AutumnError).code).toBe(ErrCode.CustomerAlreadyRedeemedReferralCode);
+			expect((error as AutumnError).code).toBe(
+				ErrCode.CustomerAlreadyRedeemedReferralCode,
+			);
 		}
 	});
 
@@ -135,21 +220,21 @@ describe(`${chalk.yellowBright(
 
 		// Main customer (referrer) should now have the pro product
 		expect(mainProds.length).toBe(1);
-		expect(mainProds[0].id).toBe(products.pro.id);
+		expect(mainProds[0].id).toBe(proProd.id);
 
 		// Redeemer should also have the pro product (both get reward)
 		expect(redeemerProds.length).toBe(1);
-		expect(redeemerProds[0].id).toBe(products.pro.id);
+		expect(redeemerProds[0].id).toBe(proProd.id);
 
-		expectProductV1Attached({
+		expectProductAttached({
 			customer: mainCus,
-			product: products.pro,
+			product: proProd,
 			status: CusProductStatus.Active,
 		});
 
-		expectProductV1Attached({
+		expectProductAttached({
 			customer: redeemerCus,
-			product: products.pro,
+			product: proProd,
 			status: CusProductStatus.Active,
 		});
 	});
@@ -180,26 +265,26 @@ describe(`${chalk.yellowBright(
 
 		// Check main customer (referrer) invoice
 		const mainProInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
+			x.product_ids.includes(proProd.id),
 		);
 		if (mainProInvoice) {
-			// Pro costs $10, so with pro_amount discount it should be $0 (Pro - Pro amount = $0)
-			const proPrice = products.pro.prices[0].config.amount; // $10
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-			const expectedTotal = proPrice - proAmount; // $0
+			// Pro costs $20, so with $10 discount it should be $10
+			const proPrice = 20; // Pro product base price
+			const proAmount = 10; // Discount amount (pro_amount)
+			const expectedTotal = proPrice - proAmount; // $10
 
 			expect(mainProInvoice.total).toBe(expectedTotal);
 		}
 
 		// Check redeemer invoice
 		const redeemerProInvoice = redeemerWithInvoices.invoices.find((x) =>
-			x.product_ids.includes(products.pro.id),
+			x.product_ids.includes(proProd.id),
 		);
 		if (redeemerProInvoice) {
-			// Pro costs $10, so with pro_amount discount it should be $0 (Pro - Pro amount = $0)
-			const proPrice = products.pro.prices[0].config.amount; // $10
-			const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-			const expectedTotal = proPrice - proAmount; // $0
+			// Pro costs $20, so with $10 discount it should be $10
+			const proPrice = 20; // Pro product base price
+			const proAmount = 10; // Discount amount (pro_amount)
+			const expectedTotal = proPrice - proAmount; // $10
 
 			expect(redeemerProInvoice.total).toBe(expectedTotal);
 		}
@@ -241,9 +326,6 @@ describe(`${chalk.yellowBright(
 						cp.product.name === expectedProduct.name &&
 						cp.status === expectedProduct.status,
 				);
-				const unMatchedProduct = customer.customer_products.find(
-					(cp) => cp.product.name === expectedProduct.name,
-				);
 
 				expect(matchingProduct).toBeDefined();
 			});
diff --git a/server/tests/advanced/referrals/paid/referrals16.backup.ts b/server/tests/advanced/referrals/paid/referrals16.backup.ts
deleted file mode 100644
index 2b47ff965..000000000
--- a/server/tests/advanced/referrals/paid/referrals16.backup.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-// import {
-//   type AppEnv,
-//   CusExpand,
-//   CusProductStatus,
-//   ErrCode,
-//   type Organization,
-//   type ReferralCode,
-//   type RewardRedemption,
-// } from "@autumn/shared";
-// import { assert } from "chai";
-// import chalk from "chalk";
-// import type { Stripe } from "stripe";
-// import { setupBefore } from "@tests/before.js";
-// import { expectProductV1Attached } from "@tests/utils/expectUtils/expectProductAttached.js";
-// import {
-//   advanceTestClock,
-//   completeCheckoutForm,
-// } from "@tests/utils/stripeUtils.js";
-// import type { DrizzleCli } from "@/db/initDrizzle.js";
-// import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
-// import { CusService } from "@/internal/customers/CusService.js";
-// import { RewardRedemptionService } from "@/internal/rewards/RewardRedemptionService.js";
-// import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-// import { products, referralPrograms, rewards } from "../../../global.js";
-
-// export const group = "referrals16";
-
-// describe(`${chalk.yellowBright(
-//   "referrals16: Testing referrals - referrer starts with no product, gets pro_amount discount - checkout, both - coupon-based"
-// )}`, () => {
-//   const mainCustomerId = "main-referral-16";
-//   const redeemer = "referral16-r1";
-//   const redeemerPM = "success";
-//   const autumn: AutumnInt = new AutumnInt();
-//   let stripeCli: Stripe;
-//   const testClockIds: string[] = [];
-//   let referralCode: ReferralCode;
-
-//   let redemption: RewardRedemption;
-//   let db: DrizzleCli;
-//   let org: Organization;
-//   let env: AppEnv;
-
-//   before(async function () {
-//     await setupBefore(this);
-//     stripeCli = this.stripeCli;
-//     db = this.db;
-//     org = this.org;
-//     env = this.env;
-
-//     try {
-//       await Promise.all([
-//         autumn.customers.delete(mainCustomerId, { deleteInStripe: true }),
-//         autumn.customers.delete(redeemer, { deleteInStripe: true }),
-//         RewardRedemptionService._resetCustomerRedemptions({
-//           db,
-//           internalCustomerId: [mainCustomerId, redeemer],
-//         }),
-//       ]);
-//     } catch {}
-
-//     // Initialize main customer with NO paid product (just free tier)
-//     const res = await initCustomer({
-//       autumn: this.autumnJs,
-//       customerId: mainCustomerId,
-//       db,
-//       org,
-//       env,
-//       attachPm: "success",
-//     });
-
-//     testClockIds.push(res.testClockId);
-
-//     const redeemerRes = await initCustomer({
-//       autumn: this.autumnJs,
-//       customerId: redeemer,
-//       db: this.db,
-//       org: this.org,
-//       env: this.env,
-//       attachPm: redeemerPM,
-//       withTestClock: true,
-//     });
-
-//     testClockIds.push(redeemerRes.testClockId);
-//   });
-
-//   it("should advance clock 10 days before redeeming", async () => {
-//     // Advance 10 days after setup
-//     await Promise.all(
-//       testClockIds.map((x) =>
-//         advanceTestClock({
-//           testClockId: x,
-//           numberOfDays: 10,
-//           waitForSeconds: 10,
-//           stripeCli,
-//         })
-//       )
-//     );
-//   });
-
-//   it("should create code once", async () => {
-//     referralCode = await autumn.referrals.createCode({
-//       customerId: mainCustomerId,
-//       referralId: referralPrograms.paidProductCheckoutAll.id,
-//     });
-
-//     assert.exists(referralCode.code);
-
-//     // Get referral code again
-//     const referralCode2 = await autumn.referrals.createCode({
-//       customerId: mainCustomerId,
-//       referralId: referralPrograms.paidProductCheckoutAll.id,
-//     });
-
-//     assert.equal(referralCode2.code, referralCode.code);
-//   });
-
-//   it("should create redemption for redeemer and fail if redeemed again", async () => {
-//     redemption = await autumn.referrals.redeem({
-//       customerId: redeemer,
-//       code: referralCode.code,
-//     });
-
-//     // Try redeem for redeemer again
-//     try {
-//       await autumn.referrals.redeem({
-//         customerId: redeemer,
-//         code: referralCode.code,
-//       });
-//       assert.fail("Should not be able to redeem again");
-//     } catch (error) {
-//       assert.instanceOf(error, AutumnError);
-//       assert.equal(error.code, ErrCode.CustomerAlreadyRedeemedReferralCode);
-//     }
-//   });
-
-//   it("should have referrer and redeemer still on free tier (reward not triggered yet)", async () => {
-//     const redemptionResult = await autumn.redemptions.get(redemption.id);
-//     assert.equal(redemptionResult.triggered, false); // Checkout trigger not fired yet
-
-//     const mainCus = await autumn.customers.get(mainCustomerId);
-//     const redeemerCus = await autumn.customers.get(redeemer);
-//     const mainProds = mainCus.products;
-//     const redeemerProds = redeemerCus.products;
-
-//     // Both customers should still only have free product
-//     assert.equal(mainProds.length, 1);
-//     assert.equal(mainProds[0].id, products.free.id);
-
-//     assert.equal(redeemerProds.length, 1);
-//     assert.equal(redeemerProds[0].id, products.free.id);
-
-//     expectProductV1Attached({
-//       customer: mainCus,
-//       product: products.free,
-//       status: CusProductStatus.Active,
-//     });
-
-//     expectProductV1Attached({
-//       customer: redeemerCus,
-//       product: products.free,
-//       status: CusProductStatus.Active,
-//     });
-//   });
-
-//   it("should trigger reward when redeemer checks out with Premium", async () => {
-//     // Redeemer purchases Premium product (triggers checkout reward)
-//     const checkoutRes = await autumn.attach({
-//       customer_id: redeemer,
-//       product_id: products.premium.id,
-//       force_checkout: true,
-//     });
-
-//     await completeCheckoutForm(checkoutRes.checkout_url);
-
-//     // Wait a bit for webhook processing
-//     await new Promise((resolve) => setTimeout(resolve, 10000));
-
-//     // Now both customers should have the reward applied
-//     const redemptionResult = await autumn.redemptions.get(redemption.id);
-
-//     assert.equal(redemptionResult.applied, true);
-
-//     const mainCus = await autumn.customers.get(mainCustomerId);
-//     const redeemerCus = await autumn.customers.get(redeemer);
-//     const mainProds = mainCus.products;
-//     const redeemerProds = redeemerCus.products;
-
-//     // Main customer (referrer) should now have the pro product
-//     assert.equal(mainProds.length, 1);
-//     assert.equal(mainProds[0].id, products.pro.id);
-
-//     // Redeemer should have both Premium (purchased) and the Pro price discount
-//     assert.equal(redeemerProds.length, 1);
-//     const redeemerStripeDiscounts = await stripeCli.subscriptions.retrieve(
-//       redeemerProds.find((x) => x.id === products.premium.id)
-//         ?.subscription_ids?.[0]!,
-//       {
-//         expand: ["discounts"],
-//       }
-//     );
-
-//     const parsedDiscountID = redeemerStripeDiscounts.discounts.find((x) => {
-//       if (typeof x === "string") {
-//         return x;
-//       } else if (typeof x === "object") {
-//         return x.coupon.id;
-//       } else return null;
-//     })!;
-
-//     assert.equal(
-//       redeemerStripeDiscounts.discounts.length,
-//       1,
-//       `Redeemer Stripe Discounts: ${JSON.stringify(redeemerStripeDiscounts.discounts, null, 4)}`
-//     );
-//     assert.equal(
-//       typeof parsedDiscountID === "object"
-//         ? parsedDiscountID.coupon.id
-//         : parsedDiscountID,
-//       rewards.paidProductWithConfig.id,
-//       `Parsed Discount ID: ${parsedDiscountID}`
-//     );
-
-//     assert.exists(
-//       redeemerProds.find((x) => x.id === products.premium.id),
-//       `Redeemer must have Premium product`
-//     );
-
-//     expectProductV1Attached({
-//       customer: mainCus,
-//       product: products.pro,
-//       status: CusProductStatus.Active,
-//     });
-
-//     expectProductV1Attached({
-//       customer: redeemerCus,
-//       product: products.premium,
-//       status: CusProductStatus.Active,
-//     });
-//   });
-
-//   it("should advance test clock and verify both customers get pro_amount discount on their cycles", async () => {
-//     // Advance 31 days from current time to trigger next billing cycle
-//     await Promise.all(
-//       testClockIds.map((x) =>
-//         advanceTestClock({
-//           testClockId: x,
-//           numberOfDays: 31,
-//           waitForSeconds: 25,
-//           stripeCli,
-//         })
-//       )
-//     );
-
-//     // Test that both customers' invoices have pro_amount discount applied
-//     const [mainCustomerWithInvoices, redeemerWithInvoices] = await Promise.all([
-//       autumn.customers.get(mainCustomerId, {
-//         expand: [CusExpand.Invoices],
-//       }),
-//       autumn.customers.get(redeemer, {
-//         expand: [CusExpand.Invoices],
-//       }),
-//     ]);
-
-//     // Check main customer (referrer) Pro invoice
-//     const mainProInvoice = mainCustomerWithInvoices.invoices.find((x) =>
-//       x.product_ids.includes(products.pro.id)
-//     );
-//     if (mainProInvoice) {
-//       // Pro costs $10, so with pro_amount discount it should be $0 (Pro - Pro amount = $0)
-//       const proPrice = products.pro.prices[0].config.amount; // $10
-//       const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-//       const expectedTotal = proPrice - proAmount; // $0
-
-//       // console.log("Main customer expected total:", expectedTotal);
-//       // console.log("Main customer Pro invoice total:", mainProInvoice.total);
-
-//       assert.equal(
-//         mainProInvoice.total,
-//         expectedTotal,
-//         `Main customer Pro invoice should be $0 (Pro $10 - Pro amount $10 discount). Got $${mainProInvoice.total}`
-//       );
-//     }
-
-//     // Check redeemer Premium invoice (should have $10 off)
-//     const redeemerPremiumInvoice = redeemerWithInvoices.invoices.find((x) =>
-//       x.product_ids.includes(products.premium.id)
-//     );
-//     if (redeemerPremiumInvoice) {
-//       // Premium costs $50, so with pro_amount discount it should be $40 (Premium - Pro amount = $40)
-//       const premiumPrice = products.premium.prices[0].config.amount; // $50
-//       const proAmount = products.pro.prices[0].config.amount; // $10 (pro_amount discount)
-//       const expectedTotal = premiumPrice - proAmount; // $40
-
-//       assert.equal(
-//         redeemerPremiumInvoice.total,
-//         expectedTotal,
-//         `Redeemer Premium invoice should be $40 (Premium $50 - Pro amount $10 discount). Got $${redeemerPremiumInvoice.total}`
-//       );
-//     }
-
-//     const dbCustomers = await Promise.all(
-//       [mainCustomerId, redeemer].map((x) =>
-//         CusService.getFull({
-//           db,
-//           idOrInternalId: x,
-//           orgId: org.id,
-//           env,
-//           inStatuses: [
-//             CusProductStatus.Active,
-//             CusProductStatus.PastDue,
-//             CusProductStatus.Expired,
-//           ],
-//         })
-//       )
-//     );
-
-//     const expectedProducts = [
-//       [
-//         // Main referrer - has Pro with pro_amount discount applied
-//         { name: "Free", status: CusProductStatus.Expired },
-//         { name: "Pro", status: CusProductStatus.Active },
-//       ],
-//       [
-//         // Redeemer - has both Premium (purchased) and Pro (reward) with discounts
-//         { name: "Free", status: CusProductStatus.Expired },
-//         { name: "Pro", status: CusProductStatus.Active },
-//         { name: "Premium", status: CusProductStatus.Active },
-//       ],
-//     ];
-
-//     dbCustomers.forEach((customer, index) => {
-//       const expectedProductsForCustomer = expectedProducts[index];
-//       expectedProductsForCustomer.forEach((expectedProduct) => {
-//         const matchingProduct = customer.customer_products.find(
-//           (cp) =>
-//             cp.product.name === expectedProduct.name &&
-//             cp.status === expectedProduct.status
-//         );
-//         const unMatchedProduct = customer.customer_products.find(
-//           (cp) => cp.product.name === expectedProduct.name
-//         );
-
-//         assert.exists(
-//           matchingProduct,
-//           `Customer ${customer.name} should have ${expectedProduct.name} product with status ${expectedProduct.status}. ${unMatchedProduct ? `However ${unMatchedProduct.product.name} with status ${unMatchedProduct.status} was found instead` : ""}`
-//         );
-//       });
-//     });
-//   });
-// });
diff --git a/server/tests/advanced/referrals/referrals2.test.ts b/server/tests/advanced/referrals/referrals2.test.ts
index 308b95867..1f2fbb320 100644
--- a/server/tests/advanced/referrals/referrals2.test.ts
+++ b/server/tests/advanced/referrals/referrals2.test.ts
@@ -13,14 +13,14 @@ import {
 	RewardTriggerEvent,
 	RewardType,
 } from "@autumn/shared";
-import chalk from "chalk";
-import { addDays } from "date-fns";
-import type { Stripe } from "stripe";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { timeout } from "@tests/utils/genUtils.js";
 import { createReferralProgram } from "@tests/utils/productUtils.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import { addDays } from "date-fns";
+import type { Stripe } from "stripe";
 import AutumnError, { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { createStripeCli } from "@/external/connect/createStripeCli.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
diff --git a/server/tests/advanced/rollovers/rollover1.test.ts b/server/tests/advanced/rollovers/rollover1.test.ts
index 405c987ca..123ddceb6 100644
--- a/server/tests/advanced/rollovers/rollover1.test.ts
+++ b/server/tests/advanced/rollovers/rollover1.test.ts
@@ -123,6 +123,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing rollovers for feature item`
 		// @ts-expect-error
 		expect(nonCachedMsgesFeature?.rollovers[0].balance).toBe(expectedRollover);
 	});
+	return;
 
 	// let usage2 = 50;
 	test("should reset again and have correct rollover", async () => {
diff --git a/server/tests/advanced/rollovers/rolloverTestUtils.ts b/server/tests/advanced/rollovers/rolloverTestUtils.ts
index 57ca36f07..59e3f7924 100644
--- a/server/tests/advanced/rollovers/rolloverTestUtils.ts
+++ b/server/tests/advanced/rollovers/rolloverTestUtils.ts
@@ -34,7 +34,6 @@ export const resetAndGetCusEnt = async ({
 			...cusEnt!,
 			customer,
 		},
-		cacheEnabledOrgs: [],
 	});
 
 	if (updatedCusEnt) {
diff --git a/server/tests/advanced/usage/usage4.test.ts b/server/tests/advanced/usage/usage4.test.ts
index 04dd7f31f..3a3d6f1a8 100644
--- a/server/tests/advanced/usage/usage4.test.ts
+++ b/server/tests/advanced/usage/usage4.test.ts
@@ -4,12 +4,12 @@ import {
 	ProductItemInterval,
 	UsageModel,
 } from "@autumn/shared";
-import chalk from "chalk";
-import { Decimal } from "decimal.js";
-import type Stripe from "stripe";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { expectCustomerV0Correct } from "@tests/utils/expectUtils/expectCustomerV0Correct.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import { Decimal } from "decimal.js";
+import type Stripe from "stripe";
 import { constructPriceItem } from "@/internal/products/product-items/productItemUtils.js";
 import { convertProductV2ToV1 } from "@/internal/products/productUtils/productV2Utils/convertProductV2ToV1.js";
 import { constructRawProduct } from "@/utils/scriptUtils/createTestProducts.js";
@@ -136,7 +136,13 @@ describe(`${chalk.yellowBright("usage4: GPU starter annual")}`, () => {
 
 		const originalAllowance = Object.values(productV1.entitlements).find(
 			(ent: any) => ent.feature_id === TestFeature.Credits,
-		)?.allowance!;
+		)?.allowance;
+
+		if (!originalAllowance) {
+			throw new Error("Original allowance not found");
+		}
+
+		console.log(`Total credits used: ${totalCreditsUsed}`);
 
 		await checkCreditBalance({
 			customerId,
@@ -187,7 +193,11 @@ describe(`${chalk.yellowBright("usage4: GPU starter annual")}`, () => {
 
 		const originalAllowance = Object.values(productV1.entitlements).find(
 			(ent: any) => ent.feature_id === TestFeature.Credits,
-		)?.allowance!;
+		)?.allowance;
+
+		if (!originalAllowance) {
+			throw new Error("Original allowance not found");
+		}
 
 		await checkCreditBalance({
 			customerId,
diff --git a/server/tests/advanced/usageLimit/usageLimit4.test.ts b/server/tests/advanced/usageLimit/usageLimit4.test.ts
index 7748aa387..59dd58ef0 100644
--- a/server/tests/advanced/usageLimit/usageLimit4.test.ts
+++ b/server/tests/advanced/usageLimit/usageLimit4.test.ts
@@ -1,15 +1,15 @@
-import { beforeAll, describe, expect, test } from "bun:test";
-import { LegacyVersion, type LimitedItem } from "@autumn/shared";
-import chalk from "chalk";
-import type Stripe from "stripe";
+import { beforeAll, describe, test } from "bun:test";
+import { ErrCode, LegacyVersion, type LimitedItem } from "@autumn/shared";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { constructArrearProratedItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
 import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
+import { expectAutumnError } from "../../utils/expectUtils/expectErrUtils";
 
 const messageItem = constructArrearProratedItem({
 	featureId: TestFeature.Users,
@@ -28,11 +28,8 @@ const testCase = "usageLimit4";
 describe(`${chalk.yellowBright(`${testCase}: Testing usage limits for cont use item`)}`, () => {
 	const customerId = testCase;
 	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let stripeCli: Stripe;
 
 	beforeAll(async () => {
-		stripeCli = ctx.stripeCli;
-
 		await initProductsV0({
 			ctx,
 			products: [pro],
@@ -60,19 +57,16 @@ describe(`${chalk.yellowBright(`${testCase}: Testing usage limits for cont use i
 		});
 	});
 
-	test("should attach pro product and have usage deducted to usage limit", async () => {
-		await autumn.track({
-			customer_id: customerId,
-			feature_id: TestFeature.Users,
-			value: messageItem.usage_limit! + 1,
+	test("should track usage exceeding usage limit and get an error (for paid-allocated can't track if usage limit is exceeded)", async () => {
+		await expectAutumnError({
+			errCode: ErrCode.InsufficientBalance,
+			func: async () => {
+				await autumn.track({
+					customer_id: customerId,
+					feature_id: TestFeature.Users,
+					value: messageItem.usage_limit! + 1,
+				});
+			},
 		});
-
-		const check = await autumn.check({
-			customer_id: customerId,
-			feature_id: TestFeature.Users,
-		});
-
-		expect(check.balance).toBe(1);
-		expect(check.allowed).toBe(true);
 	});
 });
diff --git a/server/tests/archives/03_cancel.ts b/server/tests/archives/03_cancel.ts
deleted file mode 100644
index 28bae415d..000000000
--- a/server/tests/archives/03_cancel.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-// import { AutumnCli } from "../cli/AutumnCli.js";
-// import { features, products } from "../global.js";
-// import { initCustomer } from "../utils/init.js";
-// import { timeout } from "../utils/genUtils.js";
-// import chalk from "chalk";
-// import {
-//   checkFeatureHasCorrectBalance,
-//   compareMainProduct,
-// } from "../utils/compare.js";
-// import { expect } from "chai";
-// import {
-//   advanceTestClock,
-//   completeCheckoutForm,
-// } from "../utils/stripeUtils.js";
-// import { CusProductStatus } from "@autumn/shared";
-// import { attachFailedPaymentMethod } from "@/external/stripe/stripeCusUtils.js";
-// import { addDays, addMonths } from "date-fns";
-
-// describe(`${chalk.yellowBright(
-//   "03_cancel: Testing cancel (at period end and now)",
-// )}`, () => {
-//   const customerId = "cancelCustomer";
-
-//   before(async function () {
-//     this.timeout(30000);
-
-//     await initCustomer({
-//       customer_data: {
-//         id: customerId,
-//         name: "Test Customer",
-//         email: "test@test.com",
-//       },
-//       db: this.db,
-//       org: this.org,
-//       env: this.env,
-//     });
-//   });
-
-//   it("should attach pro product", async function () {
-//     this.timeout(30000);
-
-//     const res: any = await AutumnCli.attach({
-//       customerId: customerId,
-//       productId: products.pro.id,
-//     });
-
-//     await completeCheckoutForm(res.checkout_url);
-//     await timeout(5000);
-//     console.log(`   ${chalk.greenBright("Attached pro product")}`);
-//   });
-
-//   // 1. Cancel pro product
-//   it("should cancel pro product (at period end)", async function () {
-//     this.timeout(10000);
-
-//     const stripeCli = createStripeCli({ org: this.org, env: this.env });
-
-//     // 1. Cancel pro product
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-
-//     const proProduct = cusRes.products.find(
-//       (p: any) => p.id === products.pro.id,
-//     );
-
-//     for (const subId of proProduct.subscription_ids) {
-//       await stripeCli.subscriptions.update(subId, {
-//         cancel_at_period_end: true,
-//       });
-//     }
-
-//     await timeout(3000);
-//     console.log(`   ${chalk.greenBright("Cancelled pro product")}`);
-//   });
-
-//   it("should have pro product active, and canceled_at != null", async function () {
-//     this.timeout(10000);
-
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-//     compareMainProduct({
-//       sent: products.pro,
-//       cusRes: cusRes,
-//     });
-
-//     const proProduct = cusRes.products.find(
-//       (p: any) => p.id === products.pro.id,
-//     );
-//     expect(proProduct.canceled_at).to.not.equal(null);
-//     expect(proProduct.status).to.equal(CusProductStatus.Active);
-//   });
-
-//   // CANCEL SUB NOW, SUBSCRIPTION.DELETED WEBHOOK
-//   it("should cancel pro product (now)", async function () {
-//     this.timeout(10000);
-
-//     const stripeCli = createStripeCli({ org: this.org, env: this.env });
-
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-//     const proProduct = cusRes.products.find(
-//       (p: any) => p.id === products.pro.id,
-//     );
-
-//     for (const subId of proProduct.subscription_ids) {
-//       await stripeCli.subscriptions.cancel(subId);
-//     }
-
-//     await timeout(3000);
-//     console.log(`   ${chalk.greenBright("Cancelled pro product now")}`);
-//   });
-
-//   it("should have free product active, and pro product not returned", async function () {
-//     this.timeout(10000);
-
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-//     compareMainProduct({
-//       sent: products.free,
-//       cusRes: cusRes,
-//     });
-//   });
-
-//   it("should have correct entitlements (for free)", async function () {
-//     for (const entitlement of Object.values(products.free.entitlements)) {
-//       let feature = features[entitlement.feature_id!];
-//       await checkFeatureHasCorrectBalance({
-//         customerId,
-//         feature: feature,
-//         entitlement,
-//         expectedBalance: entitlement.allowance || 0,
-//       });
-//     }
-//   });
-// });
-
-// describe(`${chalk.yellowBright(
-//   "03_cancel: Testing subscription past_due",
-// )}`, () => {
-//   const customerId = "03_cancel_past_due";
-
-//   before(async function () {
-//     this.timeout(30000);
-
-//     const stripeCli = createStripeCli({ org: this.org, env: this.env });
-
-//     const testClock = await stripeCli.testHelpers.testClocks.create({
-//       frozen_time: Math.round(Date.now() / 1000),
-//     });
-
-//     this.testClockId = testClock.id;
-
-//     await initCustomer({
-//       customer_data: {
-//         id: customerId,
-//         name: "Test Customer",
-//         email: "test@test.com",
-//       },
-//       db: this.db,
-//       org: this.org,
-//       env: this.env,
-//       attachPm: true,
-//       testClockId: testClock.id,
-//     });
-//   });
-
-//   it("should attach pro product", async function () {
-//     this.timeout(10000);
-
-//     await AutumnCli.attach({
-//       customerId: customerId,
-//       productId: products.pro.id,
-//     });
-//   });
-
-//   it("should attach failed payment method and advance to next billing date", async function () {
-//     // 1. Swap customer's card
-//     const stripeCli = createStripeCli({ org: this.org, env: this.env });
-
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-
-//     await attachFailedPaymentMethod({
-//       stripeCli,
-//       customer: cusRes.customer,
-//     });
-
-//     // const advanceDate = addDays(addMonths(new Date(), 1), 1);
-//     // await stripeCli.testHelpers.testClocks.advance(this.testClockId, {
-//     //   frozen_time: Math.round(advanceDate.getTime() / 1000),
-//     // });
-
-//     await advanceTestClock({
-//       stripeCli,
-//       testClockId: this.testClockId,
-//       advanceTo: addDays(addMonths(new Date(), 1), 1).getTime(),
-//     });
-//   });
-
-//   it("should have free product active and correct entitlements", async function () {
-//     const cusRes: any = await AutumnCli.getCustomer(customerId);
-//     // compareMainProduct({
-//     //   sent: products.free,
-//     //   cusRes: cusRes,
-//     // });
-
-//     // TODO: Check why this line messes up the test
-//     // compareProductEntitlements({
-//     //   customerId,
-//     //   product: products.free,
-//     //   features,
-//     // });
-//   });
-// });
diff --git a/server/tests/archives/entities1.ts b/server/tests/archives/entities1.ts
deleted file mode 100644
index f7f50d0ac..000000000
--- a/server/tests/archives/entities1.ts
+++ /dev/null
@@ -1,381 +0,0 @@
-// import { Autumn } from "@/external/autumn/autumnCli.js";
-// import { setupBefore } from "@tests/before.js";
-// import { CusProductStatus, organizations } from "@autumn/shared";
-// import { getFeaturePrice, getUsagePriceTiers } from "@tests/utils/genUtils.js";
-// import { entityProducts, features } from "../global.js";
-// import { Stripe } from "stripe";
-// import { checkBalance } from "@tests/utils/autumnUtils.js";
-// import { initCustomerWithTestClock } from "@tests/utils/testInitUtils.js";
-// import { advanceTestClock } from "@tests/utils/stripeUtils.js";
-// import { addDays, addHours, addMonths } from "date-fns";
-// import { CacheManager } from "@/external/caching/CacheManager.js";
-// import { CacheType } from "@/external/caching/cacheActions.js";
-// import { hashApiKey } from "@/internal/dev/api-keys/apiKeyUtils.js";
-// import { compareMainProduct } from "../utils/compare.js";
-// import { assert, expect } from "chai";
-
-// import chalk from "chalk";
-// import { DrizzleCli } from "@/db/initDrizzle.js";
-// import { CusProductService } from "@/internal/customers/cusProducts/CusProductService.js";
-// import { eq } from "drizzle-orm";
-
-// // Check balance and stripe quantity
-// const checkEntAndStripeQuantity = async ({
-//   db,
-//   autumn,
-//   stripeCli,
-//   featureId,
-//   customerId,
-//   expectedBalance,
-//   expectedUsage,
-//   expectedStripeQuantity,
-// }: {
-//   db: DrizzleCli;
-//   autumn: Autumn;
-//   stripeCli: Stripe;
-//   featureId: string;
-//   customerId: string;
-//   expectedBalance: number;
-//   expectedUsage?: number;
-//   expectedStripeQuantity: number;
-// }) => {
-//   let { customer, entitlements, products } =
-//     await autumn.customers.get(customerId);
-
-//   let cusProducts = await CusProductService.list({
-//     db,
-//     internalCustomerId: customer.internal_id,
-//     inStatuses: [CusProductStatus.Active],
-//   });
-
-//   let entitlement = entitlements.find((e: any) => e.feature_id == featureId);
-
-//   expect(entitlement.balance).to.equal(expectedBalance);
-//   if (expectedUsage) {
-//     expect(entitlement.used).to.equal(
-//       expectedUsage,
-//       `Get customer ${customerId} returned incorrect "used" for feature ${featureId}`,
-//     );
-//   }
-
-//   if (products.length == 0) {
-//     assert.fail(`Get customer ${customerId} returned no products`);
-//   }
-
-//   // 2. Get stripe quantity
-//   let mainProduct = products[0];
-
-//   if (mainProduct.subscription_ids.length == 0) {
-//     assert.fail(`Get customer ${customerId} returned no subscriptions`);
-//   }
-
-//   let price = getFeaturePrice({
-//     product: mainProduct,
-//     featureId: featureId,
-//     cusProducts,
-//   });
-
-//   if (!price) {
-//     assert.fail(
-//       `Get customer ${customerId} returned no price for feature ${featureId}`,
-//     );
-//   }
-
-//   let stripeSub = await stripeCli.subscriptions.retrieve(
-//     mainProduct.subscription_ids[0],
-//   );
-//   let subItem = stripeSub.items.data.find(
-//     (item: any) => item.price.id == price.config!.stripe_price_id,
-//   );
-
-//   if (!subItem) {
-//     assert.fail(
-//       `Get customer ${customerId} returned no sub item for feature ${featureId}`,
-//     );
-//   }
-
-//   expect(subItem.quantity).to.equal(
-//     expectedStripeQuantity,
-//     `Get customer ${customerId} returned incorrect stripe quantity for feature ${featureId}`,
-//   );
-// };
-
-// // UNCOMMENT FROM HERE
-// describe(`${chalk.yellowBright("entities1: Testing entities")}`, () => {
-//   let customerId = "entity1";
-//   let autumn: Autumn;
-//   let stripeCli: Stripe;
-//   let usageTiers = getUsagePriceTiers({
-//     product: entityProducts.entityPro,
-//     featureId: features.seats.id,
-//   });
-//   let testClockId: string;
-
-//   before(async function () {
-//     await setupBefore(this);
-//     autumn = this.autumn;
-//     stripeCli = this.stripeCli;
-
-//     const { testClockId: testClockId1 } = await initCustomerWithTestClock({
-//       customerId,
-//       db: this.db,
-//       org: this.org,
-//       env: this.env,
-//     });
-
-//     testClockId = testClockId1;
-
-//     // Update org config
-//     await this.db
-//       .update(organizations)
-//       .set({
-//         config: {
-//           ...this.org.config,
-//           prorate_unused: false,
-//         },
-//       })
-//       .where(eq(organizations.id, this.org.id));
-
-//     await CacheManager.invalidate({
-//       action: CacheType.SecretKey,
-//       value: hashApiKey(process.env.UNIT_TEST_AUTUMN_SECRET_KEY!),
-//     });
-//     await CacheManager.disconnect();
-//   });
-
-//   let firstEntityId = "1";
-
-//   it("should attach entityFree product", async function () {
-//     await this.autumn.attach({
-//       customerId,
-//       productId: entityProducts.entityFree.id,
-//     });
-
-//     await this.autumn.entities.create(customerId, {
-//       id: firstEntityId,
-//       name: "1@gmail.com",
-//       featureId: features.seats.id,
-//     });
-
-//     // Check if entity is created
-//     let res = await this.autumn.entities.list(customerId);
-//     let entities = res.data;
-
-//     expect(entities).to.have.lengthOf(1);
-//     expect(entities[0].id).to.equal(firstEntityId);
-//   });
-
-//   it("should successfully remove created entity", async function () {
-//     await this.autumn.entities.delete(customerId, firstEntityId);
-
-//     let res = await this.autumn.entities.list(customerId);
-//     let entities = res.data;
-//     expect(entities).to.have.lengthOf(0);
-//   });
-
-//   it("should create first entity, then attach entityPro product", async function () {
-//     await this.autumn.entities.create(customerId, {
-//       id: firstEntityId,
-//       name: "1@gmail.com",
-//       featureId: features.seats.id,
-//     });
-
-//     await this.autumn.attach({
-//       customerId,
-//       productId: entityProducts.entityPro.id,
-//     });
-
-//     // Check product is attached correctly
-//     let cusRes = await autumn.customers.get(customerId);
-//     compareMainProduct({
-//       sent: entityProducts.entityPro,
-//       cusRes: cusRes,
-//     });
-
-//     let { invoices } = cusRes;
-//     let usageTiers = getUsagePriceTiers({
-//       product: entityProducts.entityPro,
-//       featureId: features.seats.id,
-//     });
-
-//     // Check invoice is created correctly
-//     expect(invoices).to.have.lengthOf(1);
-//     expect(invoices[0].total).to.equal(usageTiers[0].amount);
-
-//     // Check balance and stripe quantity
-//     await checkEntAndStripeQuantity({
-//       db: this.db,
-//       autumn,
-//       stripeCli,
-//       featureId: features.seats.id,
-//       customerId,
-//       expectedBalance: -1,
-//       expectedStripeQuantity: 1,
-//     });
-
-//     await checkBalance({
-//       autumn,
-//       featureId: features.metered1.id,
-//       customerId,
-//       expectedBalance:
-//         entityProducts.entityPro.entitlements.metered1.allowance!,
-//     });
-//   });
-
-//   let newEntities = [
-//     {
-//       id: "2",
-//       name: "2@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//     {
-//       id: "3",
-//       name: "3@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//     {
-//       id: "4",
-//       name: "4@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//   ];
-
-//   it("should create 3 additional entities and be charged immediately", async function () {
-//     let advanceToDay = addDays(new Date(), 1).getTime();
-//     await advanceTestClock({
-//       stripeCli,
-//       testClockId,
-//       advanceTo: advanceToDay,
-//       waitForSeconds: 20,
-//     });
-
-//     await this.autumn.entities.create(customerId, newEntities);
-
-//     let entitiesRes = await this.autumn.entities.list(customerId);
-//     let entities = entitiesRes.data;
-//     expect(entities).to.have.lengthOf(newEntities.length + 1);
-
-//     let cusRes = await autumn.customers.get(customerId);
-
-//     let { invoices } = cusRes;
-//     expect(invoices[0].total).to.equal(
-//       usageTiers[0].amount * newEntities.length,
-//     );
-//   });
-
-//   it("should remove 2 entities, and have correct balance / stripe quantity", async function () {
-//     await this.autumn.entities.delete(customerId, newEntities[0].id);
-
-//     await checkEntAndStripeQuantity({
-//       db: this.db,
-//       autumn,
-//       stripeCli,
-//       featureId: features.seats.id,
-//       customerId,
-//       expectedBalance: -(newEntities.length + 1),
-//       expectedStripeQuantity: newEntities.length + 1 - 1,
-//       expectedUsage: newEntities.length + 1 - 1,
-//     });
-
-//     await this.autumn.entities.delete(customerId, newEntities[1].id);
-//     await checkEntAndStripeQuantity({
-//       db: this.db,
-//       autumn,
-//       stripeCli,
-//       featureId: features.seats.id,
-//       customerId,
-//       expectedBalance: -(newEntities.length + 1),
-//       expectedStripeQuantity: newEntities.length + 1 - 2,
-//       expectedUsage: newEntities.length + 1 - 2,
-//     });
-//   });
-
-//   let newEntities2 = [
-//     {
-//       id: "5",
-//       name: "5@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//     {
-//       id: "6",
-//       name: "6@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//     {
-//       id: "7",
-//       name: "7@gmail.com",
-//       featureId: features.seats.id,
-//     },
-//   ];
-
-//   it("should create three additional seats, and be charged for only one", async function () {
-//     await this.autumn.entities.create(customerId, newEntities2);
-
-//     let totalSeats = newEntities2.length + 2;
-//     await checkEntAndStripeQuantity({
-//       db: this.db,
-//       autumn,
-//       stripeCli,
-//       featureId: features.seats.id,
-//       customerId,
-//       expectedBalance: -totalSeats,
-//       expectedStripeQuantity: totalSeats,
-//       expectedUsage: totalSeats,
-//     });
-
-//     let cusRes = await autumn.customers.get(customerId);
-//     let { invoices } = cusRes;
-//     expect(invoices[0].total).to.equal(usageTiers[0].amount);
-//   });
-
-//   // return;
-
-//   it("should remove one entity, and have correct balance / stripe quantity after advancing test clock", async function () {
-//     await this.autumn.entities.delete(customerId, newEntities2[0].id);
-
-//     let totalSeats = newEntities2.length + 1;
-
-//     let advanceTo = addHours(addMonths(new Date(), 1), 4).getTime();
-//     await advanceTestClock({ stripeCli, testClockId, advanceTo });
-
-//     // Get entities
-//     let { data: entities } = await this.autumn.entities.list(customerId);
-//     expect(entities).to.have.lengthOf(totalSeats);
-
-//     await checkEntAndStripeQuantity({
-//       db: this.db,
-//       autumn,
-//       stripeCli,
-//       featureId: features.seats.id,
-//       customerId,
-//       expectedBalance: -totalSeats,
-//       expectedStripeQuantity: totalSeats,
-//       expectedUsage: totalSeats,
-//     });
-
-//     await checkBalance({
-//       autumn,
-//       featureId: features.metered1.id,
-//       customerId,
-//       expectedBalance:
-//         totalSeats * entityProducts.entityPro.entitlements.metered1.allowance!,
-//     });
-//   });
-
-//   after(async function () {
-//     await this.db
-//       .update(organizations)
-//       .set({
-//         config: {
-//           ...this.org.config,
-//           prorate_unused: true,
-//         },
-//       })
-//       .where(eq(organizations.id, this.org.id));
-
-//     void CacheManager.invalidate({
-//       action: CacheType.SecretKey,
-//       value: hashApiKey(process.env.UNIT_TEST_AUTUMN_SECRET_KEY!),
-//     });
-//   });
-// });
diff --git a/server/tests/attach/migrations/migration1.test.ts b/server/tests/attach/migrations/migration1.test.ts
index fd80dd269..a1ed9eeea 100644
--- a/server/tests/attach/migrations/migration1.test.ts
+++ b/server/tests/attach/migrations/migration1.test.ts
@@ -1,18 +1,18 @@
 import { beforeAll, describe, test } from "bun:test";
 import type { LimitedItem, ProductV2 } from "@autumn/shared";
-import chalk from "chalk";
-import { addWeeks } from "date-fns";
 import { defaultApiVersion } from "@tests/constants.js";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import { addWeeks } from "date-fns";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { timeout } from "@/utils/genUtils.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { advanceTestClock } from "@/utils/scriptUtils/testClockUtils.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
 import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
+import { advanceTestClock } from "../../../src/utils/scriptUtils/testClockUtils.js";
 import { replaceItems } from "../utils.js";
 import { runMigrationTest } from "./runMigrationTest.js";
 
diff --git a/server/tests/attach/migrations/migration1.ts b/server/tests/attach/migrations/migration1.ts
deleted file mode 100644
index aa9358da1..000000000
--- a/server/tests/attach/migrations/migration1.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import type {
-	AppEnv,
-	LimitedItem,
-	Organization,
-	ProductV2,
-} from "@autumn/shared";
-import chalk from "chalk";
-import type Stripe from "stripe";
-import { setupBefore } from "@tests/before.js";
-import { defaultApiVersion } from "@tests/constants.js";
-import { TestFeature } from "@tests/setup/v2Features.js";
-import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
-import { createProducts } from "@tests/utils/productUtils.js";
-import type { DrizzleCli } from "@/db/initDrizzle.js";
-import { AutumnInt } from "@/external/autumn/autumnCli.js";
-import { timeout } from "@/utils/genUtils.js";
-import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
-import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
-import { initCustomer } from "@/utils/scriptUtils/initCustomer.js";
-import { addPrefixToProducts, replaceItems } from "../utils.js";
-import { runMigrationTest } from "./runMigrationTest.js";
-
-const messagesItem = constructFeatureItem({
-	featureId: TestFeature.Messages,
-	includedUsage: 500,
-}) as LimitedItem;
-
-const wordsItem = constructFeatureItem({
-	featureId: TestFeature.Words,
-	includedUsage: 100,
-}) as LimitedItem;
-
-export const free = constructProduct({
-	items: [messagesItem, wordsItem],
-	type: "free",
-	isDefault: false,
-});
-
-const testCase = "migrations1";
-
-describe(`${chalk.yellowBright(`${testCase}: Testing migration for free product`)}`, () => {
-	const customerId = testCase;
-	const autumn: AutumnInt = new AutumnInt({ version: defaultApiVersion });
-	let testClockId: string;
-	let db: DrizzleCli, org: Organization, env: AppEnv;
-	let stripeCli: Stripe;
-
-	const curUnix = new Date().getTime();
-
-	before(async function () {
-		await setupBefore(this);
-		const { autumnJs } = this;
-		db = this.db;
-		org = this.org;
-		env = this.env;
-
-		stripeCli = this.stripeCli;
-
-		addPrefixToProducts({
-			products: [free],
-			prefix: testCase,
-		});
-
-		await createProducts({
-			db,
-			orgId: org.id,
-			env,
-			autumn,
-			products: [free],
-			customerId,
-		});
-
-		const { testClockId: testClockId1 } = await initCustomer({
-			autumn: autumnJs,
-			customerId,
-			db,
-			org,
-			env,
-			attachPm: "success",
-		});
-
-		testClockId = testClockId1!;
-	});
-
-	it("should attach free product", async () => {
-		await attachAndExpectCorrect({
-			autumn,
-			customerId,
-			product: free,
-			stripeCli,
-			db,
-			org,
-			env,
-			skipSubCheck: true,
-		});
-	});
-
-	let newFree: ProductV2;
-	const increaseMessagesBy = 100;
-	const reduceWordsBy = 50;
-	it("should update product to new version", async () => {
-		newFree = structuredClone(free);
-
-		let newItems = replaceItems({
-			items: free.items,
-			featureId: TestFeature.Messages,
-			newItem: constructFeatureItem({
-				featureId: TestFeature.Messages,
-				includedUsage:
-					(messagesItem.included_usage as number) + increaseMessagesBy,
-			}),
-		});
-
-		newItems = replaceItems({
-			items: newItems,
-			featureId: TestFeature.Words,
-			newItem: constructFeatureItem({
-				featureId: TestFeature.Words,
-				includedUsage: (wordsItem.included_usage as number) - reduceWordsBy,
-			}),
-		});
-
-		newFree.items = newItems;
-
-		await autumn.products.update(free.id, {
-			items: newItems,
-		});
-	});
-
-	it("should attach track usage and get correct balance", async () => {
-		const wordsUsage = 25;
-		const messagesUsage = 20;
-		await autumn.track({
-			customer_id: customerId,
-			value: wordsUsage,
-			feature_id: TestFeature.Words,
-		});
-
-		await autumn.track({
-			customer_id: customerId,
-			value: messagesUsage,
-			feature_id: TestFeature.Messages,
-		});
-
-		// await timeout(2000);
-		// await advanceTestClock({
-		// 	stripeCli,
-		// 	testClockId,
-		// 	advanceTo: addWeeks(Date.now(), 1).getTime(),
-		// 	waitForSeconds: 30,
-		// });
-
-		let customer = await autumn.customers.get(customerId);
-
-		await autumn.migrate({
-			from_product_id: free.id,
-			to_product_id: newFree.id,
-			from_version: 1,
-			to_version: 2,
-		});
-
-		await timeout(4000);
-
-		// 1. Get features
-		customer = await autumn.customers.get(customerId);
-
-		await runMigrationTest({
-			autumn,
-			stripeCli,
-			customerId,
-			fromProduct: free,
-			toProduct: newFree,
-			db,
-			org,
-			env,
-			usage: [
-				{
-					featureId: TestFeature.Words,
-					value: wordsUsage,
-				},
-				{
-					featureId: TestFeature.Messages,
-					value: messagesUsage,
-				},
-			],
-		});
-	});
-});
diff --git a/server/tests/attach/migrations/migration4.test.ts b/server/tests/attach/migrations/migration4.test.ts
index 05ce2a571..dca427ac5 100644
--- a/server/tests/attach/migrations/migration4.test.ts
+++ b/server/tests/attach/migrations/migration4.test.ts
@@ -1,9 +1,9 @@
 import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
 import { defaultApiVersion } from "@tests/constants.js";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { timeout } from "@/utils/genUtils.js";
 import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
@@ -30,6 +30,7 @@ const newWordsItem = constructArrearItem({
 
 const proWithTrial = constructProduct({
 	items: [newWordsItem],
+	id: "migrations4_pro",
 	type: "pro",
 	isDefault: false,
 	trial: true,
diff --git a/server/tests/attach/multiProduct/multiProduct1.test.ts b/server/tests/attach/multiProduct/multiProduct1.test.ts
index 7a02f45b4..9c1d4f99d 100644
--- a/server/tests/attach/multiProduct/multiProduct1.test.ts
+++ b/server/tests/attach/multiProduct/multiProduct1.test.ts
@@ -1,9 +1,9 @@
 import { beforeAll, describe, test } from "bun:test";
-import chalk from "chalk";
 import { AutumnCli } from "@tests/cli/AutumnCli.js";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { expectCustomerV0Correct } from "@tests/utils/expectUtils/expectCustomerV0Correct.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
 import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
@@ -84,7 +84,7 @@ describe(
 			await initProductsV0({
 				ctx,
 				products: [proGroup1, proGroup2, premiumGroup1, premiumGroup2],
-				prefix: testCase,
+				// prefix: testCase,
 				customerId,
 			});
 
diff --git a/server/tests/attach/newVersion/newVersion1.test.ts b/server/tests/attach/newVersion/newVersion1.test.ts
index 117222bd5..9d4af747b 100644
--- a/server/tests/attach/newVersion/newVersion1.test.ts
+++ b/server/tests/attach/newVersion/newVersion1.test.ts
@@ -30,8 +30,6 @@ describe(`${chalk.yellowBright(`${testCase}: Testing attach with new version`)}`
 	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
 	let testClockId: string;
 
-	const curUnix = new Date().getTime();
-
 	beforeAll(async () => {
 		await initProductsV0({
 			ctx,
diff --git a/server/tests/attach/others/others6.test.ts b/server/tests/attach/others/others6.test.ts
index 58dc7d79b..423db47db 100644
--- a/server/tests/attach/others/others6.test.ts
+++ b/server/tests/attach/others/others6.test.ts
@@ -9,6 +9,7 @@ import { CusService } from "@/internal/customers/CusService.js";
 import { constructArrearItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
 import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
+import { timeout } from "../../utils/genUtils";
 
 export const pro = constructProduct({
 	items: [constructArrearItem({ featureId: TestFeature.Words })],
@@ -50,6 +51,7 @@ describe(`${chalk.yellowBright(`${testCase}: Testing attach with customer ID and
 			id: null,
 			email: `${customerId}@test.com`,
 			name: customerId,
+			withAutumnId: true,
 		});
 
 		expect(customer.autumn_id).toBeDefined();
@@ -94,19 +96,30 @@ describe(`${chalk.yellowBright(`${testCase}: Testing attach with customer ID and
 
 		expect(customer.autumn_id).toBe(internalCustomerId);
 
-		const entity = await autumn.entities.create(customer.autumn_id, {
+		const entity = await autumn.entities.create(customer.id, {
 			id: entityId,
 			feature_id: TestFeature.Users,
 		});
 
 		internalEntityId = entity.autumn_id;
 
+		// console.log("Customer: ", customer);
+		// console.log("Entity: ", entity);
+
+		await timeout(2000);
+
 		const customer2 = await autumn.customers.get(customerId);
 
 		expectAttachCorrect({
 			customer: customer2,
 			product: pro,
-			entityId,
+		});
+
+		const entity2 = await autumn.entities.get(customerId, entityId);
+
+		expectAttachCorrect({
+			customer: entity2,
+			product: pro,
 		});
 	});
 });
diff --git a/server/tests/attach/prepaid/prepaid5.test.ts b/server/tests/attach/prepaid/prepaid5.test.ts
index f12fa1c0b..d07420ed3 100644
--- a/server/tests/attach/prepaid/prepaid5.test.ts
+++ b/server/tests/attach/prepaid/prepaid5.test.ts
@@ -1,10 +1,9 @@
-import { type Customer, LegacyVersion, OnDecrease, OnIncrease } from "@autumn/shared";
 import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
-import type Stripe from "stripe";
-import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import { LegacyVersion, OnDecrease, OnIncrease } from "@autumn/shared";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
+import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import {
 	constructFeatureItem,
@@ -56,10 +55,6 @@ export const premium = constructProduct({
 describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entities`)}`, () => {
 	const customerId = testCase;
 	const autumn: AutumnInt = new AutumnInt({ version: LegacyVersion.v1_4 });
-	let testClockId: string;
-
-	const curUnix = new Date().getTime();
-	let customer: Customer;
 
 	beforeAll(async () => {
 		await initProductsV0({
@@ -69,7 +64,7 @@ describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entitie
 			customerId,
 		});
 
-		const res = await initCustomerV3({
+		await initCustomerV3({
 			ctx,
 			customerId,
 			customerData: {},
@@ -77,7 +72,6 @@ describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entitie
 			withTestClock: false,
 		});
 
-		customer = res.customer;
 		// testClockId = res.testClockId!;
 	});
 
@@ -96,7 +90,7 @@ describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entitie
 		},
 	];
 
-	test("should attach pro product to entity1", async () => {
+	test("should attach pro + prepaid add on product to entity1", async () => {
 		await autumn.entities.create(customerId, entities);
 
 		await attachAndExpectCorrect({
@@ -131,7 +125,7 @@ describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entitie
 	});
 
 	const oldEntity2Quantity = 300;
-	test("should advance test clock and attach top up to entity2", async () => {
+	test("should attach premium + prepaid add on product to entity2", async () => {
 		// await advanceTestClock({
 		//   stripeCli,
 		//   testClockId,
@@ -218,17 +212,16 @@ describe(`${chalk.yellowBright(`attach/${testCase}: prepaid add on, with entitie
 		const entity2 = await autumn.entities.get(customerId, entity2Id);
 		expect(entity2.invoices.length).toBe(2);
 		const creditProd = entity2.products.find(
-			(p: any) => p.id == prepaidAddOn.id,
+			(p: any) => p.id === prepaidAddOn.id,
 		);
+
 		expect(creditProd).toBeDefined();
 		const messagesItem = creditProd!.items.find(
-			(i: any) => i.feature_id == TestFeature.Messages,
+			(i: any) => i.feature_id === TestFeature.Messages,
 		);
 
 		expect(messagesItem).toBeDefined();
 		expect(messagesItem.quantity).toBe(oldEntity2Quantity);
 		expect(messagesItem.next_cycle_quantity).toBe(newEntity2Quantity);
 	});
-
-	return;
 });
diff --git a/server/tests/clearMasterOrg.ts b/server/tests/clearMasterOrg.ts
index 00f56ccbe..7ea99700e 100644
--- a/server/tests/clearMasterOrg.ts
+++ b/server/tests/clearMasterOrg.ts
@@ -6,6 +6,7 @@ dotenv.config();
 
 import { AppEnv } from "@autumn/shared";
 import chalk from "chalk";
+import { redis } from "../src/external/redis/initRedis.js";
 import { clearOrg } from "./utils/setupUtils/clearOrg.js";
 import { setupOrg } from "./utils/setupUtils/setupOrg.js";
 
@@ -13,6 +14,11 @@ async function main() {
 	console.log(chalk.blue("\n🧹 Clearing Master Org...\n"));
 
 	try {
+		if (!process.env.TESTS_ORG) {
+			console.error(chalk.red("\n❌ TESTS_ORG is not set\n"));
+			process.exit(1);
+		}
+
 		const org = await clearOrg({
 			orgSlug: process.env.TESTS_ORG ?? "",
 			env: AppEnv.Sandbox,
@@ -26,6 +32,9 @@ async function main() {
 			env: AppEnv.Sandbox,
 		});
 		console.log(chalk.green("\n✅ Master org setup complete!\n"));
+
+		await redis.flushall();
+		console.log(chalk.green("\n✅ Redis flushed successfully!\n"));
 	} catch (error) {
 		console.error(chalk.red("\n❌ Error:"), error);
 		process.exit(1);
diff --git a/server/tests/contUse/update/updateContUse2.test.ts b/server/tests/contUse/update/updateContUse2.test.ts
index 972444231..6fa92c8b5 100644
--- a/server/tests/contUse/update/updateContUse2.test.ts
+++ b/server/tests/contUse/update/updateContUse2.test.ts
@@ -1,13 +1,13 @@
-import { LegacyVersion, OnDecrease, OnIncrease } from "@autumn/shared";
 import { beforeAll, describe, expect, test } from "bun:test";
-import chalk from "chalk";
-import { addWeeks } from "date-fns";
+import { LegacyVersion, OnDecrease, OnIncrease } from "@autumn/shared";
 import { replaceItems } from "@tests/attach/utils.js";
-import ctx from "@tests/utils/testInitUtils/createTestContext.js";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import { expectSubQuantityCorrect } from "@tests/utils/expectUtils/expectContUseUtils.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
+import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import { addWeeks } from "date-fns";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { constructArrearProratedItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
diff --git a/server/tests/global.ts b/server/tests/global.ts
deleted file mode 100644
index 3a1b68c7a..000000000
--- a/server/tests/global.ts
+++ /dev/null
@@ -1,1032 +0,0 @@
-import dotenv from "dotenv";
-
-dotenv.config();
-
-import {
-	AggregateType,
-	AllowanceType,
-	BillingInterval,
-	CouponDurationType,
-	EntInterval,
-	type Feature,
-	FeatureType,
-	FeatureUsageType,
-	RewardReceivedBy,
-	RewardTriggerEvent,
-	RewardType,
-} from "@autumn/shared";
-import { FeatureService } from "@/internal/features/FeatureService.js";
-import {
-	initEntitlement,
-	initFeature,
-	initFreeTrial,
-	initPrice,
-	initProduct,
-	initReward,
-	initRewardProgram,
-} from "./utils/init.js";
-import { createTestContext } from "./utils/testInitUtils/createTestContext.js";
-
-export const features: Record<string, Feature & { eventName: string }> = {
-	boolean1: initFeature({
-		id: "boolean1",
-		type: FeatureType.Boolean,
-	}),
-	metered1: initFeature({
-		id: "metered1",
-		type: FeatureType.Metered,
-		aggregateType: AggregateType.Sum,
-		groupBy: "user_id",
-		eventName: "metered_1",
-		usageType: FeatureUsageType.Single,
-	}),
-	infinite1: initFeature({
-		id: "infinite1",
-		type: FeatureType.Metered,
-		usageType: FeatureUsageType.Single,
-	}),
-	metered2: initFeature({
-		id: "metered2",
-		type: FeatureType.Metered,
-		aggregateType: AggregateType.Count,
-		eventName: "metered_2",
-		usageType: FeatureUsageType.Single,
-	}),
-
-	// GPU SYSTEM
-	gpu1: initFeature({
-		id: "gpu1",
-		type: FeatureType.Metered,
-		groupBy: "user_id",
-		usageType: FeatureUsageType.Single,
-	}),
-	gpu2: initFeature({
-		id: "gpu2",
-		type: FeatureType.Metered,
-		groupBy: "user_id",
-		usageType: FeatureUsageType.Single,
-	}),
-
-	// In arrear prorated
-	seats: initFeature({
-		id: "seats",
-		type: FeatureType.Metered,
-		usageType: FeatureUsageType.Continuous,
-	}),
-};
-
-export const creditSystems = {
-	gpuCredits: initFeature({
-		id: "gpuCredits",
-		type: FeatureType.CreditSystem,
-		creditSchema: [
-			{
-				metered_feature_id: features.gpu1.id,
-				feature_amount: 1,
-				credit_amount: 0.01,
-			},
-			{
-				metered_feature_id: features.gpu2.id,
-				feature_amount: 1,
-				credit_amount: 0.0213,
-			},
-		],
-		usageType: FeatureUsageType.Single,
-	}),
-};
-
-export const products = {
-	free: initProduct({
-		id: "free",
-		isDefault: true,
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 5,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [],
-		freeTrial: null,
-	}),
-
-	pro: initProduct({
-		id: "pro",
-		entitlements: {
-			boolean1: initEntitlement({
-				feature: features.boolean1,
-			}),
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 10,
-				interval: EntInterval.Month,
-			}),
-			infinite1: initEntitlement({
-				feature: features.infinite1,
-				allowanceType: AllowanceType.Unlimited,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	oneTimeAddOnMetered1: initProduct({
-		id: "one-time-add-on-metered-1",
-		isAddOn: true,
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 0,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "in_advance",
-				billingInterval: BillingInterval.OneOff,
-				feature: features.metered1,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	monthlyAddOnMetered1: initProduct({
-		id: "monthly-add-on-metered-1",
-		isAddOn: true,
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 0,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "in_advance",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	proWithOverage: initProduct({
-		id: "pro-with-overage",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 10,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				billingInterval: BillingInterval.Month,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	proOnlyUsage: initProduct({
-		id: "pro-only-usage",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 0,
-				allowanceType: AllowanceType.Fixed,
-				interval: EntInterval.Month,
-			}),
-		},
-
-		prices: [
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	proWithTrial: initProduct({
-		id: "pro-with-trial",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 10,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-			}),
-		],
-		freeTrial: initFreeTrial({
-			length: 7,
-			uniqueFingerprint: true,
-		}),
-	}),
-
-	premium: initProduct({
-		id: "premium",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 100,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 50,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	premiumWithTrial: initProduct({
-		id: "premium-with-trial",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 100,
-				interval: EntInterval.Month,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 50,
-			}),
-		],
-		freeTrial: initFreeTrial({
-			length: 7,
-			uniqueFingerprint: true,
-		}),
-	}),
-
-	monthlyWithOneTime: initProduct({
-		id: "mothlyWithOneTime",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 0,
-				interval: EntInterval.Lifetime,
-			}),
-			metered2: initEntitlement({
-				feature: features.metered2,
-				allowance: 0,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-			}),
-			initPrice({
-				type: "in_advance",
-				billingInterval: BillingInterval.OneOff,
-				feature: features.metered1,
-				amount: 100,
-			}),
-			initPrice({
-				type: "in_advance",
-				billingInterval: BillingInterval.OneOff,
-				feature: features.metered2,
-				amount: 200,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	freeAddOn: initProduct({
-		id: "freeAddOn",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 100,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [],
-		freeTrial: null,
-		isAddOn: true,
-	}),
-
-	proAddOn: initProduct({
-		id: "proAddOn",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 100,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "fixed_cycle",
-				billingInterval: BillingInterval.OneOff,
-				amount: 100,
-			}),
-		],
-		freeTrial: null,
-		isAddOn: true,
-	}),
-};
-
-export const oneTimeProducts = {
-	oneTimeMetered1: initProduct({
-		id: "oneTimeMetered1",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 500,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				billingInterval: BillingInterval.OneOff,
-				feature: features.metered1,
-				amount: 100,
-			}),
-		],
-		freeTrial: null,
-	}),
-	oneTimeMetered2: initProduct({
-		id: "oneTimeMetered2",
-		entitlements: {
-			metered2: initEntitlement({
-				feature: features.metered2,
-				allowance: 0,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "in_advance",
-				billingInterval: BillingInterval.OneOff,
-				feature: features.metered2,
-				amount: 0.01,
-			}),
-		],
-		freeTrial: null,
-	}),
-};
-
-export const advanceProducts = {
-	// GPU SYSTEM
-	gpuSystemStarter: initProduct({
-		id: "gpu-system-starter",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 500,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 20,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 5,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	gpuSystemPro: initProduct({
-		id: "gpu-system-pro",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 5000,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 100,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	// Quarterly
-	gpuStarterQuarter: initProduct({
-		id: "gpuStarterQuarter",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 500,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 20,
-				billingInterval: BillingInterval.Quarter,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 5,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	gpuProQuarter: initProduct({
-		id: "gpuProQuarter",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 5000,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-			initPrice({
-				type: "fixed_cycle",
-				amount: 1000,
-				billingInterval: BillingInterval.Quarter,
-			}),
-		],
-
-		freeTrial: null,
-	}),
-
-	gpuStarterAnnual: initProduct({
-		id: "gpu-starter-annual",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 500,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "fixed_cycle",
-				amount: 200,
-				billingInterval: BillingInterval.Year,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-		],
-
-		freeTrial: null,
-	}),
-
-	gpuProAnnual: initProduct({
-		id: "gpuProAnnual",
-		entitlements: {
-			gpuCredits: initEntitlement({
-				allowance: 5000,
-				feature: creditSystems.gpuCredits,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: creditSystems.gpuCredits,
-				amount: 0.01,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-			initPrice({
-				type: "fixed_cycle",
-				amount: 1000,
-				billingInterval: BillingInterval.Year,
-			}),
-		],
-
-		freeTrial: null,
-	}),
-
-	proratedArrearSeats: initProduct({
-		id: "prorated-arrear-seats",
-		entitlements: {
-			seats: initEntitlement({
-				feature: features.seats,
-				allowance: 3,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 20,
-			}),
-			initPrice({
-				type: "in_arrear_prorated",
-				billingInterval: BillingInterval.Month,
-				feature: features.seats,
-				amount: 10,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-		],
-
-		freeTrial: null,
-	}),
-
-	proratedArrearSeatsWithReset: initProduct({
-		id: "prorated-arrear-seats-with-reset",
-		entitlements: {
-			seats: initEntitlement({
-				feature: features.seats,
-				allowance: 3,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 20,
-			}),
-			initPrice({
-				type: "in_arrear_prorated",
-				billingInterval: BillingInterval.Month,
-				feature: features.seats,
-				amount: 10,
-				oneTier: true,
-				billingUnits: 1,
-			}),
-		],
-
-		freeTrial: null,
-	}),
-};
-
-export const attachProducts = {
-	// 1. pro1Starter
-	starterGroup1: initProduct({
-		id: "starterGroup1",
-		group: "g1",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				interval: EntInterval.Month,
-				allowance: 10,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 10,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-				amount: 0.5,
-			}),
-		],
-		freeTrial: null,
-	}),
-	proGroup1: initProduct({
-		id: "proGroup1",
-		group: "g1",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				interval: EntInterval.Month,
-				allowance: 10,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 30,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-				amount: 1.0,
-			}),
-		],
-		freeTrial: null,
-	}),
-	premiumGroup1: initProduct({
-		id: "premiumGroup1",
-		group: "g1",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered1,
-				interval: EntInterval.Month,
-				allowance: 100,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 50,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered1,
-				amount: 2.0,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	// 2. pro2Starter
-	freeGroup2: initProduct({
-		id: "freeGroup2",
-		group: "g2",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered2,
-				allowance: 10,
-			}),
-		},
-		prices: [],
-		freeTrial: null,
-	}),
-	starterGroup2: initProduct({
-		id: "starterGroup2",
-		group: "g2",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered2,
-				interval: EntInterval.Month,
-				allowance: 10,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 20,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered2,
-				amount: 0.3,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	proGroup2: initProduct({
-		id: "proGroup2",
-		group: "g2",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered2,
-				interval: EntInterval.Month,
-				allowance: 10,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 40,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered2,
-				amount: 0.6,
-			}),
-		],
-		freeTrial: null,
-	}),
-
-	premiumGroup2: initProduct({
-		id: "premiumGroup2",
-		group: "g2",
-		entitlements: {
-			metered1: initEntitlement({
-				feature: features.metered2,
-				interval: EntInterval.Month,
-				allowance: 10,
-			}),
-		},
-		prices: [
-			initPrice({
-				type: "monthly",
-				amount: 60,
-			}),
-			initPrice({
-				type: "in_arrears",
-				billingInterval: BillingInterval.Month,
-				feature: features.metered2,
-				amount: 0.9,
-			}),
-		],
-		freeTrial: null,
-	}),
-};
-
-// Entity products
-export const entityProducts = {
-	entityFree: initProduct({
-		id: "entityFree",
-		entitlements: {
-			seats: initEntitlement({
-				feature: features.seats,
-				allowance: 1,
-				interval: EntInterval.Lifetime,
-			}),
-		},
-		prices: [],
-		freeTrial: null,
-	}),
-
-	entityPro: initProduct({
-		id: "entityPro",
-		entitlements: {
-			seats: initEntitlement({
-				feature: features.seats,
-				allowance: 0,
-				interval: EntInterval.Lifetime,
-				carryFromPrevious: true,
-			}),
-			metered1: initEntitlement({
-				feature: features.metered1,
-				allowance: 500,
-				interval: EntInterval.Month,
-				entityFeatureId: features.seats.id,
-				carryFromPrevious: true,
-			}),
-		},
-		prices: [
-			// initPrice({
-			//   type: "monthly",
-			//   amount: 10,
-			// }),
-			initPrice({
-				type: "in_arrear_prorated",
-				billingInterval: BillingInterval.Month,
-				feature: features.seats,
-				amount: 100,
-				oneTier: true,
-				billingUnits: 1,
-				// Carry over usage
-			}),
-		],
-		freeTrial: null,
-	}),
-};
-
-export const rewards = {
-	rolloverAll: initReward({
-		id: "rolloverAll",
-		type: RewardType.InvoiceCredits,
-		discountValue: 1000,
-		durationType: CouponDurationType.Forever,
-		applyToAll: true,
-	}),
-	rolloverUsage: initReward({
-		id: "rolloverUsage",
-		type: RewardType.InvoiceCredits,
-		discountValue: 1000,
-		durationType: CouponDurationType.Forever,
-		onlyUsagePrices: true,
-		productIds: [products.proWithOverage.id],
-	}),
-	monthOff: initReward({
-		id: "monthOff",
-		type: RewardType.PercentageDiscount,
-		discountValue: 100,
-		applyToAll: true,
-		durationType: CouponDurationType.Months,
-		durationValue: 1,
-	}),
-	paidProductWithConfig: initReward({
-		id: "paidProductWithConfig",
-		type: RewardType.FreeProduct,
-		freeProductId: products.pro.id,
-		freeProductConfig: {
-			durationType: CouponDurationType.Months,
-			durationValue: 1,
-		},
-	}),
-	paidProductAddOn: initReward({
-		id: "paidProductAddOn",
-		type: RewardType.FreeProduct,
-		freeProductId: products.proAddOn.id,
-	}),
-	freeProduct: initReward({
-		id: "freeProduct",
-		type: RewardType.FreeProduct,
-		freeProductId: products.freeAddOn.id,
-	}),
-};
-
-export const referralPrograms = {
-	freeProduct: initRewardProgram({
-		id: "freeProduct",
-		internalRewardId: rewards.freeProduct.id,
-		when: RewardTriggerEvent.Checkout,
-		receivedBy: RewardReceivedBy.All,
-		productIds: [products.pro.id, products.proWithTrial.id],
-	}),
-	onCheckout: initRewardProgram({
-		id: "onCheckout",
-		internalRewardId: rewards.monthOff.id,
-		when: RewardTriggerEvent.Checkout,
-		productIds: [products.pro.id, products.proWithTrial.id],
-	}),
-	immediate: initRewardProgram({
-		id: "immediate",
-		internalRewardId: rewards.monthOff.id,
-		when: RewardTriggerEvent.CustomerCreation,
-	}),
-	paidProductImmediateAll: initRewardProgram({
-		id: "paidProduct-immediate-all",
-		internalRewardId: rewards.paidProductWithConfig.id,
-		when: RewardTriggerEvent.CustomerCreation,
-		receivedBy: RewardReceivedBy.All,
-		productIds: [products.pro.id],
-		maxRedemptions: 100,
-	}),
-	paidProductImmediateReferrer: initRewardProgram({
-		id: "paidProduct-immediate-referrer",
-		internalRewardId: rewards.paidProductWithConfig.id,
-		when: RewardTriggerEvent.CustomerCreation,
-		receivedBy: RewardReceivedBy.Referrer,
-		productIds: [products.pro.id],
-		maxRedemptions: 100,
-	}),
-
-	paidProductCheckoutAll: initRewardProgram({
-		id: "paidProduct-checkout-all",
-		internalRewardId: rewards.paidProductWithConfig.id,
-		when: RewardTriggerEvent.Checkout,
-		receivedBy: RewardReceivedBy.All,
-		productIds: [products.premium.id],
-	}),
-	paidProductCheckoutReferrer: initRewardProgram({
-		id: "paidProduct-checkout-referrer",
-		internalRewardId: rewards.paidProductWithConfig.id,
-		when: RewardTriggerEvent.Checkout,
-		receivedBy: RewardReceivedBy.Referrer,
-		productIds: [products.premium.id],
-	}),
-
-	paidAddOnAll: initRewardProgram({
-		id: "paidAddOn-all",
-		internalRewardId: rewards.paidProductAddOn.id,
-		when: RewardTriggerEvent.CustomerCreation,
-		receivedBy: RewardReceivedBy.All,
-		productIds: [products.proAddOn.id],
-	}),
-	paidAddOnReferrer: initRewardProgram({
-		id: "paidAddOn-referrer",
-		internalRewardId: rewards.paidProductAddOn.id,
-		when: RewardTriggerEvent.CustomerCreation,
-		receivedBy: RewardReceivedBy.Referrer,
-		productIds: [products.proAddOn.id],
-	}),
-
-	paidAddOnCheckoutAll: initRewardProgram({
-		id: "paidAddOn-checkout-all",
-		internalRewardId: rewards.paidProductAddOn.id,
-		when: RewardTriggerEvent.Checkout,
-		receivedBy: RewardReceivedBy.All,
-		productIds: [products.premium.id],
-	}),
-	paidAddOnCheckoutReferrer: initRewardProgram({
-		id: "paidAddOn-checkout-referrer",
-		internalRewardId: rewards.paidProductAddOn.id,
-		when: RewardTriggerEvent.Checkout,
-		receivedBy: RewardReceivedBy.Referrer,
-		productIds: [products.premium.id],
-	}),
-};
-
-const ORG_SLUG = process.env.TESTS_ORG!;
-
-export const cleanFeatures = async () => {
-	const ctx = await createTestContext();
-	const { db, org, env } = ctx;
-	try {
-		const dbFeatures = await FeatureService.list({
-			db,
-			orgId: org.id,
-			env,
-		});
-
-		const cleanFeatures = (features: Record<string, Feature>) => {
-			for (const featureId in features) {
-				const feature = features[featureId as keyof typeof features];
-				const dbFeature = dbFeatures.find((f: any) => f.id === feature.id);
-				if (!dbFeature) {
-					// throw new Error(`Feature ${feature.id} not found`);
-					continue;
-				}
-				features[featureId as keyof typeof features].internal_id =
-					dbFeature.internal_id;
-				if (feature.type === FeatureType.Metered) {
-					// Ignore this for now
-					// @ts-expect-error eventName is manually set
-					features[featureId as keyof typeof features].eventName =
-						dbFeature.event_names?.[0] || dbFeature.id;
-				}
-			}
-		};
-
-		cleanFeatures(features);
-		cleanFeatures(creditSystems);
-	} catch (error) {
-		console.error(error);
-	}
-};
-
-await cleanFeatures();
-
-// before(async function () {
-// 	try {
-// 		this.env = AppEnv.Sandbox;
-// 		const { db, client } = initDrizzle();
-// 		this.db = db;
-// 		this.client = client;
-
-// 		this.org = await OrgService.getBySlug({
-// 			db: this.db,
-// 			slug: ORG_SLUG,
-// 		});
-
-// 		const dbFeatures = await FeatureService.list({
-// 			db: this.db,
-// 			orgId: this.org.id,
-// 			env: this.env,
-// 		});
-
-// 		const cleanFeatures = (features: Record<string, Feature>) => {
-// 			for (const featureId in features) {
-// 				const feature = features[featureId as keyof typeof features];
-// 				const dbFeature = dbFeatures.find((f: any) => f.id === feature.id);
-// 				if (!dbFeature) {
-// 					// throw new Error(`Feature ${feature.id} not found`);
-// 					continue;
-// 				}
-// 				features[featureId as keyof typeof features].internal_id =
-// 					dbFeature.internal_id;
-// 				if (feature.type === FeatureType.Metered) {
-// 					// Ignore this for now
-// 					// @ts-expect-error eventName is manually set
-// 					features[featureId as keyof typeof features].eventName =
-// 						dbFeature.event_names?.[0] || dbFeature.id;
-// 				}
-// 			}
-// 		};
-
-// 		cleanFeatures(features);
-// 		cleanFeatures(creditSystems);
-// 	} catch (error) {
-// 		console.error(error);
-// 	}
-// });
-
-// after(async function () {
-// 	await this.client?.end();
-// });
diff --git a/server/tests/interval/multiSub/multiSubInterval2.test.ts b/server/tests/interval/multiSub/multiSubInterval2.test.ts
index e6461e037..e58b16f86 100644
--- a/server/tests/interval/multiSub/multiSubInterval2.test.ts
+++ b/server/tests/interval/multiSub/multiSubInterval2.test.ts
@@ -1,11 +1,11 @@
 import { beforeAll, describe, expect, test } from "bun:test";
 import { LegacyVersion } from "@autumn/shared";
-import chalk from "chalk";
-import { addMonths, addYears, differenceInDays } from "date-fns";
 import { TestFeature } from "@tests/setup/v2Features.js";
 import { attachAndExpectCorrect } from "@tests/utils/expectUtils/expectAttach.js";
 import { advanceTestClock } from "@tests/utils/stripeUtils.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import chalk from "chalk";
+import { addMonths, addYears, differenceInDays } from "date-fns";
 import { AutumnInt } from "@/external/autumn/autumnCli.js";
 import { constructFeatureItem } from "@/utils/scriptUtils/constructItem.js";
 import { constructProduct } from "@/utils/scriptUtils/createTestProducts.js";
@@ -13,6 +13,7 @@ import { getCusSub } from "@/utils/scriptUtils/testUtils/cusTestUtils.js";
 import { initCustomerV3 } from "@/utils/scriptUtils/testUtils/initCustomerV3.js";
 import { initProductsV0 } from "@/utils/scriptUtils/testUtils/initProductsV0.js";
 import { toMilliseconds } from "@/utils/timeUtils.js";
+import { getLatestPeriodEnd } from "../../../src/external/stripe/stripeSubUtils/convertSubUtils";
 
 const pro = constructProduct({
 	id: "pro",
@@ -94,12 +95,18 @@ describe(`${chalk.yellowBright("multiSubInterval2: Should attach pro and pro ann
 
 		expect(checkoutRes.next_cycle).toBeDefined();
 		const expectedDate = addYears(Date.now(), 1).getTime();
-		const actualDate = checkoutRes.next_cycle?.starts_at!;
+		const actualDate = checkoutRes.next_cycle?.starts_at ?? 0;
 
 		const daysDiff = Math.abs(differenceInDays(expectedDate, actualDate));
 
 		expect(daysDiff).toBeLessThanOrEqual(1);
 
+		// console.log(
+		// 	`Next cycle starts at: ${formatUnixToDateTime(checkoutRes.next_cycle?.starts_at ?? 0)}`,
+		// );
+		// console.log(`Expected date: ${formatUnixToDateTime(expectedDate)}`);
+		// console.log(`Days diff: ${daysDiff}`);
+
 		await autumn.attach({
 			customer_id: customerId,
 			product_id: proAnnual.id,
@@ -113,9 +120,13 @@ describe(`${chalk.yellowBright("multiSubInterval2: Should attach pro and pro ann
 			productId: proAnnual.id,
 		});
 
-		const subItem = sub!.items.data[0];
-		expect(subItem.current_period_end * 1000).toBeCloseTo(
-			checkoutRes.next_cycle?.starts_at!,
+		// Get period end of annual item
+		const latestPeriodEnd = getLatestPeriodEnd({
+			sub: sub,
+		});
+
+		expect(latestPeriodEnd * 1000).toBeCloseTo(
+			checkoutRes.next_cycle?.starts_at ?? 0,
 			-Math.log10(toMilliseconds.days(1)), // +- 1 day
 		);
 	});
diff --git a/server/tests/merged/addOn/mergedAddOn6.test.ts b/server/tests/merged/addOn/mergedAddOn6.test.ts
index ce10d9a67..0ced22e31 100644
--- a/server/tests/merged/addOn/mergedAddOn6.test.ts
+++ b/server/tests/merged/addOn/mergedAddOn6.test.ts
@@ -1,4 +1,4 @@
-import { beforeAll, describe, expect, test } from "bun:test";
+import { beforeAll, describe, test } from "bun:test";
 import {
 	type AppEnv,
 	CusProductStatus,
@@ -115,7 +115,7 @@ const ops = [
 		entityId: "1",
 		product: addOn,
 		results: [
-			{ product: pro, status: CusProductStatus.Active },
+			{ product: premium, status: CusProductStatus.Active },
 			{ product: addOn, status: CusProductStatus.Active },
 		],
 		options: [
@@ -124,7 +124,7 @@ const ops = [
 				quantity: billingUnits * 5,
 			},
 		],
-		otherProducts: [pro],
+		otherProducts: [premium],
 	},
 ];
 
@@ -227,6 +227,7 @@ describe(`${chalk.yellowBright("mergedAddOn6: testing update add on quantities o
 					quantity: billingUnits * 3,
 				},
 			],
+			otherProducts: [premium],
 		});
 	});
 });
diff --git a/server/tests/setupMain.ts b/server/tests/setupMain.ts
index 943587a5e..81bde8f0b 100644
--- a/server/tests/setupMain.ts
+++ b/server/tests/setupMain.ts
@@ -1,6 +1,6 @@
-import dotenv from "dotenv";
+import { loadLocalEnv } from "../src/utils/envUtils";
 
-dotenv.config();
+loadLocalEnv();
 
 import { AppEnv } from "@autumn/shared";
 import { setupOrg } from "@tests/utils/setupUtils/setupOrg.js";
diff --git a/server/tests/utils/advancedUsageUtils.ts b/server/tests/utils/advancedUsageUtils.ts
index ed6823b58..6cb13757f 100644
--- a/server/tests/utils/advancedUsageUtils.ts
+++ b/server/tests/utils/advancedUsageUtils.ts
@@ -1,12 +1,10 @@
+import assert from "node:assert";
 import type { Feature, ProductV2 } from "@autumn/shared";
-import assert from "assert";
-import { Decimal } from "decimal.js";
 import { AutumnCli } from "@tests/cli/AutumnCli.js";
-import { creditSystems, features } from "@tests/global.js";
 import ctx from "@tests/utils/testInitUtils/createTestContext.js";
+import { Decimal } from "decimal.js";
 import { getPriceForOverage } from "@/internal/products/prices/priceUtils.js";
 import { convertProductV2ToV1 } from "@/internal/products/productUtils/productV2Utils/convertProductV2ToV1.js";
-import { timeout } from "./genUtils.js";
 
 const PRECISION = 10;
 const CREDIT_MULTIPLIER = 100000;
@@ -120,48 +118,6 @@ export const checkUsageInvoiceAmount = async ({
 	}
 };
 
-export const sendGPUEvents = async ({
-	customerId,
-	eventCount,
-	groupObj = {},
-}: {
-	customerId: string;
-	eventCount: number;
-	groupObj?: any;
-}) => {
-	let totalCreditsUsed = 0;
-	const batchEvents = [];
-	for (let i = 0; i < eventCount; i++) {
-		const randomVal = new Decimal(Math.random().toFixed(PRECISION))
-			.mul(CREDIT_MULTIPLIER)
-			.toNumber();
-		const gpuId = i % 2 === 0 ? features.gpu1.id : features.gpu2.id;
-
-		const creditsUsed = getCreditsUsed(
-			creditSystems.gpuCredits,
-			gpuId,
-			randomVal,
-		);
-
-		totalCreditsUsed = new Decimal(totalCreditsUsed)
-			.plus(creditsUsed)
-			.toNumber();
-
-		batchEvents.push(
-			AutumnCli.sendEvent({
-				customerId: customerId,
-				eventName: gpuId,
-				properties: { value: randomVal, ...groupObj },
-			}),
-		);
-	}
-
-	await Promise.all(batchEvents);
-	await timeout(15000);
-
-	return { creditsUsed: totalCreditsUsed };
-};
-
 /**
  * V2 wrapper for checkUsageInvoiceAmount that accepts ProductV2
  * Converts ProductV2 → ProductV1 internally, then calls original helper
diff --git a/server/tests/utils/compare.ts b/server/tests/utils/compare.ts
index 4c750ca4b..699f7b471 100644
--- a/server/tests/utils/compare.ts
+++ b/server/tests/utils/compare.ts
@@ -9,10 +9,9 @@ import {
 	type UsagePriceConfig,
 } from "@autumn/shared";
 import type { ApiCustomerV1 } from "@shared/api/customers/previousVersions/apiCustomerV1.js";
+import { AutumnCli } from "@tests/cli/AutumnCli.js";
 // import { expect } from "chai";
 import { Decimal } from "decimal.js";
-import { AutumnCli } from "@tests/cli/AutumnCli.js";
-import { creditSystems } from "@tests/global.js";
 
 export const checkProductIsScheduled = ({
 	cusRes,
@@ -212,30 +211,3 @@ export const checkFeatureHasCorrectBalance = async ({
 		`Balance for ${feature.id} does not match expected balance`,
 	).toStrictEqual(expectedBalance);
 };
-
-export const compareProductEntitlements = ({
-	customerId,
-	product,
-	features,
-	quantity = 1,
-}: {
-	customerId: string;
-	product: any;
-	features: Record<string, Feature>;
-	quantity?: number;
-}) => {
-	for (const entitlement of Object.values(
-		product.entitlements,
-	) as Entitlement[]) {
-		const feature =
-			features[entitlement.feature_id!] ||
-			creditSystems[entitlement.feature_id as keyof typeof creditSystems];
-
-		checkFeatureHasCorrectBalance({
-			customerId,
-			feature,
-			entitlement,
-			expectedBalance: (entitlement.allowance || 0) * quantity,
-		});
-	}
-};
diff --git a/server/tests/utils/expectUtils/expectSubUtils.ts b/server/tests/utils/expectUtils/expectSubUtils.ts
index b9bfb7851..2e1fa54af 100644
--- a/server/tests/utils/expectUtils/expectSubUtils.ts
+++ b/server/tests/utils/expectUtils/expectSubUtils.ts
@@ -1,28 +1,26 @@
-import { DrizzleCli } from "@/db/initDrizzle.js";
-import { getStripeSubs } from "@/external/stripe/stripeSubUtils.js";
+import {
+	type AppEnv,
+	BillingType,
+	CusProductStatus,
+	cusProductToPrices,
+	type FullCusProduct,
+	type Organization,
+	type ProductV2,
+	type UsagePriceConfig,
+} from "@autumn/shared";
+import { expect } from "chai";
+import type Stripe from "stripe";
+import type { DrizzleCli } from "@/db/initDrizzle.js";
 import {
 	findStripeItemForPrice,
 	isLicenseItem,
 } from "@/external/stripe/stripeSubUtils/stripeSubItemUtils.js";
-import { cusProductToPrices } from "@autumn/shared";
+import { getStripeSubs } from "@/external/stripe/stripeSubUtils.js";
 import { CusService } from "@/internal/customers/CusService.js";
-import { getBillingType } from "@/internal/products/prices/priceUtils.js";
 import { isV4Usage } from "@/internal/products/prices/priceUtils/usagePriceUtils/classifyUsagePrice.js";
+import { getBillingType } from "@/internal/products/prices/priceUtils.js";
 import { isFreeProductV2 } from "@/internal/products/productUtils/classifyProduct.js";
 import { notNullish, nullish } from "@/utils/genUtils.js";
-import {
-	AppEnv,
-	BillingType,
-	CusProductStatus,
-	FullCusProduct,
-	Organization,
-	ProductV2,
-	UsagePriceConfig,
-} from "@autumn/shared";
-import { expect } from "chai";
-import { getDate } from "date-fns";
-
-import Stripe from "stripe";
 
 export const getSubsFromCusId = async ({
 	stripeCli,
@@ -57,7 +55,7 @@ export const getSubsFromCusId = async ({
 	});
 
 	const cusProduct = fullCus.customer_products.find(
-		(cp: FullCusProduct) => cp.product.id == productId,
+		(cp: FullCusProduct) => cp.product.id === productId,
 	)!;
 
 	const subs: Stripe.Subscription[] = await getStripeSubs({
@@ -72,59 +70,6 @@ export const getSubsFromCusId = async ({
 	};
 };
 
-// export const expectSubAnchorsSame = async ({
-//   stripeCli,
-//   customerId,
-//   productId,
-//   db,
-//   org,
-//   env,
-// }: {
-//   stripeCli: Stripe;
-//   customerId: string;
-//   productId: string;
-//   db: DrizzleCli;
-//   org: Organization;
-//   env: AppEnv;
-// }) => {
-//   const fullCus = await CusService.getFull({
-//     db,
-//     idOrInternalId: customerId,
-//     orgId: org.id,
-//     env,
-//   });
-
-//   const cusProduct = fullCus.customer_products.find(
-//     (cp: FullCusProduct) => cp.product.id == productId
-//   );
-
-//   const sub = await cusProductToSub({
-//     cusProduct,
-//     stripeCli,
-//   });
-
-//   // const subs: Stripe.Subscription[] = await getStripeSubs({
-//   //   stripeCli,
-//   //   subIds: cusProduct?.subscription_ids,
-//   // });
-
-//   // let periodEnd = subs[0].current_period_end * 1000;
-//   // let firstDate = getDate(periodEnd);
-
-//   // for (const sub of subs.slice(1)) {
-//   //   let dateOfAnchor = getDate(sub.current_period_end * 1000);
-//   //   expect(dateOfAnchor).to.equal(
-//   //     firstDate,
-//   //     `subscription anchors are the same`,
-//   //   );
-//   // }
-
-//   return {
-//     fullCus,
-//     // subs,
-//   };
-// };
-
 const subIsCanceled = ({ sub }: { sub: Stripe.Subscription }) => {
 	return (
 		notNullish(sub.canceled_at) ||
@@ -162,13 +107,15 @@ export const expectSubItemsCorrect = async ({
 		withEntities: true,
 	});
 
-	let entity = entityId ? fullCus.entities.find((e) => e.id == entityId) : null;
+	const entity = entityId
+		? fullCus.entities.find((e) => e.id === entityId)
+		: null;
 
 	const productId = product.id;
 	const cusProduct = fullCus.customer_products.find(
 		(cp: FullCusProduct) =>
-			cp.product.id == productId &&
-			(entity ? cp.internal_entity_id == entity.internal_id : true),
+			cp.product.id === productId &&
+			(entity ? cp.internal_entity_id === entity.internal_id : true),
 	)!;
 
 	if (isCanceled) {
@@ -237,7 +184,7 @@ export const expectSubItemsCorrect = async ({
 				nullish(subItem) ||
 					(subItem?.quantity === 0 &&
 						isLicenseItem({ stripeItem: subItem! })) ||
-					subItem?.price.id == usagePriceConfig.stripe_empty_price_id,
+					subItem?.price.id === usagePriceConfig.stripe_empty_price_id,
 			).to.be.true;
 			continue;
 		} else {
@@ -248,10 +195,12 @@ export const expectSubItemsCorrect = async ({
 		}
 
 		// 2. If prepaid...
-		let billingType = getBillingType(price.config);
-		if (billingType == BillingType.UsageInAdvance) {
+		const billingType = getBillingType(price.config);
+		if (billingType === BillingType.UsageInAdvance) {
 			const featureId = (price.config as any).feature_id;
-			const options = cusProduct.options.find((o) => o.feature_id == featureId);
+			const options = cusProduct.options.find(
+				(o) => o.feature_id === featureId,
+			);
 
 			expect(
 				options,
@@ -263,7 +212,6 @@ export const expectSubItemsCorrect = async ({
 				subItem?.quantity,
 				`sub item quantity for prepaid price (featureId: ${featureId}) should be ${expectedQuantity}`,
 			).to.equal(expectedQuantity);
-			continue;
 		}
 	}
 
diff --git a/server/tests/utils/genUtils.ts b/server/tests/utils/genUtils.ts
index 4cb06ee6a..d8b7d3155 100644
--- a/server/tests/utils/genUtils.ts
+++ b/server/tests/utils/genUtils.ts
@@ -1,9 +1,4 @@
-import { CusService } from "@/internal/customers/CusService.js";
-import {
-	CusProductStatus,
-	FullCusProduct,
-	UsagePriceConfig,
-} from "@autumn/shared";
+import type { CusProductStatus, FullCusProduct } from "@autumn/shared";
 import { AutumnCli } from "@tests/cli/AutumnCli.js";
 
 export const timeout = (ms: number) => {
@@ -79,30 +74,3 @@ export const getUsagePriceTiers = ({
 	}
 	return [];
 };
-
-export const getFeaturePrice = ({
-	product,
-	featureId,
-	cusProducts,
-	subId,
-}: {
-	product: any;
-	featureId: string;
-	cusProducts: FullCusProduct[];
-	subId?: string;
-}) => {
-	if (cusProducts.length == 0) {
-		return null;
-	}
-
-	let mainProduct = cusProducts[0];
-
-	for (const cusPrice of mainProduct.customer_prices) {
-		let price = cusPrice.price;
-		if ((price.config! as UsagePriceConfig).feature_id === featureId) {
-			return price;
-		}
-	}
-
-	return null;
-};
diff --git a/server/tests/utils/general/numberUtils.ts b/server/tests/utils/general/numberUtils.ts
index e8fcf6b76..4f0a5281e 100644
--- a/server/tests/utils/general/numberUtils.ts
+++ b/server/tests/utils/general/numberUtils.ts
@@ -1,6 +1,6 @@
 export const isValidNumber = (value: any) => {
-	let number = parseFloat(value);
-	return !isNaN(number) && isFinite(number);
+	const number = parseFloat(value);
+	return !Number.isNaN(number) && Number.isFinite(number);
 };
 
 export const numberWithCommas = (x: number) => {
diff --git a/server/tests/utils/init.ts b/server/tests/utils/init.ts
index 96bd0d55b..1cd0b2069 100644
--- a/server/tests/utils/init.ts
+++ b/server/tests/utils/init.ts
@@ -35,7 +35,6 @@ export const initFeature = ({
 	type,
 	creditSchema = [],
 	aggregateType = AggregateType.Sum,
-	groupBy = "",
 	eventName,
 	usageType = FeatureUsageType.Single,
 }: {
@@ -47,7 +46,6 @@ export const initFeature = ({
 		credit_amount: number;
 	}[];
 	aggregateType?: AggregateType;
-	groupBy?: string;
 	eventName?: string;
 	usageType?: FeatureUsageType;
 }): (Feature & { eventName: string }) | any => {
diff --git a/server/tests/utils/stripeUtils.ts b/server/tests/utils/stripeUtils.ts
index 92f09c795..11f30c2aa 100644
--- a/server/tests/utils/stripeUtils.ts
+++ b/server/tests/utils/stripeUtils.ts
@@ -19,34 +19,13 @@ import { timeout } from "./genUtils.js";
 
 const STRIPE_TEST_CLOCK_TIMING = 20000; // 30s
 
-import { Hyperbrowser } from "@hyperbrowser/sdk";
-
-const client = new Hyperbrowser({
-	apiKey: process.env.HYPERBROWSER_API_KEY || "123",
-});
-
 export const completeCheckoutForm = async (
 	url: string,
 	overrideQuantity?: number,
 	promoCode?: string,
-	isLocal?: boolean,
+	_isLocal?: boolean,
 ) => {
-	let browser;
-
-	// if (process.env.NODE_ENV === "development" && !isLocal) {
-	// 	const session = await client.sessions.create();
-	// 	browser = await puppeteer.connect({
-	// 		browserWSEndpoint: session!.wsEndpoint,
-	// 		defaultViewport: null,
-	// 	});
-	// } else {
-	// 	browser = await puppeteer.launch({
-	// 		headless: false,
-	// 		executablePath: "/Applications/Chromium.app/Contents/MacOS/Chromium",
-	// 		args: ["--no-sandbox", "--disable-setuid-sandbox"],
-	// 	});
-	// }
-	browser = await puppeteer.launch({
+	const browser = await puppeteer.launch({
 		headless: false,
 		executablePath: "/Applications/Chromium.app/Contents/MacOS/Chromium",
 		args: ["--no-sandbox", "--disable-setuid-sandbox"],
@@ -64,7 +43,7 @@ export const completeCheckoutForm = async (
 			});
 			await page.click("#payment-method-accordion-item-title-card");
 			await timeout(500); // Brief wait for accordion to expand
-		} catch (e) {
+		} catch (_e) {
 			// Accordion doesn't exist or didn't appear, continue without clicking
 		}
 
@@ -131,7 +110,7 @@ export const deleteAllStripeProducts = async ({
 				console.log("Deleting stripe product", prod.id);
 				try {
 					await stripeCli.products.del(prod.id);
-				} catch (error) {
+				} catch (_error) {
 					await stripeCli.products.update(prod.id, {
 						active: false,
 					});
@@ -168,10 +147,9 @@ export const deleteStripeProduct = async ({
 	stripeCli: Stripe;
 	product: FullProduct;
 }) => {
-	let stripeProd;
 	try {
-		stripeProd = await stripeCli.products.retrieve(product.processor!.id);
-	} catch (error) {
+		await stripeCli.products.retrieve(product.processor!.id);
+	} catch (_error) {
 		return;
 	}
 
@@ -189,7 +167,7 @@ export const deleteStripeProduct = async ({
 			// Delete default product
 			try {
 				await stripeCli.products.del(stripePrice.product as string);
-			} catch (error) {
+			} catch (_error) {
 				await stripeCli.products.update(stripePrice.product as string, {
 					active: false,
 				});
@@ -206,7 +184,7 @@ export const deleteStripeProduct = async ({
 		const stripeProdId = product.processor.id;
 		try {
 			await stripeCli.products.del(stripeProdId);
-		} catch (error) {
+		} catch (_error) {
 			await stripeCli.products.update(stripeProdId, {
 				active: false,
 			});
@@ -277,7 +255,7 @@ export const advanceTestClock = async ({
 	}
 
 	console.log("   - Advancing to: ", format(advanceTo, "dd MMM yyyy HH:mm:ss"));
-	const res = await stripeCli.testHelpers.testClocks.advance(testClockId, {
+	await stripeCli.testHelpers.testClocks.advance(testClockId, {
 		frozen_time: Math.floor(advanceTo / 1000),
 	});
 
@@ -367,8 +345,7 @@ export const advanceMonths = async ({
 }) => {
 	let advanceTo = new Date();
 	for (let i = 0; i < numberOfMonths; i += 1) {
-		// let numMonths = Math.min(numberOfMonths - i, 2);
-		(advanceTo = addMonths(advanceTo, 1)), 10;
+		advanceTo = addMonths(advanceTo, 1);
 		console.log(
 			"   - Advancing to: ",
 			format(advanceTo, "dd MMM yyyy HH:mm:ss"),
@@ -428,11 +405,13 @@ export const getDiscount = async ({
 	stripeCli: Stripe;
 	customer?: Customer;
 	stripeId?: string;
-}) => {
+}): Promise<
+	(Stripe.Discount & { source: { coupon: Stripe.Coupon } }) | null
+> => {
 	const stripeCustomer: any = await stripeCli.customers.retrieve(
 		stripeId || customer!.processor!.id,
 		{
-			expand: ["discount.coupon"],
+			expand: ["discount.source.coupon"],
 		},
 	);
 
diff --git a/server/tests/utils/testAttachUtils/testAttachUtils.ts b/server/tests/utils/testAttachUtils/testAttachUtils.ts
index ecf8c671f..b45f13c5d 100644
--- a/server/tests/utils/testAttachUtils/testAttachUtils.ts
+++ b/server/tests/utils/testAttachUtils/testAttachUtils.ts
@@ -1,14 +1,13 @@
-import { notNullish } from "@/utils/genUtils.js";
-import { advanceTestClock } from "@/utils/scriptUtils/testClockUtils.js";
 import {
 	AttachBranch,
-	AttachPreview,
+	type AttachPreview,
 	OnIncrease,
 	UsageModel,
 } from "@autumn/shared";
 import { addHours, addMonths } from "date-fns";
 import { Decimal } from "decimal.js";
-import Stripe from "stripe";
+import type Stripe from "stripe";
+import { advanceTestClock } from "@/utils/scriptUtils/testClockUtils.js";
 import { hoursToFinalizeInvoice } from "../constants.js";
 
 export const getCurrentOptions = ({
@@ -22,7 +21,7 @@ export const getCurrentOptions = ({
 	if (!options) return currentOptions;
 
 	const isUpdatePrepaidQuantity =
-		preview?.branch == AttachBranch.UpdatePrepaidQuantity;
+		preview?.branch === AttachBranch.UpdatePrepaidQuantity;
 
 	for (const option of currentOptions || []) {
 		const previewOption = preview?.options.find(
@@ -38,7 +37,7 @@ export const getCurrentOptions = ({
 		const isDecrease = newQuantity < currentQuantity;
 		const isIncrease = newQuantity > currentQuantity;
 
-		if (isDecrease && previewOption.config.on_decrease == "none") {
+		if (isDecrease && previewOption.config.on_decrease === "none") {
 			option.quantity = currentQuantity;
 			continue;
 		}
@@ -46,9 +45,8 @@ export const getCurrentOptions = ({
 		if (
 			isUpdatePrepaidQuantity &&
 			isIncrease &&
-			previewOption.config.on_increase == OnIncrease.ProrateNextCycle
+			previewOption.config.on_increase === OnIncrease.ProrateNextCycle
 		) {
-			continue;
 		}
 	}
 
@@ -69,8 +67,8 @@ export const getAttachTotal = ({
 		dueToday?.line_items.reduce((acc: any, item: any) => {
 			// Skip prepaid items that are already in the options
 			if (
-				item.usage_model == UsageModel.Prepaid &&
-				options.some((o: any) => o.feature_id == item.feature_id)
+				item.usage_model === UsageModel.Prepaid &&
+				options.some((o: any) => o.feature_id === item.feature_id)
 			) {
 				return acc;
 			}
@@ -82,7 +80,7 @@ export const getAttachTotal = ({
 		}, new Decimal(0)) || new Decimal(0);
 
 	const isUpdatePrepaidQuantity =
-		preview?.branch == AttachBranch.UpdatePrepaidQuantity;
+		preview?.branch === AttachBranch.UpdatePrepaidQuantity;
 	if (isUpdatePrepaidQuantity) {
 		dueTodayTotal = new Decimal(0);
 	}
@@ -101,7 +99,7 @@ export const getAttachTotal = ({
 		const isDecrease = newQuantity < currentQuantity;
 		const isIncrease = newQuantity > currentQuantity;
 
-		if (isDecrease && previewOption.config.on_decrease == "none") {
+		if (isDecrease && previewOption.config.on_decrease === "none") {
 			option.quantity = currentQuantity;
 			continue;
 		}
@@ -109,7 +107,7 @@ export const getAttachTotal = ({
 		if (
 			isUpdatePrepaidQuantity &&
 			isIncrease &&
-			previewOption.config.on_increase == OnIncrease.ProrateNextCycle
+			previewOption.config.on_increase === OnIncrease.ProrateNextCycle
 		) {
 			continue;
 		}
diff --git a/server/tests/utils/testInitUtils/createTestContext.ts b/server/tests/utils/testInitUtils/createTestContext.ts
index 1bf45ab11..82ab434af 100644
--- a/server/tests/utils/testInitUtils/createTestContext.ts
+++ b/server/tests/utils/testInitUtils/createTestContext.ts
@@ -1,40 +1,6 @@
-import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import dotenv from "dotenv";
 
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// Load local .env file similar to initInfisical.ts
-const loadLocalEnv = () => {
-	const processDir = process.cwd();
-	const serverDir = processDir.includes("server")
-		? processDir
-		: join(processDir, "server");
-
-	// Determine which env file to load based on ENV_FILE environment variable
-	// Defaults to .env if not specified
-	const envFileName = process.env.ENV_FILE || ".env";
-	const envPath = join(serverDir, envFileName);
-
-	// Load local .env file
-	const result = dotenv.config({ path: envPath });
-	if (result.parsed) {
-		console.log(
-			`📄 Loading ${Object.keys(result.parsed).length} variables from ${envFileName}`,
-		);
-		for (const [key, value] of Object.entries(result.parsed)) {
-			if (!process.env[key]) {
-				process.env[key] = value;
-			}
-		}
-	} else {
-		console.log(`ℹ️  No ${envFileName} file found at ${envPath}`);
-	}
-};
-
-// Load environment variables before initializing anything else
-loadLocalEnv();
 
 import { AppEnv, type Feature, type Organization } from "@autumn/shared";
 import type Stripe from "stripe";
diff --git a/server/tests/utils/testProductUtils/testProductUtils.ts b/server/tests/utils/testProductUtils/testProductUtils.ts
index e30bece44..b77f4b35c 100644
--- a/server/tests/utils/testProductUtils/testProductUtils.ts
+++ b/server/tests/utils/testProductUtils/testProductUtils.ts
@@ -1,14 +1,13 @@
-import { isFixedPrice } from "@/internal/products/prices/priceUtils/usagePriceUtils/classifyUsagePrice.js";
-import { isPriceItem } from "@/internal/products/product-items/productItemUtils/getItemType.js";
-import { nullish } from "@/utils/genUtils.js";
-import {
+import type {
 	BillingInterval,
 	FixedPriceConfig,
-	FullProduct,
 	Price,
 	ProductItem,
 	ProductV2,
 } from "@autumn/shared";
+import { isFixedPrice } from "@/internal/products/prices/priceUtils/usagePriceUtils/classifyUsagePrice.js";
+import { isPriceItem } from "@/internal/products/product-items/productItemUtils/getItemType.js";
+import { nullish } from "@/utils/genUtils.js";
 
 export const addPrefixToProducts = ({
 	products,
@@ -39,23 +38,23 @@ export const replaceItems = ({
 	newItem: ProductItem;
 	items: ProductItem[];
 }) => {
-	let newItems = structuredClone(items);
+	const newItems = structuredClone(items);
 
 	let index;
 	if (featureId) {
-		index = newItems.findIndex((item) => item.feature_id == featureId);
+		index = newItems.findIndex((item) => item.feature_id === featureId);
 	}
 
 	if (interval) {
 		index = newItems.findIndex(
 			(item) =>
-				item.interval == (interval as any) &&
-				(intervalCount ? item.interval_count == intervalCount : true) &&
+				item.interval === (interval as any) &&
+				(intervalCount ? item.interval_count === intervalCount : true) &&
 				nullish(item.feature_id),
 		);
 	}
 
-	if (index == -1) {
+	if (index === -1) {
 		throw new Error("Item not found");
 	}
 
@@ -69,7 +68,7 @@ export const getBasePrice = ({ product }: { product: ProductV2 }) => {
 };
 
 export const v1ProductToBasePrice = ({ prices }: { prices: Price[] }) => {
-	let fixedPrice = prices.find((price) => isFixedPrice({ price }));
+	const fixedPrice = prices.find((price) => isFixedPrice({ price }));
 	if (fixedPrice) {
 		return (fixedPrice.config as FixedPriceConfig).amount;
 	} else return 0;
diff --git a/shared/api/customers/changes/V1.2_CustomerChange.ts b/shared/api/customers/changes/V1.2_CustomerChange.ts
index 91e1473e5..62a91b350 100644
--- a/shared/api/customers/changes/V1.2_CustomerChange.ts
+++ b/shared/api/customers/changes/V1.2_CustomerChange.ts
@@ -69,6 +69,7 @@ export const V1_2_CustomerChange = defineVersionChange({
 
 		// Step 3: Return V1.2 customer format
 		return {
+			autumn_id: input.autumn_id,
 			id: input.id,
 			name: input.name,
 			email: input.email,
diff --git a/shared/api/customers/cusFeatures/apiBalance.ts b/shared/api/customers/cusFeatures/apiBalance.ts
index d5bdfb6ea..d05bfcf16 100644
--- a/shared/api/customers/cusFeatures/apiBalance.ts
+++ b/shared/api/customers/cusFeatures/apiBalance.ts
@@ -38,8 +38,8 @@ export const ApiBalanceSchema = z.object({
 	max_purchase: z.number().nullable(),
 	reset: ApiBalanceResetSchema.nullable(),
 
-	breakdown: z.array(ApiBalanceBreakdownSchema).nullish(),
-	rollovers: z.array(ApiBalanceRolloverSchema).nullish(),
+	breakdown: z.array(ApiBalanceBreakdownSchema).optional(),
+	rollovers: z.array(ApiBalanceRolloverSchema).optional(),
 });
 
 export type ApiBalanceReset = z.infer<typeof ApiBalanceResetSchema>;
diff --git a/shared/api/customers/previousVersions/apiCustomerV3.ts b/shared/api/customers/previousVersions/apiCustomerV3.ts
index c19224bcd..0b4d1e035 100644
--- a/shared/api/customers/previousVersions/apiCustomerV3.ts
+++ b/shared/api/customers/previousVersions/apiCustomerV3.ts
@@ -146,6 +146,9 @@ export const ApiCusExpandV3Schema = z.object({
 
 export const ApiCustomerV3Schema = z.object({
 	// Internal fields
+	autumn_id: z.string().nullish().meta({
+		internal: true,
+	}),
 	id: z.string().nullable().meta({
 		description: cusDescriptions.id,
 	}),
diff --git a/vite/src/views/products/rewards/reward-config/components/DiscountRewardConfig.tsx b/vite/src/views/products/rewards/reward-config/components/DiscountRewardConfig.tsx
index adb7c283f..3341cc6ae 100644
--- a/vite/src/views/products/rewards/reward-config/components/DiscountRewardConfig.tsx
+++ b/vite/src/views/products/rewards/reward-config/components/DiscountRewardConfig.tsx
@@ -1,10 +1,9 @@
-import { CouponDurationType, RewardType } from "@autumn/shared";
+import { CouponDurationType } from "@autumn/shared";
 import { FormLabel } from "@/components/v2/form/FormLabel";
 import { Input } from "@/components/v2/inputs/Input";
 import {
 	InputGroup,
 	InputGroupAddon,
-	InputGroupInput,
 	InputGroupText,
 } from "@/components/v2/inputs/InputGroup";
 import {
@@ -38,8 +37,7 @@ export function DiscountRewardConfig({
 		});
 	};
 
-	const showDurationValue =
-		config.duration_type === CouponDurationType.Months;
+	const showDurationValue = config.duration_type === CouponDurationType.Months;
 
 	return (
 		<SheetSection title="Discount Configuration" withSeparator={false}>
@@ -60,7 +58,11 @@ export function DiscountRewardConfig({
 							<SelectContent>
 								<SelectItem value="percentage">Percentage</SelectItem>
 								<SelectItem value="fixed">Fixed</SelectItem>
-								<SelectItem value="invoice_credits">Invoice Credits</SelectItem>
+								{reward.discountType === "invoice_credits" && (
+									<SelectItem value="invoice_credits">
+										Invoice Credits
+									</SelectItem>
+								)}
 							</SelectContent>
 						</Select>
 					</div>
@@ -114,7 +116,9 @@ export function DiscountRewardConfig({
 									type="number"
 									placeholder="eg. 3"
 									className="w-20"
-									value={config.duration_value === 0 ? "" : config.duration_value}
+									value={
+										config.duration_value === 0 ? "" : config.duration_value
+									}
 									onChange={(e) => {
 										const value =
 											e.target.value === "" ? 0 : Number(e.target.value);
@@ -135,7 +139,9 @@ export function DiscountRewardConfig({
 									<SelectItem value={CouponDurationType.OneOff}>
 										One-off
 									</SelectItem>
-									<SelectItem value={CouponDurationType.Months}>Months</SelectItem>
+									<SelectItem value={CouponDurationType.Months}>
+										Months
+									</SelectItem>
 									<SelectItem value={CouponDurationType.Forever}>
 										Forever
 									</SelectItem>