diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts
index 2286a7f..46ab33a 100644
--- a/src/routes/voteOnSponsorTime.ts
+++ b/src/routes/voteOnSponsorTime.ts
@@ -133,9 +133,9 @@ function sendWebhooks(voteData: VoteData) {
 
 function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmission: boolean, category: string, hashedIP: string, res: Response) {
     // Check if they've already made a vote
-    const previousVoteInfo = privateDB.prepare('get', "select count(*) as votes, category from categoryVotes where UUID = ? and userID = ?", [UUID, userID]);
+    const usersLastVoteInfo = privateDB.prepare('get', "select count(*) as votes, category from categoryVotes where UUID = ? and userID = ?", [UUID, userID]);
 
-    if (previousVoteInfo !== undefined && previousVoteInfo.category === category) {
+    if (usersLastVoteInfo?.category === category) {
         // Double vote, ignore
         res.sendStatus(200);
         return;
@@ -153,6 +153,8 @@ function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmiss
         return;
     }
 
+    const nextCategoryInfo = db.prepare("get", "select votes from categoryVotes where UUID = ? and category = ?", [UUID, category]);
+
     const timeSubmitted = Date.now();
 
     const voteAmount = isVIP ? 500 : 1;
@@ -167,11 +169,11 @@ function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmiss
     }
 
     // Add the info into the private db
-    if (previousVoteInfo !== undefined) {
+    if (usersLastVoteInfo?.votes > 0) {
         // Reverse the previous vote
-        db.prepare('run', "update categoryVotes set votes = votes - ? where UUID = ? and category = ?", [voteAmount, UUID, previousVoteInfo.category]);
+        db.prepare('run', "update categoryVotes set votes = votes - ? where UUID = ? and category = ?", [voteAmount, UUID, usersLastVoteInfo.category]);
 
-        privateDB.prepare('run', "update categoryVotes set category = ?, timeSubmitted = ?, hashedIP = ? where userID = ?", [category, timeSubmitted, hashedIP, userID]);
+        privateDB.prepare('run', "update categoryVotes set category = ?, timeSubmitted = ?, hashedIP = ? where userID = ? and UUID = ?", [category, timeSubmitted, hashedIP, userID, UUID]);
     } else {
         privateDB.prepare('run', "insert into categoryVotes (UUID, userID, hashedIP, category, timeSubmitted) values (?, ?, ?, ?, ?)", [UUID, userID, hashedIP, category, timeSubmitted]);
     }
@@ -194,11 +196,11 @@ function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmiss
         privateDB.prepare("run", "insert into categoryVotes (UUID, userID, hashedIP, category, timeSubmitted) values (?, ?, ?, ?, ?)", [UUID, submissionInfo.userID, "unknown", currentCategory.category, submissionInfo.timeSubmitted]);
     }
 
-    const nextCategoryCount = (previousVoteInfo.votes || 0) + voteAmount;
+    const nextCategoryCount = (nextCategoryInfo?.votes || 0) + voteAmount;
 
     //TODO: In the future, raise this number from zero to make it harder to change categories
     // VIPs change it every time
-    if (nextCategoryCount - currentCategoryCount >= (submissionInfo ? Math.max(Math.ceil(submissionInfo.votes / 2), 1) : 1) || isVIP || isOwnSubmission) {
+    if (nextCategoryCount - currentCategoryCount >= Math.max(Math.ceil(submissionInfo?.votes / 2), 2) || isVIP || isOwnSubmission) {
         // Replace the category
         db.prepare('run', "update sponsorTimes set category = ? where UUID = ?", [category, UUID]);
     }
diff --git a/test/cases/voteOnSponsorTime.ts b/test/cases/voteOnSponsorTime.ts
index 11c0f70..29a28e3 100644
--- a/test/cases/voteOnSponsorTime.ts
+++ b/test/cases/voteOnSponsorTime.ts
@@ -224,25 +224,26 @@ describe('voteOnSponsorTime', () => {
             });
     });
 
-    /** Test needs to be updated with new category vote limit
-    it('Should be able to vote for a category and it should immediately change (for now)', (done: Done) => {
+    it('Should be able to vote for a category and it should add your vote to the database', (done: Done) => {
         request.get(getbaseURL()
             + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=intro", null,
             (err, res) => {
                 if (err) done(err);
                 else if (res.statusCode === 200) {
                     let row = db.prepare('get', "SELECT category FROM sponsorTimes WHERE UUID = ?", ["vote-uuid-4"]);
-                    if (row.category === "intro") {
+                    let categoryRows = db.prepare('all', "SELECT votes, category FROM categoryVotes WHERE UUID = ?", ["vote-uuid-4"]);
+                    if (row.category === "sponsor" && categoryRows.length === 2 
+                            && categoryRows[0]?.votes === 1 && categoryRows[0]?.category === "intro"
+                                && categoryRows[1]?.votes === 1 && categoryRows[1]?.category === "sponsor") {
                         done();
                     } else {
-                        done("Vote did not succeed. Submission went from sponsor to " + row.category);
+                        done("Submission changed to " + row.category + " instead of staying as sponsor. Vote was applied as " + categoryRows[0]?.category + " with " + categoryRows[0]?.votes + " votes and there were " + categoryRows.length + " rows.");
                     }
                 } else {
                     done("Status code was " + res.statusCode);
                 }
             });
     });
-    */
 
     it('Should not able to change to an invalid category', (done: Done) => {
         request.get(getbaseURL()
@@ -262,25 +263,34 @@ describe('voteOnSponsorTime', () => {
             });
     });
 
-    /** Test needs to be updated with new category vote limit
-    it('Should be able to change your vote for a category and it should immediately change (for now)', (done: Done) => {
+    it('Should be able to change your vote for a category and it should add your vote to the database', (done: Done) => {
         request.get(getbaseURL()
             + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=outro", null,
             (err, res) => {
                 if (err) done(err);
                 else if (res.statusCode === 200) {
-                    let row = db.prepare('get', "SELECT category FROM sponsorTimes WHERE UUID = ?", ["vote-uuid-4"]);
-                    if (row.category === "outro") {
+                    let submissionRow = db.prepare('get', "SELECT category FROM sponsorTimes WHERE UUID = ?", ["vote-uuid-4"]);
+                    let categoryRows = db.prepare('all', "SELECT votes, category FROM categoryVotes WHERE UUID = ?", ["vote-uuid-4"]);
+                    let introVotes = 0;
+                    let outroVotes = 0;
+                    let sponsorVotes = 0;
+                    for (const row of categoryRows) {
+                        if (row?.category === "intro") introVotes += row?.votes;
+                        if (row?.category === "outro") outroVotes += row?.votes;
+                        if (row?.category === "sponsor") sponsorVotes += row?.votes;
+                    }
+                    if (submissionRow.category === "sponsor" && categoryRows.length === 3 
+                            && introVotes === 0 && outroVotes === 1 && sponsorVotes === 1) {
                         done();
                     } else {
-                        done("Vote did not succeed. Submission went from intro to " + row.category);
+                        done("Submission changed to " + submissionRow.category + " instead of staying as sponsor. There were " 
+                                + introVotes + " intro votes, " + outroVotes + " outro votes and " + sponsorVotes + " sponsor votes.");
                     }
                 } else {
                     done("Status code was " + res.statusCode);
                 }
             });
     });
-    */
 
 
     it('Should not be able to change your vote to an invalid category', (done: Done) => {