diff --git a/.eslintrc.js b/.eslintrc.js
index 955eb6c96e2..01ea33f2bd3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -35,25 +35,13 @@ module.exports = {
 		'setupTests.ts',
 		'jest.setup.*',
 		'jest.config.*',
-		// 'packages/adapter-nextjs/__tests__',
-		// 'packages/analytics/__tests__',
 		'packages/api/__tests__',
 		'packages/api-graphql/__tests__',
-		// 'packages/api-rest/__tests__',
-		// 'packages/auth/__tests__',
-		// 'packages/aws-amplify/__tests__',
-		// 'packages/core/__tests__',
 		'packages/datastore/__tests__',
 		'packages/datastore-storage-adapter/__tests__',
-		// 'packages/geo/__tests__',
 		'packages/interactions/__tests__',
-		// 'packages/notifications/__tests__',
 		'packages/predictions/__tests__',
 		'packages/pubsub/__tests__',
-		'packages/react-native/__tests__',
-		'packages/rtn-push-notification/__tests__',
-		'packages/rtn-web-browser/__tests__',
-		// 'packages/storage/__tests__',
 	],
 	rules: {
 		camelcase: [
diff --git a/packages/rtn-push-notification/__tests__/apis/getPermissionStatus.test.ts b/packages/rtn-push-notification/__tests__/apis/getPermissionStatus.test.ts
index d58cc630a7d..5046c5c9021 100644
--- a/packages/rtn-push-notification/__tests__/apis/getPermissionStatus.test.ts
+++ b/packages/rtn-push-notification/__tests__/apis/getPermissionStatus.test.ts
@@ -23,7 +23,7 @@ describe('getPermissionStatus', () => {
 	beforeAll(() => {
 		mockGetPermissionStatusNative.mockResolvedValue(status);
 		mockNormalizeNativePermissionStatus.mockImplementation(
-			status => `normalized-${status}`,
+			statusParam => `normalized-${statusParam}`,
 		);
 	});
 
diff --git a/packages/rtn-push-notification/__tests__/apis/registerHeadlessTask.test.ts b/packages/rtn-push-notification/__tests__/apis/registerHeadlessTask.test.ts
index 8a4c5492544..11315971f32 100644
--- a/packages/rtn-push-notification/__tests__/apis/registerHeadlessTask.test.ts
+++ b/packages/rtn-push-notification/__tests__/apis/registerHeadlessTask.test.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AppRegistry } from 'react-native';
+
 import { getConstants } from '../../src/apis/getConstants';
 import { registerHeadlessTask } from '../../src/apis/registerHeadlessTask';
 import { normalizeNativeMessage } from '../../src/utils';
diff --git a/packages/rtn-push-notification/__tests__/testUtils/data.ts b/packages/rtn-push-notification/__tests__/testUtils/data.ts
index a0913b85b25..767f0e9e6e6 100644
--- a/packages/rtn-push-notification/__tests__/testUtils/data.ts
+++ b/packages/rtn-push-notification/__tests__/testUtils/data.ts
@@ -33,7 +33,7 @@ export const fcmMessageOptions = {
 export const fcmMessagePayload = {
 	title: 'fcm-title',
 	body: 'fcm-body',
-	imageUrl: imageUrl,
+	imageUrl,
 	action: {},
 	rawData: pushNotificationAdhocData,
 };
diff --git a/packages/rtn-push-notification/__tests__/utils/normalizeNativeMessage.test.ts b/packages/rtn-push-notification/__tests__/utils/normalizeNativeMessage.test.ts
index 01e05c327e0..655fda3c90c 100644
--- a/packages/rtn-push-notification/__tests__/utils/normalizeNativeMessage.test.ts
+++ b/packages/rtn-push-notification/__tests__/utils/normalizeNativeMessage.test.ts
@@ -6,8 +6,8 @@ import {
 	apnsMessage,
 	apnsMessagePayload,
 	fcmMessage,
-	fcmMessagePayload,
 	fcmMessageOptions,
+	fcmMessagePayload,
 	imageUrl,
 	pushNotificationAdhocData,
 	pushNotificationDeeplinkUrl,
@@ -23,7 +23,7 @@ describe('normalizeNativeMessage', () => {
 			expect(normalizeNativeMessage(apnsMessage)).toStrictEqual({
 				title,
 				body,
-				imageUrl: imageUrl,
+				imageUrl,
 				data: {
 					...pushNotificationAdhocData,
 					'media-url': imageUrl,
@@ -72,12 +72,17 @@ describe('normalizeNativeMessage', () => {
 
 	describe('fcm messages', () => {
 		it('normalizes typical messages', () => {
-			const { body, rawData, imageUrl, title } = fcmMessagePayload;
+			const {
+				body,
+				rawData,
+				imageUrl: imageUrlFromPayload,
+				title,
+			} = fcmMessagePayload;
 
 			expect(normalizeNativeMessage(fcmMessage)).toStrictEqual({
 				body,
 				data: rawData,
-				imageUrl,
+				imageUrl: imageUrlFromPayload,
 				title,
 				fcmOptions: {
 					...fcmMessageOptions,