diff --git a/packages/content-handler/test/newsletter.test.ts b/packages/content-handler/test/newsletter.test.ts
index 90197b00d..ff9396a12 100644
--- a/packages/content-handler/test/newsletter.test.ts
+++ b/packages/content-handler/test/newsletter.test.ts
@@ -21,29 +21,6 @@ const load = (path: string): string => {
 }
 
 describe('Newsletter email test', () => {
-  before(() => {
-    nock('https://email.mg2.substack.com')
-      .head(
-        '/c/eJxNkk2TojAQhn-N3KTyQfg4cGDGchdnYcsZx9K5UCE0EMVAkTiKv36iHnarupNUd7rfVJ4W3EDTj1M89No496Uw0wCxgovuwBgYnbOGsZBVjDHzKPWYU8VehUMWOlIX9Qhw4rKLzXgGZziXnRTcyF7dK0iIGMVOG_OS1aTmKPRDilgVhTQUPCQIcE0x-MFTmJ8rCUpA3KtuenR2urg1ZtAzmszI0tq_Z7m66y-ilQo0uAqMTQ7WRX8auJKg56blZg7WB-iHDuYEBzO6NP0R1IwuYFphQbbTjnTH9NBfs80nym4Zyj8uUvyKbtUyGr5eUz9fNDQ7JCxfJDo9dW1lY9lmj_JNivPbGmf2Pt_lN9tDit9b-WeTetni85Z9pDpVOd7L1E_Vy7egayNO23ZP34eSeLJeux1b0rer_xaZ7ykS78nuSjMY-nL98rparNZNcv07JCjN06_EkTFBxBqOUMACErnELUNMSxTUjLDQZwzcqa4bRjCfeejUEFefS224OLr2S5wxPtij7lVrs80d2CNseRV2P52VNFMBipcdVE-U5jkRD7hFAwpGOylVwU2Mfc9qBh7DoR89yVnWXhgQFHnIsbpVb6tU_B-hH_2yzWY'
-      )
-      .reply(302, undefined, {
-        Location:
-          'https://newsletter.slowchinese.net/p/companies-that-eat-people-217',
-      })
-      .get('/p/companies-that-eat-people-217')
-      .reply(200, '')
-
-    nock('https://u23463625.ct.sendgrid.net')
-      .head(
-        '/ss/c/AX1lEgEQaxtvFxLaVo0GBo_geajNrlI1TGeIcmMViR3pL3fEDZnbbkoeKcaY62QZk0KPFudUiUXc_uMLerV4nA/3k5/3TFZmreTR0qKSCgowABnVg/h30/zzLik7UXd1H_n4oyd5W8Xu639AYQQB2UXz-CsssSnno'
-      )
-      .reply(302, undefined, {
-        Location: 'https://www.milkroad.com/p/talked-guy-spent-30m-beeple',
-      })
-      .get('/p/talked-guy-spent-30m-beeple')
-      .reply(200, '')
-  })
-
   describe('#getNewsletterUrl()', () => {
     it('returns url when email is from SubStack', async () => {
       const rawUrl = '<https://hongbo130.substack.com/p/tldr>'
@@ -162,21 +139,63 @@ describe('Newsletter email test', () => {
   })
 
   describe('findNewsletterUrl', async () => {
-    it('gets the URL from the header if it is a substack newsletter', async () => {
-      const html = load('./test/data/substack-forwarded-newsletter.html')
-      const url = await new SubstackHandler().findNewsletterUrl(html)
-      // Not sure if the redirects from substack expire, this test could eventually fail
-      expect(url).to.startWith(
-        'https://newsletter.slowchinese.net/p/companies-that-eat-people-217'
-      )
-    }).timeout(10000)
-    it('gets the URL from the header if it is a beehiiv newsletter', async () => {
-      const html = load('./test/data/beehiiv-newsletter.html')
-      const url = await new BeehiivHandler().findNewsletterUrl(html)
-      expect(url).to.startWith(
-        'https://www.milkroad.com/p/talked-guy-spent-30m-beeple'
-      )
-    }).timeout(10000)
+    context('when email is from Substack', () => {
+      let scope: nock.Scope
+
+      before(() => {
+        scope = nock('https://email.mg2.substack.com')
+          .head(
+            '/c/eJxNkk2TojAQhn-N3KTyQfg4cGDGchdnYcsZx9K5UCE0EMVAkTiKv36iHnarupNUd7rfVJ4W3EDTj1M89No496Uw0wCxgovuwBgYnbOGsZBVjDHzKPWYU8VehUMWOlIX9Qhw4rKLzXgGZziXnRTcyF7dK0iIGMVOG_OS1aTmKPRDilgVhTQUPCQIcE0x-MFTmJ8rCUpA3KtuenR2urg1ZtAzmszI0tq_Z7m66y-ilQo0uAqMTQ7WRX8auJKg56blZg7WB-iHDuYEBzO6NP0R1IwuYFphQbbTjnTH9NBfs80nym4Zyj8uUvyKbtUyGr5eUz9fNDQ7JCxfJDo9dW1lY9lmj_JNivPbGmf2Pt_lN9tDit9b-WeTetni85Z9pDpVOd7L1E_Vy7egayNO23ZP34eSeLJeux1b0rer_xaZ7ykS78nuSjMY-nL98rparNZNcv07JCjN06_EkTFBxBqOUMACErnELUNMSxTUjLDQZwzcqa4bRjCfeejUEFefS224OLr2S5wxPtij7lVrs80d2CNseRV2P52VNFMBipcdVE-U5jkRD7hFAwpGOylVwU2Mfc9qBh7DoR89yVnWXhgQFHnIsbpVb6tU_B-hH_2yzWY'
+          )
+          .reply(302, undefined, {
+            Location:
+              'https://newsletter.slowchinese.net/p/companies-that-eat-people-217',
+          })
+          .get('/p/companies-that-eat-people-217')
+          .reply(200, '')
+      })
+      after(() => {
+        scope.done()
+      })
+
+      it('gets the URL from the header', async () => {
+        const html = load('./test/data/substack-forwarded-newsletter.html')
+        const url = await new SubstackHandler().findNewsletterUrl(html)
+        // Not sure if the redirects from substack expire, this test could eventually fail
+        expect(url).to.startWith(
+          'https://newsletter.slowchinese.net/p/companies-that-eat-people-217'
+        )
+      })
+    })
+
+    context('when email is from beehiiv', () => {
+      let scope: nock.Scope
+
+      before(() => {
+        scope = nock('https://u23463625.ct.sendgrid.net')
+          .head(
+            '/ss/c/AX1lEgEQaxtvFxLaVo0GBo_geajNrlI1TGeIcmMViR3pL3fEDZnbbkoeKcaY62QZk0KPFudUiUXc_uMLerV4nA/3k5/3TFZmreTR0qKSCgowABnVg/h30/zzLik7UXd1H_n4oyd5W8Xu639AYQQB2UXz-CsssSnno'
+          )
+          .reply(302, undefined, {
+            Location: 'https://www.milkroad.com/p/talked-guy-spent-30m-beeple',
+          })
+          .get('/p/talked-guy-spent-30m-beeple')
+          .reply(200, '')
+      })
+
+      after(() => {
+        scope.done()
+      })
+
+      it('gets the URL from the header', async () => {
+        const html = load('./test/data/beehiiv-newsletter.html')
+        const url = await new BeehiivHandler().findNewsletterUrl(html)
+        expect(url).to.startWith(
+          'https://www.milkroad.com/p/talked-guy-spent-30m-beeple'
+        )
+      })
+    })
+
     it('returns undefined if it is not a newsletter', async () => {
       const html = load('./test/data/substack-forwarded-welcome-email.html')
       const url = await new SubstackHandler().findNewsletterUrl(html)