diff --git a/test/case_boilerplate.txt b/test/case_boilerplate.txt
new file mode 100644
index 0000000..a05ec26
--- /dev/null
+++ b/test/case_boilerplate.txt
@@ -0,0 +1,16 @@
+const endpoint = "/api/endpoint";
+
+const postTestEndpoint = () => client({
+    method: "POST",
+    url: endpoint,
+    data: {
+    }
+});
+
+const cases = [
+    "firstCase",
+    "secondCase",
+    "thirdCase"
+];
+const users = genUsers("endpoint", cases);
+const vipUser = genUser("endpoint", "vip");
\ No newline at end of file
diff --git a/test/cases/addFeatures.ts b/test/cases/addFeatures.ts
index 657555e..304222d 100644
--- a/test/cases/addFeatures.ts
+++ b/test/cases/addFeatures.ts
@@ -1,68 +1,57 @@
 import assert from "assert";
 import { db } from "../../src/databases/databases";
-import { Feature, HashedUserID } from "../../src/types/user.model";
+import { Feature } from "../../src/types/user.model";
 import { hasFeature } from "../../src/utils/features";
-import { getHash } from "../../src/utils/getHash";
 import { client } from "../utils/httpClient";
+import { grantFeature, insertVip } from "../utils/queryGen";
+import { User, genUser, genUsers } from "../utils/genUser";
 
 const endpoint = "/api/feature";
 
