diff --git a/web-api/jest-unit.config.ts b/web-api/jest-unit.config.ts
index f863e1ff311..ad9ad2568b2 100644
--- a/web-api/jest-unit.config.ts
+++ b/web-api/jest-unit.config.ts
@@ -28,6 +28,7 @@ const config: Config = {
     '!src/persistence/sqs/getMessages.ts',
     '!src/persistence/messages/*.ts',
     '!src/persistence/dynamo/**/*.ts',
+    '!src/persistence/postgres/**/*.ts',
     '!src/lambdas/websockets/websockets.ts',
     '!src/lambdas/websockets/switch-colors-cron.ts',
     '!src/lambdas/cognitoAuthorizer/worker-handler.ts',
diff --git a/web-api/src/business/useCases/messages/getCompletedMessagesForSectionInteractor.test.ts b/web-api/src/business/useCases/messages/getCompletedMessagesForSectionInteractor.test.ts
index bc86eb9ff3b..d413583cfd5 100644
--- a/web-api/src/business/useCases/messages/getCompletedMessagesForSectionInteractor.test.ts
+++ b/web-api/src/business/useCases/messages/getCompletedMessagesForSectionInteractor.test.ts
@@ -3,7 +3,6 @@ import {
   CASE_STATUS_TYPES,
   DOCKET_SECTION,
   PETITIONS_SECTION,
-  ROLES,
 } from '../../../../../shared/src/business/entities/EntityConstants';
 import { UnauthorizedError } from '@web-api/errors/errors';
 import { applicationContext } from '../../../../../shared/src/business/test/createTestApplicationContext';
@@ -55,10 +54,6 @@ describe('getCompletedMessagesForSectionInteractor', () => {
       toSection: PETITIONS_SECTION,
       toUserId: 'b427ca37-0df1-48ac-94bb-47aed073d6f7',
     };
-    applicationContext.getCurrentUser.mockReturnValue({
-      role: ROLES.petitionsClerk,
-      userId: 'b9fcabc8-3c83-4cbf-9f4a-d2ecbdc591e1',
-    });
 
     (getCompletedSectionInboxMessages as jest.Mock).mockReturnValue([
       messageData,
diff --git a/web-api/src/business/useCases/messages/getCompletedMessagesForUserInteractor.test.ts b/web-api/src/business/useCases/messages/getCompletedMessagesForUserInteractor.test.ts
index fc527339e38..fa5f8edf4b0 100644
--- a/web-api/src/business/useCases/messages/getCompletedMessagesForUserInteractor.test.ts
+++ b/web-api/src/business/useCases/messages/getCompletedMessagesForUserInteractor.test.ts
@@ -2,7 +2,6 @@ import '@web-api/persistence/postgres/messages/mocks.jest';
 import {
   CASE_STATUS_TYPES,
   PETITIONS_SECTION,
-  ROLES,
 } from '../../../../../shared/src/business/entities/EntityConstants';
 import { UnauthorizedError } from '@web-api/errors/errors';
 import { applicationContext } from '../../../../../shared/src/business/test/createTestApplicationContext';
@@ -55,10 +54,6 @@ describe('getCompletedMessagesForUserInteractor', () => {
       toSection: PETITIONS_SECTION,
       toUserId: 'b427ca37-0df1-48ac-94bb-47aed073d6f7',
     };
-    applicationContext.getCurrentUser.mockReturnValue({
-      role: ROLES.petitionsClerk,
-      userId: 'b9fcabc8-3c83-4cbf-9f4a-d2ecbdc591e1',
-    });
 
     (getCompletedUserInboxMessages as jest.Mock).mockReturnValue([messageData]);
 
diff --git a/web-api/src/business/useCases/processStreamRecords/processCaseEntries.test.ts b/web-api/src/business/useCases/processStreamRecords/processCaseEntries.test.ts
index 8c580d6b658..c7c50b6c65e 100644
--- a/web-api/src/business/useCases/processStreamRecords/processCaseEntries.test.ts
+++ b/web-api/src/business/useCases/processStreamRecords/processCaseEntries.test.ts
@@ -2,6 +2,8 @@ import '@web-api/persistence/postgres/cases/mocks.jest';
 import '@web-api/persistence/postgres/messages/mocks.jest';
 import { applicationContext } from '../../../../../shared/src/business/test/createTestApplicationContext';
 import { processCaseEntries } from './processCaseEntries';
+import { upsertCase } from '@web-api/persistence/postgres/cases/upsertCase';
+jest.mock('@web-api/persistence/postgres/cases/upsertCase');
 
 describe('processCaseEntries', () => {
   const mockCaseRecord = {
@@ -31,6 +33,8 @@ describe('processCaseEntries', () => {
     applicationContext
       .getPersistenceGateway()
       .getCaseMetadataWithCounsel.mockReturnValue(mockCaseRecord);
+
+    (upsertCase as jest.Mock).mockResolvedValue(undefined);
   });
 
   it('should do nothing when no case records are found', async () => {
diff --git a/web-api/src/business/useCases/processStreamRecords/processMessageEntries.test.ts b/web-api/src/business/useCases/processStreamRecords/processMessageEntries.test.ts
index ecaccf453ba..b1d2728e1ff 100644
--- a/web-api/src/business/useCases/processStreamRecords/processMessageEntries.test.ts
+++ b/web-api/src/business/useCases/processStreamRecords/processMessageEntries.test.ts
@@ -3,7 +3,13 @@ import { applicationContext } from '../../../../../shared/src/business/test/crea
 import { processMessageEntries } from './processMessageEntries';
 import { upsertMessage } from '@web-api/persistence/postgres/messages/upsertMessage';
 
+jest.mock('@web-api/persistence/postgres/messages/upsertMessage');
+
 describe('processMessageEntries', () => {
+  beforeEach(() => {
+    (upsertMessage as jest.Mock).mockResolvedValue(undefined);
+  });
+
   it('should attempt to store the messages using the upsert method', async () => {
     const mockRepliedToMessageRecord = {
       dynamodb: {