diff --git a/lib/Donors/Donors.js b/lib/Donors/Donors.js
index 7754b0f6..6c314c6b 100644
--- a/lib/Donors/Donors.js
+++ b/lib/Donors/Donors.js
@@ -9,7 +9,7 @@ import {
 } from '@folio/stripes/components';
 
 import { defaultColumnMapping } from './constants';
-import DonorsContainer from './DonorsContainer';
+import { DonorsContainer } from './DonorsContainer';
 import { useFetchDonors } from './hooks';
 
 export function Donors({ name, donorOrganizationIds, ...rest }) {
diff --git a/lib/Donors/DonorsContainer.js b/lib/Donors/DonorsContainer.js
index c8e2ab73..615b3c3b 100644
--- a/lib/Donors/DonorsContainer.js
+++ b/lib/Donors/DonorsContainer.js
@@ -6,14 +6,14 @@ import { useIntl } from 'react-intl';
 import { useStripes } from '@folio/stripes/core';
 
 import { defaultVisibleColumns } from './constants';
-import DonorsList from './DonorsList';
-import DonorsLookup from './DonorsLookup';
+import { DonorsList } from './DonorsList';
+import { DonorsLookup } from './DonorsLookup';
 import {
   getDonorsListFormatter,
   getUnAssignDonorFormatter,
 } from './utils';
 
-function DonorsContainer({
+export function DonorsContainer({
   columnMapping,
   columnWidths,
   donors,
@@ -114,5 +114,3 @@ DonorsContainer.defaultProps = {
   showTriggerButton: true,
   visibleColumns: defaultVisibleColumns,
 };
-
-export default DonorsContainer;
diff --git a/lib/Donors/DonorsContainer.test.js b/lib/Donors/DonorsContainer.test.js
index bcd0a617..70c141bc 100644
--- a/lib/Donors/DonorsContainer.test.js
+++ b/lib/Donors/DonorsContainer.test.js
@@ -4,29 +4,36 @@ import user from '@testing-library/user-event';
 
 import stripesFinalForm from '@folio/stripes/final-form';
 
-import DonorsContainer from './DonorsContainer';
+import { DonorsContainer } from './DonorsContainer';
 import { useFetchDonors } from './hooks';
 
 const mockVendor = { id: '1', name: 'Amazon' };
 
-jest.mock('./DonorsList', () => jest.fn(({ contentData }) => {
-  if (!contentData.length) {
-    return 'stripes-components.tableEmpty';
-  }
-
-  return contentData.map(({ name }) => <div key={name}>{name}</div>);
+jest.mock('./DonorsList', () => ({
+  DonorsList: jest.fn(({ contentData }) => {
+    return (
+      <div>
+        {contentData.map(({ name }) => (
+          <div key={name}>{name}</div>
+        ))}
+      </div>
+    );
+  }),
 }));
 
-jest.mock('./DonorsLookup', () => jest.fn(({ onAddDonors, name }) => {
-  return (
-    <button
-      type="button"
-      id={name}
-      onClick={() => onAddDonors([mockVendor])}
-    >
-      Add donor
-    </button>
-  );
+jest.mock('./DonorsLookup', () => ({
+  DonorsLookup: jest.fn(({ onAddDonors }) => {
+    return (
+      <div>
+        <button
+          type="button"
+          onClick={() => onAddDonors([mockVendor])}
+        >
+          Add donor
+        </button>
+      </div>
+    );
+  }),
 }));
 
 const setDonorIds = jest.fn();
diff --git a/lib/Donors/DonorsList.js b/lib/Donors/DonorsList.js
index 5e9b3767..5d9316fd 100644
--- a/lib/Donors/DonorsList.js
+++ b/lib/Donors/DonorsList.js
@@ -9,7 +9,7 @@ import {
   defaultVisibleColumns,
 } from './constants';
 
-const DonorsList = ({
+export const DonorsList = ({
   columnMapping,
   columnWidths,
   contentData,
@@ -44,5 +44,3 @@ DonorsList.defaultProps = {
   formatter: defaultFormatter,
   visibleColumns: defaultVisibleColumns,
 };
-
-export default DonorsList;
diff --git a/lib/Donors/DonorsList.test.js b/lib/Donors/DonorsList.test.js
index 45723de2..4b3ead67 100644
--- a/lib/Donors/DonorsList.test.js
+++ b/lib/Donors/DonorsList.test.js
@@ -1,7 +1,7 @@
 import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 
-import DonorsList from './DonorsList';
+import { DonorsList } from './DonorsList';
 
 const defaultProps = {
   contentData: [],
diff --git a/lib/Donors/DonorsLookup.js b/lib/Donors/DonorsLookup.js
index c4688e57..0fed2002 100644
--- a/lib/Donors/DonorsLookup.js
+++ b/lib/Donors/DonorsLookup.js
@@ -15,7 +15,7 @@ import {
   visibleFilters,
 } from './constants';
 
-const DonorsLookup = ({
+export const DonorsLookup = ({
   name,
   onAddDonors,
   searchLabel,
@@ -60,5 +60,3 @@ DonorsLookup.defaultProps = {
   searchLabel: <FormattedMessage id="stripes-acq-components.donors.button.addDonor" />,
   visibleColumns: pluginVisibleColumns,
 };
-
-export default DonorsLookup;
diff --git a/lib/Donors/DonorsLookup.test.js b/lib/Donors/DonorsLookup.test.js
index 67bbbf47..05ec4a8c 100644
--- a/lib/Donors/DonorsLookup.test.js
+++ b/lib/Donors/DonorsLookup.test.js
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import user from '@testing-library/user-event';
 
-import DonorsLookup from './DonorsLookup';
+import { DonorsLookup } from './DonorsLookup';
 
 const mockVendorData = { id: '1', name: 'Amazon' };
 
diff --git a/lib/Donors/utils.test.js b/lib/Donors/utils.test.js
index 6b4834ea..1388756a 100644
--- a/lib/Donors/utils.test.js
+++ b/lib/Donors/utils.test.js
@@ -1,4 +1,7 @@
-import { getDonorsListFormatter } from './utils';
+import {
+  getDonorsListFormatter,
+  getUnAssignDonorFormatter,
+} from './utils';
 
 const defaultProps = {
   canViewOrganizations: true,
@@ -17,6 +20,15 @@ describe('getDonorsListFormatter', () => {
     expect(result).toEqual(expect.objectContaining({
       name: expect.any(Function),
       code: expect.any(Function),
+    }));
+  });
+});
+
+describe('getUnAssignDonorFormatter', () => {
+  it('should return object with name, code and unassignDonor functions', () => {
+    const result = getUnAssignDonorFormatter(defaultProps);
+
+    expect(result).toEqual(expect.objectContaining({
       unassignDonor: expect.any(Function),
     }));
   });