-const postAddFeatures = (userID: string, adminUserID: string, feature: Feature, enabled: string) => client({
+const postAddFeatures = (userID: string, adminUserID: string, feature: Feature, enabled: boolean) => client({
     method: "POST",
     url: endpoint,
     data: {
         userID,
         feature,
-        enabled,
+        enabled: String(enabled),
         adminUserID
     }
 });
 
-const privateVipUserID = "VIPUser-addFeatures";
-const vipUserID = getHash(privateVipUserID);
+const cases = [
+    "grant",
+    "remove",
+    "update"
+];
+const users = genUsers("addFeatures", cases);
+const vipUser = genUser("addFeatures", "vip");
 
-const hashedUserID1 = "user1-addFeatures" as HashedUserID;
-const hashedUserID2 = "user2-addFeatures" as HashedUserID;
-const hashedUserID3 = "user3-addFeatures" as HashedUserID;
+const testedFeature = Feature.ChapterSubmitter;
+const validFeatures = [testedFeature];
 
-const validFeatures = [Feature.ChapterSubmitter];
+const updateValidateFeature = (user: User, feature: Feature, grant: boolean, issuer: User): Promise<void> =>
+    postAddFeatures(user.pubID, issuer.privID, feature, grant)
+        .then(res => assert.strictEqual(res.status, 200)) // ensure request was successful
+        .then(() => hasFeature(user.pubID, feature))
+        .then(result => assert.strictEqual(result, grant)); // ensure user has new feature
 
 describe("addFeatures", () => {
-    before(() => {
-        const userFeatureQuery = `INSERT INTO "userFeatures" ("userID", "feature", "issuerUserID", "timeSubmitted") VALUES(?, ?, ?, ?)`;
-
-        return Promise.all([
-            db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES (?)`, [vipUserID]),
-
-            db.prepare("run", userFeatureQuery, [hashedUserID2, Feature.ChapterSubmitter, "some-user", 0]),
-            db.prepare("run", userFeatureQuery, [hashedUserID3, Feature.ChapterSubmitter, "some-user", 0])
-        ]);
+    before(async () => {
+        await insertVip(db, vipUser.pubID);
+        await grantFeature(db, users["remove"].pubID, testedFeature, vipUser.pubID);
+        await grantFeature(db, users["update"].pubID, testedFeature, vipUser.pubID);
     });
 
-    it("can add features", async () => {
+    it("can add features", (done) => {
         for (const feature of validFeatures) {
-            const result = await postAddFeatures(hashedUserID1, privateVipUserID, feature, "true");
-            assert.strictEqual(result.status, 200);
-
-            assert.strictEqual(await hasFeature(hashedUserID1, feature), true);
+            updateValidateFeature(users["grant"], feature, true, vipUser)
+                .catch(err => done(err));
         }
+        done();
     });
 
-    it("can remove features", async () => {
-        const feature = Feature.ChapterSubmitter;
+    it("can remove features", () => updateValidateFeature(users["remove"], testedFeature, false, vipUser));
 
-        const result = await postAddFeatures(hashedUserID2, privateVipUserID, feature, "false");
-        assert.strictEqual(result.status, 200);
-
-        assert.strictEqual(await hasFeature(hashedUserID2, feature), false);
-    });
-
-    it("can update features", async () => {
-        const feature = Feature.ChapterSubmitter;
-
-        const result = await postAddFeatures(hashedUserID3, privateVipUserID, feature, "true");
-        assert.strictEqual(result.status, 200);
-
-        assert.strictEqual(await hasFeature(hashedUserID3, feature), true);
-    });
+    it("can update features", () => updateValidateFeature(users["update"], testedFeature, true, vipUser));
 });
\ No newline at end of file
diff --git a/test/cases/getUserID.ts b/test/cases/getUserID.ts
index 52929cd..e469679 100644
--- a/test/cases/getUserID.ts
+++ b/test/cases/getUserID.ts
@@ -19,7 +19,7 @@ const validateSearch = (query: string, users: UsernameUser[], exact: number | bo
             assert.deepStrictEqual(res.data, expected);
         });
 
-const validateSearchWithUser = (user: UsernameUser, exact = false) =>
+const validateSearchWithUser = (user: UsernameUser, exact = false): Promise<void> =>
     validateSearch(user.username, [user], exact);
 
 const cases = new Map([
diff --git a/test/utils/queryGen.ts b/test/utils/queryGen.ts
index f3389ab..4576118 100644
--- a/test/utils/queryGen.ts
+++ b/test/utils/queryGen.ts
@@ -1,7 +1,9 @@
 import { IDatabase } from "../../src/databases/IDatabase";
 import { HashedUserID } from "../../src/types/user.model";
-import { usernameUserArray } from "./genUser";
+import { User, userArray, usernameUserArray } from "./genUser";
+import { Feature } from "../../src/types/user.model";
 
+// usernames
 export const insertUsername = async (db: IDatabase, userID: HashedUserID, userName: string, locked = false) => {
     const query = 'INSERT INTO "userNames" ("userID", "userName", "locked") VALUES(?, ?, ?)';
     const lockedValue = Number(locked);
@@ -9,7 +11,28 @@ export const insertUsername = async (db: IDatabase, userID: HashedUserID, userNa
 };
 
 export const insertUsernameBulk = async (db: IDatabase, users: usernameUserArray) => {
-    const query = 'INSERT INTO "userNames" ("userID", "userName", "locked") VALUES(?, ?, ?)';
     for (const user of Object.values(users))
-        await db.prepare("run", query, [user.pubID, user.username, 0]);
+        await insertUsername(db, user.pubID, user.username, false);
+};
+
+// vip
+export const insertVip = async (db: IDatabase, userID: HashedUserID) => {
+    const query = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
+    await db.prepare("run", query, [userID]);
+};
+
+export const insertVipBulk = async (db: IDatabase, users: userArray) => {
+    for (const user of Object.values(users))
+        await insertVip(db, user.pubID);
+};
+
+// userFeatures
+export const grantFeature = async (db: IDatabase, target: HashedUserID, feature: Feature, issuer = "default-issuer", time = 0) => {
+    const query = 'INSERT INTO "userFeatures" ("userID", "feature", "issuerUserID", "timeSubmitted") VALUES(?, ?, ?, ?)';
+    await db.prepare("run", query, [target, feature, issuer, time]);
+};
+
+export const bulkGrantFeature = async (db: IDatabase, users: userArray, feature: Feature, issuer: User, time = 0) => {
+    for (const user of Object.values(users))
+        await grantFeature(db, user.pubID, feature, issuer.pubID, time);
 };
\ No newline at end of file