diff --git a/spec/AuthenticationAdaptersV2.spec.js b/spec/AuthenticationAdaptersV2.spec.js
index 9507691114..aaa172ea66 100644
--- a/spec/AuthenticationAdaptersV2.spec.js
+++ b/spec/AuthenticationAdaptersV2.spec.js
@@ -348,7 +348,7 @@ describe('Auth Adapter features', () => {
   it('should strip out authData if required', async () => {
     const spy = spyOn(modernAdapter3, 'validateOptions').and.callThrough();
     const afterSpy = spyOn(modernAdapter3, 'afterFind').and.callThrough();
-    await reconfigureServer({ auth: { modernAdapter3 }, silent: false });
+    await reconfigureServer({ auth: { modernAdapter3 } });
     const user = new Parse.User();
     await user.save({ authData: { modernAdapter3: { id: 'modernAdapter3Data' } } });
     await user.fetch({ sessionToken: user.getSessionToken() });
diff --git a/spec/Idempotency.spec.js b/spec/Idempotency.spec.js
index a45d19343c..813923b1ff 100644
--- a/spec/Idempotency.spec.js
+++ b/spec/Idempotency.spec.js
@@ -45,10 +45,6 @@ describe('Idempotency', () => {
     });
   });
 
-  afterAll(() => {
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = process.env.PARSE_SERVER_TEST_TIMEOUT || 10000;
-  });
-
   // Tests
   it('should enforce idempotency for cloud code function', async () => {
     let counter = 0;
diff --git a/spec/ParseLiveQueryRedis.spec.js b/spec/ParseLiveQueryRedis.spec.js
index 3187d23cc8..deb84bafb2 100644
--- a/spec/ParseLiveQueryRedis.spec.js
+++ b/spec/ParseLiveQueryRedis.spec.js
@@ -6,6 +6,7 @@ if (process.env.PARSE_SERVER_TEST_CACHE === 'redis') {
     });
     it('can connect', async () => {
       await reconfigureServer({
+        appId: 'redis_live_query',
         startLiveQueryServer: true,
         liveQuery: {
           classNames: ['TestObject'],
@@ -36,6 +37,7 @@ if (process.env.PARSE_SERVER_TEST_CACHE === 'redis') {
 
     it('can call connect twice', async () => {
       const server = await reconfigureServer({
+        appId: 'redis_live_query',
         startLiveQueryServer: true,
         liveQuery: {
           classNames: ['TestObject'],
diff --git a/spec/ParseLiveQueryServer.spec.js b/spec/ParseLiveQueryServer.spec.js
index 16654cdd64..50f29d0aab 100644
--- a/spec/ParseLiveQueryServer.spec.js
+++ b/spec/ParseLiveQueryServer.spec.js
@@ -115,6 +115,7 @@ describe('ParseLiveQueryServer', function () {
   });
 
   describe_only_db('mongo')('initialization', () => {
+    beforeEach(() => reconfigureServer({ appId: 'mongo_init_test' }));
     it('can be initialized through ParseServer without liveQueryServerOptions', async () => {
       const parseServer = await ParseServer.startApp({
         appId: 'hello',
diff --git a/spec/helper.js b/spec/helper.js
index 445a137ac5..445de26509 100644
--- a/spec/helper.js
+++ b/spec/helper.js
@@ -198,6 +198,10 @@ beforeAll(async () => {
   Parse.serverURL = 'http://localhost:' + port + '/1';
 });
 
+beforeEach(() => {
+  jasmine.DEFAULT_TIMEOUT_INTERVAL = process.env.PARSE_SERVER_TEST_TIMEOUT || 10000;
+});
+
 afterEach(function (done) {
   const afterLogOut = async () => {
     if (Object.keys(openConnections).length > 0) {
@@ -214,6 +218,7 @@ afterEach(function (done) {
     done();
   };
   Parse.Cloud._removeAllHooks();
+  Parse.CoreManager.getLiveQueryController().setDefaultLiveQueryClient();
   defaults.protectedFields = { _User: { '*': ['email'] } };
   databaseAdapter
     .getAllClasses()
diff --git a/spec/index.spec.js b/spec/index.spec.js
index 64c4b54db7..08ef16a77b 100644
--- a/spec/index.spec.js
+++ b/spec/index.spec.js
@@ -558,7 +558,7 @@ describe('server', () => {
   });
 
   it('can get starting state', async () => {
-    await reconfigureServer({ appId: 'test2', silent: false });
+    await reconfigureServer({ appId: 'test2' });
     const parseServer = new ParseServer.ParseServer({
       ...defaultConfiguration,
       appId: 'test2',
diff --git a/src/Config.js b/src/Config.js
index 2e7ef389c7..812d28c367 100644
--- a/src/Config.js
+++ b/src/Config.js
@@ -626,6 +626,16 @@ export class Config {
     return new Date(now.getTime() + this.sessionLength * 1000);
   }
 
+  unregisterRateLimiters() {
+    let i = this.rateLimits?.length;
+    while (i--) {
+      const limit = this.rateLimits[i];
+      if (limit.cloud) {
+        this.rateLimits.splice(i, 1);
+      }
+    }
+  }
+
   get invalidLinkURL() {
     return this.customPages.invalidLink || `${this.publicServerURL}/apps/invalid_link.html`;
   }
diff --git a/src/TestUtils.js b/src/TestUtils.js
index 7772bcd65b..3d5133556d 100644
--- a/src/TestUtils.js
+++ b/src/TestUtils.js
@@ -1,4 +1,5 @@
 import AppCache from './cache';
+import SchemaCache from './Adapters/Cache/SchemaCache';
 
 /**
  * Destroys all data in the database
@@ -11,11 +12,17 @@ export function destroyAllDataPermanently(fast) {
   return Promise.all(
     Object.keys(AppCache.cache).map(appId => {
       const app = AppCache.get(appId);
+      const deletePromises = [];
+      if (app.cacheAdapter) {
+        deletePromises.push(app.cacheAdapter.clear());
+      }
       if (app.databaseController) {
-        return app.databaseController.deleteEverything(fast);
-      } else {
-        return Promise.resolve();
+        deletePromises.push(app.databaseController.deleteEverything(fast));
+      } else if (app.databaseAdapter) {
+        SchemaCache.clear();
+        deletePromises.push(app.databaseAdapter.deleteAllClasses(fast));
       }
+      return Promise.all(deletePromises);
     })
   );
 }
diff --git a/src/cloud-code/Parse.Cloud.js b/src/cloud-code/Parse.Cloud.js
index 75faf44f3d..5540e8d719 100644
--- a/src/cloud-code/Parse.Cloud.js
+++ b/src/cloud-code/Parse.Cloud.js
@@ -128,7 +128,8 @@ ParseCloud.define = function (functionName, handler, validationHandler) {
   if (validationHandler && validationHandler.rateLimit) {
     addRateLimit(
       { requestPath: `/functions/${functionName}`, ...validationHandler.rateLimit },
-      Parse.applicationId
+      Parse.applicationId,
+      true
     );
   }
 };
@@ -191,7 +192,8 @@ ParseCloud.beforeSave = function (parseClass, handler, validationHandler) {
         requestMethods: ['POST', 'PUT'],
         ...validationHandler.rateLimit,
       },
-      Parse.applicationId
+      Parse.applicationId,
+      true
     );
   }
 };
@@ -237,7 +239,8 @@ ParseCloud.beforeDelete = function (parseClass, handler, validationHandler) {
         requestMethods: 'DELETE',
         ...validationHandler.rateLimit,
       },
-      Parse.applicationId
+      Parse.applicationId,
+      true
     );
   }
 };
@@ -278,7 +281,8 @@ ParseCloud.beforeLogin = function (handler, validationHandler) {
   if (validationHandler && validationHandler.rateLimit) {
     addRateLimit(
       { requestPath: `/login`, requestMethods: 'POST', ...validationHandler.rateLimit },
-      Parse.applicationId
+      Parse.applicationId,
+      true
     );
   }
 };
@@ -456,7 +460,8 @@ ParseCloud.beforeFind = function (parseClass, handler, validationHandler) {
         requestMethods: 'GET',
         ...validationHandler.rateLimit,
       },
-      Parse.applicationId
+      Parse.applicationId,
+      true
     );
   }
 };
@@ -761,6 +766,8 @@ ParseCloud.afterLiveQueryEvent = function (parseClass, handler, validationHandle
 
 ParseCloud._removeAllHooks = () => {
   triggers._unregisterAll();
+  const config = Config.get(Parse.applicationId);
+  config?.unregisterRateLimiters();
 };
 
 ParseCloud.useMasterKey = () => {
diff --git a/src/middlewares.js b/src/middlewares.js
index 7d0b7fa8f4..0dca33135e 100644
--- a/src/middlewares.js
+++ b/src/middlewares.js
@@ -466,7 +466,7 @@ export function promiseEnforceMasterKeyAccess(request) {
   return Promise.resolve();
 }
 
-export const addRateLimit = (route, config) => {
+export const addRateLimit = (route, config, cloud) => {
   if (typeof config === 'string') {
     config = Config.get(config);
   }
@@ -545,6 +545,7 @@ export const addRateLimit = (route, config) => {
       },
       store: redisStore.store,
     }),
+    cloud,
   });
   Config.put(config);
 };