diff --git a/firestore-stripe-payments/functions/__tests__/helpers/utils.ts b/firestore-stripe-payments/functions/__tests__/helpers/utils.ts
index bf2ef4d4..e25bf3d2 100644
--- a/firestore-stripe-payments/functions/__tests__/helpers/utils.ts
+++ b/firestore-stripe-payments/functions/__tests__/helpers/utils.ts
@@ -52,7 +52,7 @@ export const waitForDocumentUpdate = (
   document: DocumentData,
   field: string | number,
   value: any,
-  timeout: number = 10_000
+  timeout: number = 300000 // 5 minutes
 ): Promise<FirebaseFirestore.DocumentData> => {
   return new Promise((resolve, reject) => {
     let timedOut = false;
@@ -78,12 +78,15 @@ export const waitForDocumentUpdate = (
 
 export const waitForDocumentToExistInCollection = (
   query: Query,
-  field: string | number,
+  field: string,
   value: any,
-  timeout: number = 20_000
+  timeout: number = 300000 // 5 minutes
 ): Promise<DocumentData> => {
   return new Promise((resolve, reject) => {
     let timedOut = false;
+
+    let unsubscribe: () => void; // Declare unsubscribe here
+
     const timer = setTimeout(() => {
       timedOut = true;
       reject(
@@ -91,21 +94,32 @@ export const waitForDocumentToExistInCollection = (
           `Timeout waiting for firestore document to exist with field ${field} in collection`
         )
       );
+      if (unsubscribe) {
+        unsubscribe(); // Unsubscribe when timed out
+      }
     }, timeout);
 
-    const unsubscribe = query.onSnapshot(async (snapshot) => {
-      const docs = snapshot.docChanges();
+    unsubscribe = query.onSnapshot(async (snapshot) => {
+      try {
+        const docs = snapshot.docChanges();
 
-      const record: DocumentData = docs.filter(
-        ($) => $.doc.data()[field] === value
-      )[0];
+        const record: DocumentData = docs.filter(
+          ($) => $.doc.data()[field] === value
+        )[0];
 
-      if (record) {
-        unsubscribe();
-        if (!timedOut) {
-          clearTimeout(timer);
-          resolve(record);
+        if (record) {
+          unsubscribe();
+          if (!timedOut) {
+            clearTimeout(timer);
+            resolve(record);
+          }
+        }
+      } catch (error) {
+        if (unsubscribe) {
+          unsubscribe(); // Unsubscribe on error
         }
+        console.log('Error: ', error);
+        reject(error);
       }
     });
   });
diff --git a/firestore-stripe-payments/functions/__tests__/helpers/webhooks.ts b/firestore-stripe-payments/functions/__tests__/helpers/webhooks.ts
index 1c77bd11..e59facad 100644
--- a/firestore-stripe-payments/functions/__tests__/helpers/webhooks.ts
+++ b/firestore-stripe-payments/functions/__tests__/helpers/webhooks.ts
@@ -39,14 +39,20 @@ export const clearWebhooks = async (id) => {
 };
 
 export const clearAllWebhooks = async () => {
+  console.log('Step 1 >>>>>');
   const stripe = require('stripe')(process.env.STRIPE_API_KEY);
 
+  console.log('Step 2 >>>>>');
   const webhooks = await stripe.webhookEndpoints.list();
 
+  console.log('Step 3 >>>>>');
+
+  /** Log how weekbhooks have been found */
+  console.log('Found webhooks: ', webhooks.data.length);
+
   for await (const webhook of webhooks.data) {
-    if (webhook.url.includes('ngrok.io')) {
-      await stripe.webhookEndpoints.del(webhook.id);
-    }
+    console.log('Deleting webhook: ', webhook.id);
+    await stripe.webhookEndpoints.del(webhook.id);
   }
 
   return Promise.resolve();
diff --git a/firestore-stripe-payments/functions/__tests__/run-script.ts b/firestore-stripe-payments/functions/__tests__/run-script.ts
index f311ff0a..408efc83 100644
--- a/firestore-stripe-payments/functions/__tests__/run-script.ts
+++ b/firestore-stripe-payments/functions/__tests__/run-script.ts
@@ -7,9 +7,12 @@ import {
 } from './helpers/setupProxy';
 
 (async () => {
+  console.log('Starting tests...');
+
   /** Clear all webhooks with ngrok.io,
    * useful for clearing any failed ci testing
    */
+  console.log('Clearing webhooks...');
   await cleanupAllWebhooks();
 
   const proxyId = await setupProxy();