diff --git a/shlink-web-component/test/__helpers__/TestModalWrapper.tsx b/shlink-web-component/test/__helpers__/TestModalWrapper.tsx
new file mode 100644
index 00000000..a673827b
--- /dev/null
+++ b/shlink-web-component/test/__helpers__/TestModalWrapper.tsx
@@ -0,0 +1,14 @@
+import type { FC, ReactElement } from 'react';
+import { useToggle } from '../../src/utils/helpers/hooks';
+
+interface RenderModalArgs {
+  isOpen: boolean;
+  toggle: () => void;
+}
+
+export const TestModalWrapper: FC<{ renderModal: (args: RenderModalArgs) => ReactElement }> = (
+  { renderModal },
+) => {
+  const [isOpen, toggle] = useToggle(true);
+  return renderModal({ isOpen, toggle });
+};
diff --git a/shlink-web-component/test/__helpers__/setUpTest.ts b/shlink-web-component/test/__helpers__/setUpTest.ts
new file mode 100644
index 00000000..5d125c73
--- /dev/null
+++ b/shlink-web-component/test/__helpers__/setUpTest.ts
@@ -0,0 +1,20 @@
+import { render } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { ReactElement } from 'react';
+
+export const setUpCanvas = (element: ReactElement) => {
+  const result = render(element);
+  const { container } = result;
+  const getEvents = () => {
+    const context = container.querySelector('canvas')?.getContext('2d');
+    // @ts-expect-error __getEvents is set by vitest-canvas-mock
+    return context?.__getEvents(); // eslint-disable-line no-underscore-dangle
+  };
+
+  return { ...result, events: getEvents(), getEvents };
+};
+
+export const renderWithEvents = (element: ReactElement) => ({
+  user: userEvent.setup(),
+  ...render(element),
+});
diff --git a/shlink-web-component/test/__mocks__/Window.mock.ts b/shlink-web-component/test/__mocks__/Window.mock.ts
new file mode 100644
index 00000000..8b718753
--- /dev/null
+++ b/shlink-web-component/test/__mocks__/Window.mock.ts
@@ -0,0 +1,18 @@
+import { fromAny, fromPartial } from '@total-typescript/shoehorn';
+
+const createLinkMock = () => ({
+  setAttribute: vi.fn(),
+  click: vi.fn(),
+  style: {},
+});
+
+export const appendChild = vi.fn();
+
+export const removeChild = vi.fn();
+
+export const windowMock = fromPartial<Window>({
+  document: fromAny({
+    createElement: vi.fn(createLinkMock),
+    body: { appendChild, removeChild },
+  }),
+});
diff --git a/test/common/AsideMenu.test.tsx b/shlink-web-component/test/common/AsideMenu.test.tsx
similarity index 89%
rename from test/common/AsideMenu.test.tsx
rename to shlink-web-component/test/common/AsideMenu.test.tsx
index f12129a8..fac3fe61 100644
--- a/test/common/AsideMenu.test.tsx
+++ b/shlink-web-component/test/common/AsideMenu.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router';
-import { AsideMenu } from '../../shlink-web-component/src/common/AsideMenu';
+import { AsideMenu } from '../../src/common/AsideMenu';
 
 describe('<AsideMenu />', () => {
   const setUp = () => render(
diff --git a/test/api/ShlinkApiError.test.tsx b/shlink-web-component/test/common/ShlinkApiError.test.tsx
similarity index 88%
rename from test/api/ShlinkApiError.test.tsx
rename to shlink-web-component/test/common/ShlinkApiError.test.tsx
index 23cb8dcd..ab299b54 100644
--- a/test/api/ShlinkApiError.test.tsx
+++ b/shlink-web-component/test/common/ShlinkApiError.test.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShlinkApiErrorProps } from '../../shlink-web-component/src/common/ShlinkApiError';
-import { ShlinkApiError } from '../../shlink-web-component/src/common/ShlinkApiError';
 import type { InvalidArgumentError, ProblemDetailsError } from '../../src/api/types/errors';
 import { ErrorTypeV2, ErrorTypeV3 } from '../../src/api/types/errors';
+import type { ShlinkApiErrorProps } from '../../src/common/ShlinkApiError';
+import { ShlinkApiError } from '../../src/common/ShlinkApiError';
 
 describe('<ShlinkApiError />', () => {
   const setUp = (props: ShlinkApiErrorProps) => render(<ShlinkApiError {...props} />);
diff --git a/test/domains/DomainRow.test.tsx b/shlink-web-component/test/domains/DomainRow.test.tsx
similarity index 95%
rename from test/domains/DomainRow.test.tsx
rename to shlink-web-component/test/domains/DomainRow.test.tsx
index f66dce9e..f3d6bc3e 100644
--- a/test/domains/DomainRow.test.tsx
+++ b/shlink-web-component/test/domains/DomainRow.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { Domain } from '../../shlink-web-component/src/domains/data';
-import { DomainRow } from '../../shlink-web-component/src/domains/DomainRow';
 import type { ShlinkDomainRedirects } from '../../src/api/types';
+import type { Domain } from '../../src/domains/data';
+import { DomainRow } from '../../src/domains/DomainRow';
 
 describe('<DomainRow />', () => {
   const redirectsCombinations = [
diff --git a/test/domains/DomainSelector.test.tsx b/shlink-web-component/test/domains/DomainSelector.test.tsx
similarity index 93%
rename from test/domains/DomainSelector.test.tsx
rename to shlink-web-component/test/domains/DomainSelector.test.tsx
index db613f29..c683672d 100644
--- a/test/domains/DomainSelector.test.tsx
+++ b/shlink-web-component/test/domains/DomainSelector.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { DomainSelector } from '../../shlink-web-component/src/domains/DomainSelector';
-import type { DomainsList } from '../../shlink-web-component/src/domains/reducers/domainsList';
+import { DomainSelector } from '../../src/domains/DomainSelector';
+import type { DomainsList } from '../../src/domains/reducers/domainsList';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<DomainSelector />', () => {
diff --git a/test/domains/ManageDomains.test.tsx b/shlink-web-component/test/domains/ManageDomains.test.tsx
similarity index 88%
rename from test/domains/ManageDomains.test.tsx
rename to shlink-web-component/test/domains/ManageDomains.test.tsx
index 3d733146..4f6050b8 100644
--- a/test/domains/ManageDomains.test.tsx
+++ b/shlink-web-component/test/domains/ManageDomains.test.tsx
@@ -1,9 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { ManageDomains } from '../../shlink-web-component/src/domains/ManageDomains';
-import type { DomainsList } from '../../shlink-web-component/src/domains/reducers/domainsList';
-import type { ShlinkDomain } from '../../src/api/types';
-import type { ProblemDetailsError } from '../../src/api/types/errors';
+import type { ProblemDetailsError, ShlinkDomain } from '../../src/api-contract';
+import { ManageDomains } from '../../src/domains/ManageDomains';
+import type { DomainsList } from '../../src/domains/reducers/domainsList';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<ManageDomains />', () => {
@@ -16,7 +15,6 @@ describe('<ManageDomains />', () => {
       editDomainRedirects={vi.fn()}
       checkDomainHealth={vi.fn()}
       domainsList={domainsList}
-      selectedServer={fromPartial({})}
     />,
   );
 
diff --git a/test/domains/helpers/DomainDropdown.test.tsx b/shlink-web-component/test/domains/helpers/DomainDropdown.test.tsx
similarity index 90%
rename from test/domains/helpers/DomainDropdown.test.tsx
rename to shlink-web-component/test/domains/helpers/DomainDropdown.test.tsx
index 82667586..0895731a 100644
--- a/test/domains/helpers/DomainDropdown.test.tsx
+++ b/shlink-web-component/test/domains/helpers/DomainDropdown.test.tsx
@@ -1,10 +1,10 @@
 import { screen, waitForElementToBeRemoved } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { Domain } from '../../../shlink-web-component/src/domains/data';
-import { DomainDropdown } from '../../../shlink-web-component/src/domains/helpers/DomainDropdown';
-import type { SelectedServer } from '../../../src/servers/data';
-import type { SemVer } from '../../../src/utils/helpers/version';
+import type { SelectedServer } from '../../../../src/servers/data';
+import type { SemVer } from '../../../../src/utils/helpers/version';
+import type { Domain } from '../../../src/domains/data';
+import { DomainDropdown } from '../../../src/domains/helpers/DomainDropdown';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DomainDropdown />', () => {
diff --git a/test/domains/helpers/DomainStatusIcon.test.tsx b/shlink-web-component/test/domains/helpers/DomainStatusIcon.test.tsx
similarity index 85%
rename from test/domains/helpers/DomainStatusIcon.test.tsx
rename to shlink-web-component/test/domains/helpers/DomainStatusIcon.test.tsx
index 6fe7871c..458f2130 100644
--- a/test/domains/helpers/DomainStatusIcon.test.tsx
+++ b/shlink-web-component/test/domains/helpers/DomainStatusIcon.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { DomainStatus } from '../../../shlink-web-component/src/domains/data';
-import { DomainStatusIcon } from '../../../shlink-web-component/src/domains/helpers/DomainStatusIcon';
+import type { DomainStatus } from '../../../src/domains/data';
+import { DomainStatusIcon } from '../../../src/domains/helpers/DomainStatusIcon';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DomainStatusIcon />', () => {
diff --git a/test/domains/helpers/EditDomainRedirectsModal.test.tsx b/shlink-web-component/test/domains/helpers/EditDomainRedirectsModal.test.tsx
similarity index 94%
rename from test/domains/helpers/EditDomainRedirectsModal.test.tsx
rename to shlink-web-component/test/domains/helpers/EditDomainRedirectsModal.test.tsx
index f03add38..2a505ad0 100644
--- a/test/domains/helpers/EditDomainRedirectsModal.test.tsx
+++ b/shlink-web-component/test/domains/helpers/EditDomainRedirectsModal.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { EditDomainRedirectsModal } from '../../../shlink-web-component/src/domains/helpers/EditDomainRedirectsModal';
-import type { ShlinkDomain } from '../../../src/api/types';
+import type { ShlinkDomain } from '../../../src/api-contract';
+import { EditDomainRedirectsModal } from '../../../src/domains/helpers/EditDomainRedirectsModal';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<EditDomainRedirectsModal />', () => {
diff --git a/test/domains/helpers/__snapshots__/DomainStatusIcon.test.tsx.snap b/shlink-web-component/test/domains/helpers/__snapshots__/DomainStatusIcon.test.tsx.snap
similarity index 100%
rename from test/domains/helpers/__snapshots__/DomainStatusIcon.test.tsx.snap
rename to shlink-web-component/test/domains/helpers/__snapshots__/DomainStatusIcon.test.tsx.snap
diff --git a/test/domains/reducers/domainRedirects.test.ts b/shlink-web-component/test/domains/reducers/domainRedirects.test.ts
similarity index 85%
rename from test/domains/reducers/domainRedirects.test.ts
rename to shlink-web-component/test/domains/reducers/domainRedirects.test.ts
index c7f2469c..a0f8dd7f 100644
--- a/test/domains/reducers/domainRedirects.test.ts
+++ b/shlink-web-component/test/domains/reducers/domainRedirects.test.ts
@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { editDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
 import type { ShlinkDomainRedirects } from '../../../src/api/types';
+import { editDomainRedirects } from '../../../src/domains/reducers/domainRedirects';
 
 describe('domainRedirectsReducer', () => {
   describe('editDomainRedirects', () => {
diff --git a/test/domains/reducers/domainsList.test.ts b/shlink-web-component/test/domains/reducers/domainsList.test.ts
similarity index 91%
rename from test/domains/reducers/domainsList.test.ts
rename to shlink-web-component/test/domains/reducers/domainsList.test.ts
index 11f80568..bb3d4ca1 100644
--- a/test/domains/reducers/domainsList.test.ts
+++ b/shlink-web-component/test/domains/reducers/domainsList.test.ts
@@ -1,16 +1,16 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { Domain } from '../../../shlink-web-component/src/domains/data';
-import type { EditDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects';
-import { editDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { ShlinkDomainRedirects } from '../../../src/api/types';
+import { parseApiError } from '../../../src/api/utils';
+import type { Domain } from '../../../src/domains/data';
+import type { EditDomainRedirects } from '../../../src/domains/reducers/domainRedirects';
+import { editDomainRedirects } from '../../../src/domains/reducers/domainRedirects';
 import {
   domainsListReducerCreator,
   replaceRedirectsOnDomain,
   replaceStatusOnDomain,
-} from '../../../shlink-web-component/src/domains/reducers/domainsList';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkDomainRedirects } from '../../../src/api/types';
-import { parseApiError } from '../../../src/api/utils';
-import type { ShlinkState } from '../../../src/container/types';
+} from '../../../src/domains/reducers/domainsList';
 
 describe('domainsListReducer', () => {
   const dispatch = vi.fn();
diff --git a/test/mercure/helpers/index.test.tsx b/shlink-web-component/test/mercure/helpers/index.test.tsx
similarity index 91%
rename from test/mercure/helpers/index.test.tsx
rename to shlink-web-component/test/mercure/helpers/index.test.tsx
index 113a8bcd..0d620272 100644
--- a/test/mercure/helpers/index.test.tsx
+++ b/shlink-web-component/test/mercure/helpers/index.test.tsx
@@ -1,8 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { EventSourcePolyfill } from 'event-source-polyfill';
 import { identity } from 'ramda';
-import { bindToMercureTopic } from '../../../shlink-web-component/src/mercure/helpers';
-import type { MercureInfo } from '../../../shlink-web-component/src/mercure/reducers/mercureInfo';
+import { bindToMercureTopic } from '../../../src/mercure/helpers';
+import type { MercureInfo } from '../../../src/mercure/reducers/mercureInfo';
 
 vi.mock('event-source-polyfill');
 
diff --git a/test/mercure/reducers/mercureInfo.test.ts b/shlink-web-component/test/mercure/reducers/mercureInfo.test.ts
similarity index 89%
rename from test/mercure/reducers/mercureInfo.test.ts
rename to shlink-web-component/test/mercure/reducers/mercureInfo.test.ts
index bff9b048..092d78b0 100644
--- a/test/mercure/reducers/mercureInfo.test.ts
+++ b/shlink-web-component/test/mercure/reducers/mercureInfo.test.ts
@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { mercureInfoReducerCreator } from '../../../shlink-web-component/src/mercure/reducers/mercureInfo';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { GetState } from '../../../src/container/types';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { GetState } from '../../../../src/container/types';
+import { mercureInfoReducerCreator } from '../../../src/mercure/reducers/mercureInfo';
 
 describe('mercureInfoReducer', () => {
   const mercureInfo = {
diff --git a/test/servers/Overview.test.tsx b/shlink-web-component/test/overview/Overview.test.tsx
similarity index 93%
rename from test/servers/Overview.test.tsx
rename to shlink-web-component/test/overview/Overview.test.tsx
index 7241d124..ec6c2fb6 100644
--- a/test/servers/Overview.test.tsx
+++ b/shlink-web-component/test/overview/Overview.test.tsx
@@ -1,9 +1,9 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureInfo } from '../../shlink-web-component/src/mercure/reducers/mercureInfo';
-import { Overview as overviewCreator } from '../../shlink-web-component/src/overview/Overview';
-import { prettify } from '../../shlink-web-component/src/utils/helpers/numbers';
+import type { MercureInfo } from '../../src/mercure/reducers/mercureInfo';
+import { Overview as overviewCreator } from '../../src/overview/Overview';
+import { prettify } from '../../src/utils/helpers/numbers';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<Overview />', () => {
diff --git a/test/servers/helpers/HighlightCard.test.tsx b/shlink-web-component/test/overview/helpers/HighlightCard.test.tsx
similarity index 89%
rename from test/servers/helpers/HighlightCard.test.tsx
rename to shlink-web-component/test/overview/helpers/HighlightCard.test.tsx
index ae5d5045..501d81ab 100644
--- a/test/servers/helpers/HighlightCard.test.tsx
+++ b/shlink-web-component/test/overview/helpers/HighlightCard.test.tsx
@@ -1,8 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
 import type { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import type { HighlightCardProps } from '../../../shlink-web-component/src/overview/helpers/HighlightCard';
-import { HighlightCard } from '../../../shlink-web-component/src/overview/helpers/HighlightCard';
+import type { HighlightCardProps } from '../../../src/overview/helpers/HighlightCard';
+import { HighlightCard } from '../../../src/overview/helpers/HighlightCard';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<HighlightCard />', () => {
diff --git a/test/servers/helpers/VisitsHighlightCard.test.tsx b/shlink-web-component/test/overview/helpers/VisitsHighlightCard.test.tsx
similarity index 84%
rename from test/servers/helpers/VisitsHighlightCard.test.tsx
rename to shlink-web-component/test/overview/helpers/VisitsHighlightCard.test.tsx
index 96947d52..00b385b5 100644
--- a/test/servers/helpers/VisitsHighlightCard.test.tsx
+++ b/shlink-web-component/test/overview/helpers/VisitsHighlightCard.test.tsx
@@ -1,11 +1,18 @@
 import { screen, waitFor } from '@testing-library/react';
-import type { VisitsHighlightCardProps } from '../../../shlink-web-component/src/overview/helpers/VisitsHighlightCard';
-import { VisitsHighlightCard } from '../../../shlink-web-component/src/overview/helpers/VisitsHighlightCard';
+import type { VisitsHighlightCardProps } from '../../../src/overview/helpers/VisitsHighlightCard';
+import { VisitsHighlightCard } from '../../../src/overview/helpers/VisitsHighlightCard';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<VisitsHighlightCard />', () => {
   const setUp = (props: Partial<VisitsHighlightCardProps> = {}) => renderWithEvents(
-    <VisitsHighlightCard loading={false} visitsSummary={{ total: 0 }} excludeBots={false} title="" {...props} />,
+    <VisitsHighlightCard
+      loading={false}
+      visitsSummary={{ total: 0 }}
+      excludeBots={false}
+      title=""
+      link=""
+      {...props}
+    />,
   );
 
   it.each([
diff --git a/test/short-urls/CreateShortUrl.test.tsx b/shlink-web-component/test/short-urls/CreateShortUrl.test.tsx
similarity index 87%
rename from test/short-urls/CreateShortUrl.test.tsx
rename to shlink-web-component/test/short-urls/CreateShortUrl.test.tsx
index 178b12d6..8027f3b3 100644
--- a/test/short-urls/CreateShortUrl.test.tsx
+++ b/shlink-web-component/test/short-urls/CreateShortUrl.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { CreateShortUrl as createShortUrlsCreator } from '../../shlink-web-component/src/short-urls/CreateShortUrl';
-import type { ShortUrlCreation } from '../../shlink-web-component/src/short-urls/reducers/shortUrlCreation';
+import { CreateShortUrl as createShortUrlsCreator } from '../../src/short-urls/CreateShortUrl';
+import type { ShortUrlCreation } from '../../src/short-urls/reducers/shortUrlCreation';
 
 describe('<CreateShortUrl />', () => {
   const ShortUrlForm = () => <span>ShortUrlForm</span>;
diff --git a/test/short-urls/EditShortUrl.test.tsx b/shlink-web-component/test/short-urls/EditShortUrl.test.tsx
similarity index 87%
rename from test/short-urls/EditShortUrl.test.tsx
rename to shlink-web-component/test/short-urls/EditShortUrl.test.tsx
index ffda9d90..560f110e 100644
--- a/test/short-urls/EditShortUrl.test.tsx
+++ b/shlink-web-component/test/short-urls/EditShortUrl.test.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import { EditShortUrl as createEditShortUrl } from '../../shlink-web-component/src/short-urls/EditShortUrl';
-import type { ShortUrlDetail } from '../../shlink-web-component/src/short-urls/reducers/shortUrlDetail';
-import type { ShortUrlEdition } from '../../shlink-web-component/src/short-urls/reducers/shortUrlEdition';
+import { EditShortUrl as createEditShortUrl } from '../../src/short-urls/EditShortUrl';
+import type { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail';
+import type { ShortUrlEdition } from '../../src/short-urls/reducers/shortUrlEdition';
 
 describe('<EditShortUrl />', () => {
   const shortUrlCreation = { validateUrls: true };
diff --git a/test/short-urls/Paginator.test.tsx b/shlink-web-component/test/short-urls/Paginator.test.tsx
similarity index 92%
rename from test/short-urls/Paginator.test.tsx
rename to shlink-web-component/test/short-urls/Paginator.test.tsx
index a392752d..cde9462c 100644
--- a/test/short-urls/Paginator.test.tsx
+++ b/shlink-web-component/test/short-urls/Paginator.test.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import { Paginator } from '../../shlink-web-component/src/short-urls/Paginator';
-import { ELLIPSIS } from '../../shlink-web-component/src/utils/helpers/pagination';
 import type { ShlinkPaginator } from '../../src/api/types';
+import { Paginator } from '../../src/short-urls/Paginator';
+import { ELLIPSIS } from '../../src/utils/helpers/pagination';
 
 describe('<Paginator />', () => {
   const buildPaginator = (pagesCount?: number) => fromPartial<ShlinkPaginator>({ pagesCount, currentPage: 1 });
diff --git a/test/short-urls/ShortUrlForm.test.tsx b/shlink-web-component/test/short-urls/ShortUrlForm.test.tsx
similarity index 92%
rename from test/short-urls/ShortUrlForm.test.tsx
rename to shlink-web-component/test/short-urls/ShortUrlForm.test.tsx
index 92a858bc..82dbb72c 100644
--- a/test/short-urls/ShortUrlForm.test.tsx
+++ b/shlink-web-component/test/short-urls/ShortUrlForm.test.tsx
@@ -2,11 +2,11 @@ import { screen } from '@testing-library/react';
 import type { UserEvent } from '@testing-library/user-event/setup/setup';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
-import type { Mode } from '../../shlink-web-component/src/short-urls/ShortUrlForm';
-import { ShortUrlForm as createShortUrlForm } from '../../shlink-web-component/src/short-urls/ShortUrlForm';
-import { parseDate } from '../../shlink-web-component/src/utils/dates/helpers/date';
-import type { ReachableServer, SelectedServer } from '../../src/servers/data';
-import type { OptionalString } from '../../src/utils/utils';
+import type { ReachableServer, SelectedServer } from '../../../src/servers/data';
+import type { OptionalString } from '../../../src/utils/utils';
+import type { Mode } from '../../src/short-urls/ShortUrlForm';
+import { ShortUrlForm as createShortUrlForm } from '../../src/short-urls/ShortUrlForm';
+import { parseDate } from '../../src/utils/dates/helpers/date';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<ShortUrlForm />', () => {
diff --git a/test/short-urls/ShortUrlsFilteringBar.test.tsx b/shlink-web-component/test/short-urls/ShortUrlsFilteringBar.test.tsx
similarity index 93%
rename from test/short-urls/ShortUrlsFilteringBar.test.tsx
rename to shlink-web-component/test/short-urls/ShortUrlsFilteringBar.test.tsx
index 82a0b7e3..d4137682 100644
--- a/test/short-urls/ShortUrlsFilteringBar.test.tsx
+++ b/shlink-web-component/test/short-urls/ShortUrlsFilteringBar.test.tsx
@@ -2,10 +2,10 @@ import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { endOfDay, formatISO, startOfDay } from 'date-fns';
 import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom';
-import { ShortUrlsFilteringBar as filteringBarCreator } from '../../shlink-web-component/src/short-urls/ShortUrlsFilteringBar';
-import { formatDate } from '../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateRange } from '../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
-import type { ReachableServer, SelectedServer } from '../../src/servers/data';
+import type { ReachableServer, SelectedServer } from '../../../src/servers/data';
+import { ShortUrlsFilteringBar as filteringBarCreator } from '../../src/short-urls/ShortUrlsFilteringBar';
+import { formatIsoDate } from '../../src/utils/dates/helpers/date';
+import type { DateRange } from '../../src/utils/dates/helpers/dateIntervals';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 vi.mock('react-router-dom', async () => ({
@@ -65,8 +65,8 @@ describe('<ShortUrlsFilteringBar />', () => {
     expect(await screen.findByRole('menu')).toBeInTheDocument();
 
     expect(navigate).not.toHaveBeenCalled();
-    dates.startDate && await user.type(screen.getByPlaceholderText('Since...'), formatDate()(dates.startDate) ?? '');
-    dates.endDate && await user.type(screen.getByPlaceholderText('Until...'), formatDate()(dates.endDate) ?? '');
+    dates.startDate && await user.type(screen.getByPlaceholderText('Since...'), formatIsoDate(dates.startDate) ?? '');
+    dates.endDate && await user.type(screen.getByPlaceholderText('Until...'), formatIsoDate(dates.endDate) ?? '');
     expect(navigate).toHaveBeenLastCalledWith(`/server/1/list-short-urls/1?${expectedQuery}`);
   });
 
diff --git a/test/short-urls/ShortUrlsList.test.tsx b/shlink-web-component/test/short-urls/ShortUrlsList.test.tsx
similarity index 87%
rename from test/short-urls/ShortUrlsList.test.tsx
rename to shlink-web-component/test/short-urls/ShortUrlsList.test.tsx
index be47ca97..7ef098ca 100644
--- a/test/short-urls/ShortUrlsList.test.tsx
+++ b/shlink-web-component/test/short-urls/ShortUrlsList.test.tsx
@@ -1,13 +1,13 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter, useNavigate } from 'react-router-dom';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import type { ShortUrlsOrder } from '../../shlink-web-component/src/short-urls/data';
-import type { ShortUrlsList as ShortUrlsListModel } from '../../shlink-web-component/src/short-urls/reducers/shortUrlsList';
-import { ShortUrlsList as createShortUrlsList } from '../../shlink-web-component/src/short-urls/ShortUrlsList';
-import type { ShortUrlsTableType } from '../../shlink-web-component/src/short-urls/ShortUrlsTable';
-import type { Settings } from '../../src/settings/reducers/settings';
-import type { SemVer } from '../../src/utils/helpers/version';
+import type { SemVer } from '../../../src/utils/helpers/version';
+import type { Settings } from '../../src';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { ShortUrlsOrder } from '../../src/short-urls/data';
+import type { ShortUrlsList as ShortUrlsListModel } from '../../src/short-urls/reducers/shortUrlsList';
+import { ShortUrlsList as createShortUrlsList } from '../../src/short-urls/ShortUrlsList';
+import type { ShortUrlsTableType } from '../../src/short-urls/ShortUrlsTable';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 vi.mock('react-router-dom', async () => ({
diff --git a/test/short-urls/ShortUrlsTable.test.tsx b/shlink-web-component/test/short-urls/ShortUrlsTable.test.tsx
similarity index 84%
rename from test/short-urls/ShortUrlsTable.test.tsx
rename to shlink-web-component/test/short-urls/ShortUrlsTable.test.tsx
index 4f2426e2..9676a643 100644
--- a/test/short-urls/ShortUrlsTable.test.tsx
+++ b/shlink-web-component/test/short-urls/ShortUrlsTable.test.tsx
@@ -1,10 +1,10 @@
 import { fireEvent, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrlsOrderableFields } from '../../shlink-web-component/src/short-urls/data';
-import { SHORT_URLS_ORDERABLE_FIELDS } from '../../shlink-web-component/src/short-urls/data';
-import type { ShortUrlsList } from '../../shlink-web-component/src/short-urls/reducers/shortUrlsList';
-import { ShortUrlsTable as shortUrlsTableCreator } from '../../shlink-web-component/src/short-urls/ShortUrlsTable';
-import type { SelectedServer } from '../../src/servers/data';
+import type { SelectedServer } from '../../../src/servers/data';
+import type { ShortUrlsOrderableFields } from '../../src/short-urls/data';
+import { SHORT_URLS_ORDERABLE_FIELDS } from '../../src/short-urls/data';
+import type { ShortUrlsList } from '../../src/short-urls/reducers/shortUrlsList';
+import { ShortUrlsTable as shortUrlsTableCreator } from '../../src/short-urls/ShortUrlsTable';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<ShortUrlsTable />', () => {
diff --git a/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx b/shlink-web-component/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx
similarity index 82%
rename from test/short-urls/UseExistingIfFoundInfoIcon.test.tsx
rename to shlink-web-component/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx
index 2651d18c..43d2319a 100644
--- a/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx
+++ b/shlink-web-component/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx
@@ -1,5 +1,5 @@
 import { screen } from '@testing-library/react';
-import { UseExistingIfFoundInfoIcon } from '../../shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon';
+import { UseExistingIfFoundInfoIcon } from '../../src/short-urls/UseExistingIfFoundInfoIcon';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<UseExistingIfFoundInfoIcon />', () => {
diff --git a/test/short-urls/helpers/CreateShortUrlResult.test.tsx b/shlink-web-component/test/short-urls/helpers/CreateShortUrlResult.test.tsx
similarity index 87%
rename from test/short-urls/helpers/CreateShortUrlResult.test.tsx
rename to shlink-web-component/test/short-urls/helpers/CreateShortUrlResult.test.tsx
index d4b17615..6b59bf5f 100644
--- a/test/short-urls/helpers/CreateShortUrlResult.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/CreateShortUrlResult.test.tsx
@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { CreateShortUrlResult as createResult } from '../../../shlink-web-component/src/short-urls/helpers/CreateShortUrlResult';
-import type { ShortUrlCreation } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation';
-import type { TimeoutToggle } from '../../../src/utils/helpers/hooks';
+import type { TimeoutToggle } from '../../../../src/utils/helpers/hooks';
+import { CreateShortUrlResult as createResult } from '../../../src/short-urls/helpers/CreateShortUrlResult';
+import type { ShortUrlCreation } from '../../../src/short-urls/reducers/shortUrlCreation';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<CreateShortUrlResult />', () => {
diff --git a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx b/shlink-web-component/test/short-urls/helpers/DeleteShortUrlModal.test.tsx
similarity index 86%
rename from test/short-urls/helpers/DeleteShortUrlModal.test.tsx
rename to shlink-web-component/test/short-urls/helpers/DeleteShortUrlModal.test.tsx
index fd698a10..336254c9 100644
--- a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/DeleteShortUrlModal.test.tsx
@@ -1,10 +1,10 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { DeleteShortUrlModal } from '../../../shlink-web-component/src/short-urls/helpers/DeleteShortUrlModal';
-import type { ShortUrlDeletion } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion';
-import type { InvalidShortUrlDeletion } from '../../../src/api/types/errors';
-import { ErrorTypeV2, ErrorTypeV3 } from '../../../src/api/types/errors';
+import type { InvalidShortUrlDeletion } from '../../../src/api-contract';
+import { ErrorTypeV2, ErrorTypeV3 } from '../../../src/api-contract';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { DeleteShortUrlModal } from '../../../src/short-urls/helpers/DeleteShortUrlModal';
+import type { ShortUrlDeletion } from '../../../src/short-urls/reducers/shortUrlDeletion';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 import { TestModalWrapper } from '../../__helpers__/TestModalWrapper';
 
diff --git a/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx b/shlink-web-component/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx
similarity index 87%
rename from test/short-urls/helpers/ExportShortUrlsBtn.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx
index 262289b2..9c9e692b 100644
--- a/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx
@@ -1,10 +1,10 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { ExportShortUrlsBtn as createExportShortUrlsBtn } from '../../../shlink-web-component/src/short-urls/helpers/ExportShortUrlsBtn';
-import type { ReportExporter } from '../../../shlink-web-component/src/utils/services/ReportExporter';
-import type { NotFoundServer, SelectedServer } from '../../../src/servers/data';
+import type { NotFoundServer, SelectedServer } from '../../../../src/servers/data';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { ExportShortUrlsBtn as createExportShortUrlsBtn } from '../../../src/short-urls/helpers/ExportShortUrlsBtn';
+import type { ReportExporter } from '../../../src/utils/services/ReportExporter';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<ExportShortUrlsBtn />', () => {
diff --git a/test/short-urls/helpers/QrCodeModal.test.tsx b/shlink-web-component/test/short-urls/helpers/QrCodeModal.test.tsx
similarity index 94%
rename from test/short-urls/helpers/QrCodeModal.test.tsx
rename to shlink-web-component/test/short-urls/helpers/QrCodeModal.test.tsx
index a473ec86..bda32c22 100644
--- a/test/short-urls/helpers/QrCodeModal.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/QrCodeModal.test.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { QrCodeModal as createQrCodeModal } from '../../../shlink-web-component/src/short-urls/helpers/QrCodeModal';
-import type { SemVer } from '../../../src/utils/helpers/version';
+import type { SemVer } from '../../../../src/utils/helpers/version';
+import { QrCodeModal as createQrCodeModal } from '../../../src/short-urls/helpers/QrCodeModal';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<QrCodeModal />', () => {
diff --git a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlDetailLink.test.tsx
similarity index 85%
rename from test/short-urls/helpers/ShortUrlDetailLink.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlDetailLink.test.tsx
index 673aa0c5..5b2a37c7 100644
--- a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlDetailLink.test.tsx
@@ -1,10 +1,10 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import type { LinkSuffix } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink';
-import { ShortUrlDetailLink } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink';
-import type { NotFoundServer, ReachableServer } from '../../../src/servers/data';
+import type { NotFoundServer, ReachableServer } from '../../../../src/servers/data';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import type { LinkSuffix } from '../../../src/short-urls/helpers/ShortUrlDetailLink';
+import { ShortUrlDetailLink } from '../../../src/short-urls/helpers/ShortUrlDetailLink';
 
 describe('<ShortUrlDetailLink />', () => {
   it.each([
diff --git a/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx
similarity index 83%
rename from test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx
index fcd7fc77..ec3276d0 100644
--- a/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import { ShortUrlFormCheckboxGroup } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlFormCheckboxGroup';
+import { ShortUrlFormCheckboxGroup } from '../../../src/short-urls/helpers/ShortUrlFormCheckboxGroup';
 
 describe('<ShortUrlFormCheckboxGroup />', () => {
   it.each([
diff --git a/test/short-urls/helpers/ShortUrlStatus.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlStatus.test.tsx
similarity index 90%
rename from test/short-urls/helpers/ShortUrlStatus.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlStatus.test.tsx
index 15fbfef2..7755bfc8 100644
--- a/test/short-urls/helpers/ShortUrlStatus.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlStatus.test.tsx
@@ -1,9 +1,9 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/src/short-urls/data';
-import { ShortUrlStatus } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlStatus';
 import type { ShlinkVisitsSummary } from '../../../src/api/types';
+import type { ShortUrl, ShortUrlMeta } from '../../../src/short-urls/data';
+import { ShortUrlStatus } from '../../../src/short-urls/helpers/ShortUrlStatus';
 
 describe('<ShortUrlStatus />', () => {
   const setUp = (shortUrl: ShortUrl) => ({
diff --git a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx
similarity index 92%
rename from test/short-urls/helpers/ShortUrlVisitsCount.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx
index 9dd5fd1b..b810fa6e 100644
--- a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { ShortUrlVisitsCount } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { ShortUrlVisitsCount } from '../../../src/short-urls/helpers/ShortUrlVisitsCount';
 
 describe('<ShortUrlVisitsCount />', () => {
   const setUp = (visitsCount: number, shortUrl: ShortUrl) => ({
diff --git a/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx
similarity index 86%
rename from test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx
index fbf3eb60..5861b77a 100644
--- a/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx
@@ -1,5 +1,5 @@
 import { screen, waitFor } from '@testing-library/react';
-import { ShortUrlsFilterDropdown } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsFilterDropdown';
+import { ShortUrlsFilterDropdown } from '../../../src/short-urls/helpers/ShortUrlsFilterDropdown';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<ShortUrlsFilterDropdown />', () => {
diff --git a/test/short-urls/helpers/ShortUrlsRow.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlsRow.test.tsx
similarity index 91%
rename from test/short-urls/helpers/ShortUrlsRow.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlsRow.test.tsx
index abc7ac6f..6ec8db84 100644
--- a/test/short-urls/helpers/ShortUrlsRow.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlsRow.test.tsx
@@ -3,13 +3,13 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
 import { last } from 'ramda';
 import { MemoryRouter, useLocation } from 'react-router-dom';
-import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/src/short-urls/data';
-import { ShortUrlsRow as createShortUrlsRow } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsRow';
-import { now, parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { ReachableServer } from '../../../src/servers/data';
-import type { Settings } from '../../../src/settings/reducers/settings';
-import type { TimeoutToggle } from '../../../src/utils/helpers/hooks';
-import type { OptionalString } from '../../../src/utils/utils';
+import type { ReachableServer } from '../../../../src/servers/data';
+import type { TimeoutToggle } from '../../../../src/utils/helpers/hooks';
+import type { OptionalString } from '../../../../src/utils/utils';
+import type { Settings } from '../../../src';
+import type { ShortUrl, ShortUrlMeta } from '../../../src/short-urls/data';
+import { ShortUrlsRow as createShortUrlsRow } from '../../../src/short-urls/helpers/ShortUrlsRow';
+import { now, parseDate } from '../../../src/utils/dates/helpers/date';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock';
 
diff --git a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx b/shlink-web-component/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx
similarity index 84%
rename from test/short-urls/helpers/ShortUrlsRowMenu.test.tsx
rename to shlink-web-component/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx
index 63fccb29..c11dc46c 100644
--- a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx
@@ -1,9 +1,9 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { ShortUrlsRowMenu as createShortUrlsRowMenu } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu';
-import type { ReachableServer } from '../../../src/servers/data';
+import type { ReachableServer } from '../../../../src/servers/data';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { ShortUrlsRowMenu as createShortUrlsRowMenu } from '../../../src/short-urls/helpers/ShortUrlsRowMenu';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<ShortUrlsRowMenu />', () => {
diff --git a/test/short-urls/helpers/Tags.test.tsx b/shlink-web-component/test/short-urls/helpers/Tags.test.tsx
similarity index 90%
rename from test/short-urls/helpers/Tags.test.tsx
rename to shlink-web-component/test/short-urls/helpers/Tags.test.tsx
index 922c01ee..f2edd302 100644
--- a/test/short-urls/helpers/Tags.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/Tags.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import { Tags } from '../../../shlink-web-component/src/short-urls/helpers/Tags';
+import { Tags } from '../../../src/short-urls/helpers/Tags';
 import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock';
 
 describe('<Tags />', () => {
diff --git a/test/short-urls/helpers/__snapshots__/ShortUrlsRow.test.tsx.snap b/shlink-web-component/test/short-urls/helpers/__snapshots__/ShortUrlsRow.test.tsx.snap
similarity index 100%
rename from test/short-urls/helpers/__snapshots__/ShortUrlsRow.test.tsx.snap
rename to shlink-web-component/test/short-urls/helpers/__snapshots__/ShortUrlsRow.test.tsx.snap
diff --git a/test/short-urls/helpers/index.test.ts b/shlink-web-component/test/short-urls/helpers/index.test.ts
similarity index 90%
rename from test/short-urls/helpers/index.test.ts
rename to shlink-web-component/test/short-urls/helpers/index.test.ts
index 3c7a34d0..6f252950 100644
--- a/test/short-urls/helpers/index.test.ts
+++ b/shlink-web-component/test/short-urls/helpers/index.test.ts
@@ -1,6 +1,6 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { shortUrlDataFromShortUrl, urlDecodeShortCode, urlEncodeShortCode } from '../../../shlink-web-component/src/short-urls/helpers';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { shortUrlDataFromShortUrl, urlDecodeShortCode, urlEncodeShortCode } from '../../../src/short-urls/helpers';
 
 describe('helpers', () => {
   describe('shortUrlDataFromShortUrl', () => {
diff --git a/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx b/shlink-web-component/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx
similarity index 86%
rename from test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx
rename to shlink-web-component/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx
index e95cfa3d..5c5f3927 100644
--- a/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx
@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { QrErrorCorrectionDropdown } from '../../../../shlink-web-component/src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown';
-import type { QrErrorCorrection } from '../../../../shlink-web-component/src/utils/helpers/qrCodes';
+import { QrErrorCorrectionDropdown } from '../../../../src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown';
+import type { QrErrorCorrection } from '../../../../src/utils/helpers/qrCodes';
 import { renderWithEvents } from '../../../__helpers__/setUpTest';
 
 describe('<QrErrorCorrectionDropdown />', () => {
diff --git a/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx b/shlink-web-component/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx
similarity index 84%
rename from test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx
rename to shlink-web-component/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx
index d90082ee..840f24ea 100644
--- a/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx
+++ b/shlink-web-component/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx
@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { QrFormatDropdown } from '../../../../shlink-web-component/src/short-urls/helpers/qr-codes/QrFormatDropdown';
-import type { QrCodeFormat } from '../../../../shlink-web-component/src/utils/helpers/qrCodes';
+import { QrFormatDropdown } from '../../../../src/short-urls/helpers/qr-codes/QrFormatDropdown';
+import type { QrCodeFormat } from '../../../../src/utils/helpers/qrCodes';
 import { renderWithEvents } from '../../../__helpers__/setUpTest';
 
 describe('<QrFormatDropdown />', () => {
diff --git a/test/short-urls/reducers/shortUrlCreation.test.ts b/shlink-web-component/test/short-urls/reducers/shortUrlCreation.test.ts
similarity index 86%
rename from test/short-urls/reducers/shortUrlCreation.test.ts
rename to shlink-web-component/test/short-urls/reducers/shortUrlCreation.test.ts
index 7358f8cf..1db2102f 100644
--- a/test/short-urls/reducers/shortUrlCreation.test.ts
+++ b/shlink-web-component/test/short-urls/reducers/shortUrlCreation.test.ts
@@ -1,11 +1,11 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
 import {
   createShortUrl as createShortUrlCreator,
   shortUrlCreationReducerCreator,
-} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../src/container/types';
+} from '../../../src/short-urls/reducers/shortUrlCreation';
 
 describe('shortUrlCreationReducer', () => {
   const shortUrl = fromPartial<ShortUrl>({});
diff --git a/test/short-urls/reducers/shortUrlDeletion.test.ts b/shlink-web-component/test/short-urls/reducers/shortUrlDeletion.test.ts
similarity index 94%
rename from test/short-urls/reducers/shortUrlDeletion.test.ts
rename to shlink-web-component/test/short-urls/reducers/shortUrlDeletion.test.ts
index 478892e7..faf12a55 100644
--- a/test/short-urls/reducers/shortUrlDeletion.test.ts
+++ b/shlink-web-component/test/short-urls/reducers/shortUrlDeletion.test.ts
@@ -1,10 +1,10 @@
 import { fromPartial } from '@total-typescript/shoehorn';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ProblemDetailsError } from '../../../src/api/types/errors';
 import {
   deleteShortUrl as deleteShortUrlCreator,
   shortUrlDeletionReducerCreator,
-} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ProblemDetailsError } from '../../../src/api/types/errors';
+} from '../../../src/short-urls/reducers/shortUrlDeletion';
 
 describe('shortUrlDeletionReducer', () => {
   const deleteShortUrlCall = vi.fn();
diff --git a/test/short-urls/reducers/shortUrlDetail.test.ts b/shlink-web-component/test/short-urls/reducers/shortUrlDetail.test.ts
similarity index 87%
rename from test/short-urls/reducers/shortUrlDetail.test.ts
rename to shlink-web-component/test/short-urls/reducers/shortUrlDetail.test.ts
index db750565..c4f1caeb 100644
--- a/test/short-urls/reducers/shortUrlDetail.test.ts
+++ b/shlink-web-component/test/short-urls/reducers/shortUrlDetail.test.ts
@@ -1,9 +1,9 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { shortUrlDetailReducerCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDetail';
-import type { ShortUrlsList } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlsList';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../src/container/types';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { shortUrlDetailReducerCreator } from '../../../src/short-urls/reducers/shortUrlDetail';
+import type { ShortUrlsList } from '../../../src/short-urls/reducers/shortUrlsList';
 
 describe('shortUrlDetailReducer', () => {
   const getShortUrlCall = vi.fn();
diff --git a/test/short-urls/reducers/shortUrlEdition.test.ts b/shlink-web-component/test/short-urls/reducers/shortUrlEdition.test.ts
similarity index 87%
rename from test/short-urls/reducers/shortUrlEdition.test.ts
rename to shlink-web-component/test/short-urls/reducers/shortUrlEdition.test.ts
index ad4b7151..259189ea 100644
--- a/test/short-urls/reducers/shortUrlEdition.test.ts
+++ b/shlink-web-component/test/short-urls/reducers/shortUrlEdition.test.ts
@@ -1,11 +1,11 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { SelectedServer } from '../../../../src/servers/data';
+import type { ShortUrl } from '../../../src/short-urls/data';
 import {
   editShortUrl as editShortUrlCreator,
   shortUrlEditionReducerCreator,
-} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlEdition';
-import type { ShlinkState } from '../../../src/container/types';
-import type { SelectedServer } from '../../../src/servers/data';
+} from '../../../src/short-urls/reducers/shortUrlEdition';
 
 describe('shortUrlEditionReducer', () => {
   const longUrl = 'https://shlink.io';
diff --git a/test/short-urls/reducers/shortUrlsList.test.ts b/shlink-web-component/test/short-urls/reducers/shortUrlsList.test.ts
similarity index 90%
rename from test/short-urls/reducers/shortUrlsList.test.ts
rename to shlink-web-component/test/short-urls/reducers/shortUrlsList.test.ts
index ecfa637b..6e79ccc0 100644
--- a/test/short-urls/reducers/shortUrlsList.test.ts
+++ b/shlink-web-component/test/short-urls/reducers/shortUrlsList.test.ts
@@ -1,16 +1,16 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation';
-import { shortUrlDeleted } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion';
-import { editShortUrl as editShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlEdition';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkShortUrlsResponse } from '../../../src/api/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { createShortUrl as createShortUrlCreator } from '../../../src/short-urls/reducers/shortUrlCreation';
+import { shortUrlDeleted } from '../../../src/short-urls/reducers/shortUrlDeletion';
+import { editShortUrl as editShortUrlCreator } from '../../../src/short-urls/reducers/shortUrlEdition';
 import {
   listShortUrls as listShortUrlsCreator,
   shortUrlsListReducerCreator,
-} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlsList';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { CreateVisit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkShortUrlsResponse } from '../../../src/api/types';
+} from '../../../src/short-urls/reducers/shortUrlsList';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { CreateVisit } from '../../../src/visits/types';
 
 describe('shortUrlsListReducer', () => {
   const shortCode = 'abc123';
diff --git a/test/tags/TagsList.test.tsx b/shlink-web-component/test/tags/TagsList.test.tsx
similarity index 88%
rename from test/tags/TagsList.test.tsx
rename to shlink-web-component/test/tags/TagsList.test.tsx
index 47815ece..d53e52d4 100644
--- a/test/tags/TagsList.test.tsx
+++ b/shlink-web-component/test/tags/TagsList.test.tsx
@@ -1,10 +1,10 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { identity } from 'ramda';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import type { TagsList } from '../../shlink-web-component/src/tags/reducers/tagsList';
-import type { TagsListProps } from '../../shlink-web-component/src/tags/TagsList';
-import { TagsList as createTagsList } from '../../shlink-web-component/src/tags/TagsList';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { TagsList } from '../../src/tags/reducers/tagsList';
+import type { TagsListProps } from '../../src/tags/TagsList';
+import { TagsList as createTagsList } from '../../src/tags/TagsList';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<TagsList />', () => {
diff --git a/test/tags/TagsTable.test.tsx b/shlink-web-component/test/tags/TagsTable.test.tsx
similarity index 95%
rename from test/tags/TagsTable.test.tsx
rename to shlink-web-component/test/tags/TagsTable.test.tsx
index 090edfa3..b7a1350e 100644
--- a/test/tags/TagsTable.test.tsx
+++ b/shlink-web-component/test/tags/TagsTable.test.tsx
@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { useLocation } from 'react-router-dom';
-import { TagsTable as createTagsTable } from '../../shlink-web-component/src/tags/TagsTable';
-import { rangeOf } from '../../src/utils/utils';
+import { TagsTable as createTagsTable } from '../../src/tags/TagsTable';
+import { rangeOf } from '../../src/utils/helpers';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 vi.mock('react-router-dom', async () => ({
diff --git a/test/tags/TagsTableRow.test.tsx b/shlink-web-component/test/tags/TagsTableRow.test.tsx
similarity index 96%
rename from test/tags/TagsTableRow.test.tsx
rename to shlink-web-component/test/tags/TagsTableRow.test.tsx
index e45ddc56..ec2c4e8a 100644
--- a/test/tags/TagsTableRow.test.tsx
+++ b/shlink-web-component/test/tags/TagsTableRow.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import { TagsTableRow as createTagsTableRow } from '../../shlink-web-component/src/tags/TagsTableRow';
+import { TagsTableRow as createTagsTableRow } from '../../src/tags/TagsTableRow';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 import { colorGeneratorMock } from '../utils/services/__mocks__/ColorGenerator.mock';
 
diff --git a/test/tags/helpers/DeleteTagConfirmModal.test.tsx b/shlink-web-component/test/tags/helpers/DeleteTagConfirmModal.test.tsx
similarity index 91%
rename from test/tags/helpers/DeleteTagConfirmModal.test.tsx
rename to shlink-web-component/test/tags/helpers/DeleteTagConfirmModal.test.tsx
index 55f87936..03dfd732 100644
--- a/test/tags/helpers/DeleteTagConfirmModal.test.tsx
+++ b/shlink-web-component/test/tags/helpers/DeleteTagConfirmModal.test.tsx
@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { DeleteTagConfirmModal } from '../../../shlink-web-component/src/tags/helpers/DeleteTagConfirmModal';
-import type { TagDeletion } from '../../../shlink-web-component/src/tags/reducers/tagDelete';
+import { DeleteTagConfirmModal } from '../../../src/tags/helpers/DeleteTagConfirmModal';
+import type { TagDeletion } from '../../../src/tags/reducers/tagDelete';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DeleteTagConfirmModal />', () => {
diff --git a/test/tags/helpers/EditTagModal.test.tsx b/shlink-web-component/test/tags/helpers/EditTagModal.test.tsx
similarity index 93%
rename from test/tags/helpers/EditTagModal.test.tsx
rename to shlink-web-component/test/tags/helpers/EditTagModal.test.tsx
index 067760f8..91e57488 100644
--- a/test/tags/helpers/EditTagModal.test.tsx
+++ b/shlink-web-component/test/tags/helpers/EditTagModal.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { EditTagModal as createEditTagModal } from '../../../shlink-web-component/src/tags/helpers/EditTagModal';
-import type { TagEdition } from '../../../shlink-web-component/src/tags/reducers/tagEdit';
+import { EditTagModal as createEditTagModal } from '../../../src/tags/helpers/EditTagModal';
+import type { TagEdition } from '../../../src/tags/reducers/tagEdit';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<EditTagModal />', () => {
diff --git a/test/tags/helpers/Tag.test.tsx b/shlink-web-component/test/tags/helpers/Tag.test.tsx
similarity index 93%
rename from test/tags/helpers/Tag.test.tsx
rename to shlink-web-component/test/tags/helpers/Tag.test.tsx
index 73cdd5ae..8d09286d 100644
--- a/test/tags/helpers/Tag.test.tsx
+++ b/shlink-web-component/test/tags/helpers/Tag.test.tsx
@@ -1,9 +1,9 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import type { ReactNode } from 'react';
-import { Tag } from '../../../shlink-web-component/src/tags/helpers/Tag';
-import type { ColorGenerator } from '../../../shlink-web-component/src/utils/services/ColorGenerator';
-import { MAIN_COLOR } from '../../../src/utils/theme';
+import { MAIN_COLOR } from '../../../../src/utils/theme';
+import { Tag } from '../../../src/tags/helpers/Tag';
+import type { ColorGenerator } from '../../../src/utils/services/ColorGenerator';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 const hexToRgb = (hex: string) => {
diff --git a/test/tags/helpers/TagsSelector.test.tsx b/shlink-web-component/test/tags/helpers/TagsSelector.test.tsx
similarity index 92%
rename from test/tags/helpers/TagsSelector.test.tsx
rename to shlink-web-component/test/tags/helpers/TagsSelector.test.tsx
index 7916d905..08bb3058 100644
--- a/test/tags/helpers/TagsSelector.test.tsx
+++ b/shlink-web-component/test/tags/helpers/TagsSelector.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { TagsSelector as createTagsSelector } from '../../../shlink-web-component/src/tags/helpers/TagsSelector';
-import type { TagsList } from '../../../shlink-web-component/src/tags/reducers/tagsList';
+import { TagsSelector as createTagsSelector } from '../../../src/tags/helpers/TagsSelector';
+import type { TagsList } from '../../../src/tags/reducers/tagsList';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock';
 
diff --git a/test/tags/reducers/tagDelete.test.ts b/shlink-web-component/test/tags/reducers/tagDelete.test.ts
similarity index 87%
rename from test/tags/reducers/tagDelete.test.ts
rename to shlink-web-component/test/tags/reducers/tagDelete.test.ts
index a68d8cad..c0d7a5b2 100644
--- a/test/tags/reducers/tagDelete.test.ts
+++ b/shlink-web-component/test/tags/reducers/tagDelete.test.ts
@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { tagDeleted, tagDeleteReducerCreator } from '../../../shlink-web-component/src/tags/reducers/tagDelete';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../src/container/types';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { tagDeleted, tagDeleteReducerCreator } from '../../../src/tags/reducers/tagDelete';
 
 describe('tagDeleteReducer', () => {
   const deleteTagsCall = vi.fn();
diff --git a/test/tags/reducers/tagEdit.test.ts b/shlink-web-component/test/tags/reducers/tagEdit.test.ts
similarity index 87%
rename from test/tags/reducers/tagEdit.test.ts
rename to shlink-web-component/test/tags/reducers/tagEdit.test.ts
index 1fd9259c..d0056114 100644
--- a/test/tags/reducers/tagEdit.test.ts
+++ b/shlink-web-component/test/tags/reducers/tagEdit.test.ts
@@ -1,8 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { editTag as editTagCreator, tagEdited, tagEditReducerCreator } from '../../../shlink-web-component/src/tags/reducers/tagEdit';
-import type { ColorGenerator } from '../../../shlink-web-component/src/utils/services/ColorGenerator';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkState } from '../../../src/container/types';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { editTag as editTagCreator, tagEdited, tagEditReducerCreator } from '../../../src/tags/reducers/tagEdit';
+import type { ColorGenerator } from '../../../src/utils/services/ColorGenerator';
 
 describe('tagEditReducer', () => {
   const oldName = 'foo';
diff --git a/test/tags/reducers/tagsList.test.ts b/shlink-web-component/test/tags/reducers/tagsList.test.ts
similarity index 90%
rename from test/tags/reducers/tagsList.test.ts
rename to shlink-web-component/test/tags/reducers/tagsList.test.ts
index 54dbb6a2..276a7366 100644
--- a/test/tags/reducers/tagsList.test.ts
+++ b/shlink-web-component/test/tags/reducers/tagsList.test.ts
@@ -1,18 +1,18 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation';
-import { tagDeleted } from '../../../shlink-web-component/src/tags/reducers/tagDelete';
-import { tagEdited } from '../../../shlink-web-component/src/tags/reducers/tagEdit';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { createShortUrl as createShortUrlCreator } from '../../../src/short-urls/reducers/shortUrlCreation';
+import { tagDeleted } from '../../../src/tags/reducers/tagDelete';
+import { tagEdited } from '../../../src/tags/reducers/tagEdit';
 import type {
-  TagsList } from '../../../shlink-web-component/src/tags/reducers/tagsList';
+  TagsList } from '../../../src/tags/reducers/tagsList';
 import {
   filterTags,
   listTags as listTagsCreator,
   tagsListReducerCreator,
-} from '../../../shlink-web-component/src/tags/reducers/tagsList';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { CreateVisit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkState } from '../../../src/container/types';
+} from '../../../src/tags/reducers/tagsList';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { CreateVisit } from '../../../src/visits/types';
 
 describe('tagsListReducer', () => {
   const state = (props: Partial<TagsList>) => fromPartial<TagsList>(props);
diff --git a/test/utils/CopyToClipboardIcon.test.tsx b/shlink-web-component/test/utils/components/CopyToClipboardIcon.test.tsx
similarity index 79%
rename from test/utils/CopyToClipboardIcon.test.tsx
rename to shlink-web-component/test/utils/components/CopyToClipboardIcon.test.tsx
index 4c5370ac..01aee93b 100644
--- a/test/utils/CopyToClipboardIcon.test.tsx
+++ b/shlink-web-component/test/utils/components/CopyToClipboardIcon.test.tsx
@@ -1,5 +1,5 @@
-import { CopyToClipboardIcon } from '../../shlink-web-component/src/utils/components/CopyToClipboardIcon';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { CopyToClipboardIcon } from '../../../src/utils/components/CopyToClipboardIcon';
+import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<CopyToClipboardIcon />', () => {
   const onCopy = vi.fn();
diff --git a/test/utils/ExportBtn.test.tsx b/shlink-web-component/test/utils/components/ExportBtn.test.tsx
similarity index 92%
rename from test/utils/ExportBtn.test.tsx
rename to shlink-web-component/test/utils/components/ExportBtn.test.tsx
index fbdbcf02..39d0f5cd 100644
--- a/test/utils/ExportBtn.test.tsx
+++ b/shlink-web-component/test/utils/components/ExportBtn.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import { ExportBtn } from '../../shlink-web-component/src/utils/components/ExportBtn';
+import { ExportBtn } from '../../../src/utils/components/ExportBtn';
 
 describe('<ExportBtn />', () => {
   const setUp = (amount?: number, loading = false) => render(<ExportBtn amount={amount} loading={loading} />);
diff --git a/test/utils/IconInput.test.tsx b/shlink-web-component/test/utils/components/IconInput.test.tsx
similarity index 85%
rename from test/utils/IconInput.test.tsx
rename to shlink-web-component/test/utils/components/IconInput.test.tsx
index 9e241b12..96bee16d 100644
--- a/test/utils/IconInput.test.tsx
+++ b/shlink-web-component/test/utils/components/IconInput.test.tsx
@@ -1,8 +1,8 @@
 import type { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faAppleAlt, faCalendar, faTable } from '@fortawesome/free-solid-svg-icons';
 import { screen } from '@testing-library/react';
-import { IconInput } from '../../shlink-web-component/src/utils/components/IconInput';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { IconInput } from '../../../src/utils/components/IconInput';
+import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<IconInput />', () => {
   const setUp = (icon: IconProp, placeholder?: string) => renderWithEvents(
diff --git a/test/utils/InfoTooltip.test.tsx b/shlink-web-component/test/utils/components/InfoTooltip.test.tsx
similarity index 86%
rename from test/utils/InfoTooltip.test.tsx
rename to shlink-web-component/test/utils/components/InfoTooltip.test.tsx
index 40e46ce8..13c97c8e 100644
--- a/test/utils/InfoTooltip.test.tsx
+++ b/shlink-web-component/test/utils/components/InfoTooltip.test.tsx
@@ -1,8 +1,8 @@
 import type { Placement } from '@popperjs/core';
 import { screen, waitFor } from '@testing-library/react';
-import type { InfoTooltipProps } from '../../shlink-web-component/src/utils/components/InfoTooltip';
-import { InfoTooltip } from '../../shlink-web-component/src/utils/components/InfoTooltip';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import type { InfoTooltipProps } from '../../../src/utils/components/InfoTooltip';
+import { InfoTooltip } from '../../../src/utils/components/InfoTooltip';
+import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<InfoTooltip />', () => {
   const setUp = (props: Partial<InfoTooltipProps> = {}) => renderWithEvents(
diff --git a/test/utils/PaginationDropdown.test.tsx b/shlink-web-component/test/utils/components/PaginationDropdown.test.tsx
similarity index 84%
rename from test/utils/PaginationDropdown.test.tsx
rename to shlink-web-component/test/utils/components/PaginationDropdown.test.tsx
index 8ce50a7f..57a8be6b 100644
--- a/test/utils/PaginationDropdown.test.tsx
+++ b/shlink-web-component/test/utils/components/PaginationDropdown.test.tsx
@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { PaginationDropdown } from '../../shlink-web-component/src/utils/components/PaginationDropdown';
-import { renderWithEvents } from '../__helpers__/setUpTest';
+import { PaginationDropdown } from '../../../src/utils/components/PaginationDropdown';
+import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<PaginationDropdown />', () => {
   const setValue = vi.fn();
diff --git a/test/utils/__snapshots__/CopyToClipboardIcon.test.tsx.snap b/shlink-web-component/test/utils/components/__snapshots__/CopyToClipboardIcon.test.tsx.snap
similarity index 100%
rename from test/utils/__snapshots__/CopyToClipboardIcon.test.tsx.snap
rename to shlink-web-component/test/utils/components/__snapshots__/CopyToClipboardIcon.test.tsx.snap
diff --git a/test/utils/__snapshots__/ExportBtn.test.tsx.snap b/shlink-web-component/test/utils/components/__snapshots__/ExportBtn.test.tsx.snap
similarity index 100%
rename from test/utils/__snapshots__/ExportBtn.test.tsx.snap
rename to shlink-web-component/test/utils/components/__snapshots__/ExportBtn.test.tsx.snap
diff --git a/test/utils/__snapshots__/IconInput.test.tsx.snap b/shlink-web-component/test/utils/components/__snapshots__/IconInput.test.tsx.snap
similarity index 100%
rename from test/utils/__snapshots__/IconInput.test.tsx.snap
rename to shlink-web-component/test/utils/components/__snapshots__/IconInput.test.tsx.snap
diff --git a/test/utils/dates/DateInput.test.tsx b/shlink-web-component/test/utils/dates/DateInput.test.tsx
similarity index 90%
rename from test/utils/dates/DateInput.test.tsx
rename to shlink-web-component/test/utils/dates/DateInput.test.tsx
index 95d56619..b37e3409 100644
--- a/test/utils/dates/DateInput.test.tsx
+++ b/shlink-web-component/test/utils/dates/DateInput.test.tsx
@@ -1,8 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { parseISO } from 'date-fns';
-import type { DateInputProps } from '../../../shlink-web-component/src/utils/dates/DateInput';
-import { DateInput } from '../../../shlink-web-component/src/utils/dates/DateInput';
+import type { DateInputProps } from '../../../src/utils/dates/DateInput';
+import { DateInput } from '../../../src/utils/dates/DateInput';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DateInput />', () => {
diff --git a/test/utils/dates/DateIntervalDropdownItems.test.tsx b/shlink-web-component/test/utils/dates/DateIntervalDropdownItems.test.tsx
similarity index 87%
rename from test/utils/dates/DateIntervalDropdownItems.test.tsx
rename to shlink-web-component/test/utils/dates/DateIntervalDropdownItems.test.tsx
index 2e43ed47..dbfd358e 100644
--- a/test/utils/dates/DateIntervalDropdownItems.test.tsx
+++ b/shlink-web-component/test/utils/dates/DateIntervalDropdownItems.test.tsx
@@ -1,8 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
-import { DropdownBtn } from '../../../shlink-frontend-kit/src/navigation/DropdownBtn';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
-import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import { DropdownBtn } from '../../../../shlink-frontend-kit/src';
 import { DateIntervalDropdownItems } from '../../../src/utils/dates/DateIntervalDropdownItems';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
+import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../src/utils/dates/helpers/dateIntervals';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DateIntervalDropdownItems />', () => {
diff --git a/test/utils/dates/DateRangeRow.test.tsx b/shlink-web-component/test/utils/dates/DateRangeRow.test.tsx
similarity index 92%
rename from test/utils/dates/DateRangeRow.test.tsx
rename to shlink-web-component/test/utils/dates/DateRangeRow.test.tsx
index 388ebfae..85f05904 100644
--- a/test/utils/dates/DateRangeRow.test.tsx
+++ b/shlink-web-component/test/utils/dates/DateRangeRow.test.tsx
@@ -1,5 +1,5 @@
 import { screen } from '@testing-library/react';
-import { DateRangeRow } from '../../../shlink-web-component/src/utils/dates/DateRangeRow';
+import { DateRangeRow } from '../../../src/utils/dates/DateRangeRow';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DateRangeRow />', () => {
diff --git a/test/utils/dates/DateRangeSelector.test.tsx b/shlink-web-component/test/utils/dates/DateRangeSelector.test.tsx
similarity index 88%
rename from test/utils/dates/DateRangeSelector.test.tsx
rename to shlink-web-component/test/utils/dates/DateRangeSelector.test.tsx
index 54d4b595..016a5496 100644
--- a/test/utils/dates/DateRangeSelector.test.tsx
+++ b/shlink-web-component/test/utils/dates/DateRangeSelector.test.tsx
@@ -1,8 +1,8 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { DateRangeSelectorProps } from '../../../shlink-web-component/src/utils/dates/DateRangeSelector';
-import { DateRangeSelector } from '../../../shlink-web-component/src/utils/dates/DateRangeSelector';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { DateRangeSelectorProps } from '../../../src/utils/dates/DateRangeSelector';
+import { DateRangeSelector } from '../../../src/utils/dates/DateRangeSelector';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DateRangeSelector />', () => {
diff --git a/test/utils/dates/Time.test.tsx b/shlink-web-component/test/utils/dates/Time.test.tsx
similarity index 77%
rename from test/utils/dates/Time.test.tsx
rename to shlink-web-component/test/utils/dates/Time.test.tsx
index 367e5d2f..e3f0388f 100644
--- a/test/utils/dates/Time.test.tsx
+++ b/shlink-web-component/test/utils/dates/Time.test.tsx
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react';
-import { parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { TimeProps } from '../../../shlink-web-component/src/utils/dates/Time';
-import { Time } from '../../../shlink-web-component/src/utils/dates/Time';
+import { parseDate } from '../../../src/utils/dates/helpers/date';
+import type { TimeProps } from '../../../src/utils/dates/Time';
+import { Time } from '../../../src/utils/dates/Time';
 
 describe('<Time />', () => {
   const setUp = (props: TimeProps) => render(<Time {...props} />);
diff --git a/test/utils/helpers/date.test.ts b/shlink-web-component/test/utils/dates/helpers/date.test.ts
similarity index 96%
rename from test/utils/helpers/date.test.ts
rename to shlink-web-component/test/utils/dates/helpers/date.test.ts
index cf86b5bd..64122aea 100644
--- a/test/utils/helpers/date.test.ts
+++ b/shlink-web-component/test/utils/dates/helpers/date.test.ts
@@ -1,5 +1,5 @@
 import { addDays, formatISO, subDays } from 'date-fns';
-import { formatDate, formatIsoDate, isBeforeOrEqual, isBetween, parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
+import { formatDate, formatIsoDate, isBeforeOrEqual, isBetween, parseDate } from '../../../../src/utils/dates/helpers/date';
 
 describe('date', () => {
   const now = new Date();
diff --git a/test/utils/helpers/dateIntervals.test.ts b/shlink-web-component/test/utils/dates/helpers/dateIntervals.test.ts
similarity index 95%
rename from test/utils/helpers/dateIntervals.test.ts
rename to shlink-web-component/test/utils/dates/helpers/dateIntervals.test.ts
index 96eaa7e4..df550d66 100644
--- a/test/utils/helpers/dateIntervals.test.ts
+++ b/shlink-web-component/test/utils/dates/helpers/dateIntervals.test.ts
@@ -1,7 +1,7 @@
 import { endOfDay, format, formatISO, startOfDay, subDays } from 'date-fns';
-import { now, parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
+import { now, parseDate } from '../../../../src/utils/dates/helpers/date';
 import type {
-  DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+  DateInterval } from '../../../../src/utils/dates/helpers/dateIntervals';
 import {
   dateRangeIsEmpty,
   dateToMatchingInterval,
@@ -9,7 +9,7 @@ import {
   rangeIsInterval,
   rangeOrIntervalToString,
   toDateRange,
-} from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+} from '../../../../src/utils/dates/helpers/dateIntervals';
 
 describe('date-types', () => {
   const daysBack = (days: number) => subDays(now(), days);
diff --git a/test/utils/utils.test.ts b/shlink-web-component/test/utils/helpers/index.test.ts
similarity index 97%
rename from test/utils/utils.test.ts
rename to shlink-web-component/test/utils/helpers/index.test.ts
index 46953784..ddc3e4e6 100644
--- a/test/utils/utils.test.ts
+++ b/shlink-web-component/test/utils/helpers/index.test.ts
@@ -3,7 +3,7 @@ import {
   parseBooleanToString,
   parseOptionalBooleanToString,
   rangeOf,
-} from '../../src/utils/utils';
+} from '../../../src/utils/helpers';
 
 describe('utils', () => {
   describe('rangeOf', () => {
diff --git a/test/utils/helpers/numbers.test.ts b/shlink-web-component/test/utils/helpers/numbers.test.ts
similarity index 84%
rename from test/utils/helpers/numbers.test.ts
rename to shlink-web-component/test/utils/helpers/numbers.test.ts
index 81939beb..f3bdc3f2 100644
--- a/test/utils/helpers/numbers.test.ts
+++ b/shlink-web-component/test/utils/helpers/numbers.test.ts
@@ -1,4 +1,4 @@
-import { roundTen } from '../../../shlink-web-component/src/utils/helpers/numbers';
+import { roundTen } from '../../../src/utils/helpers/numbers';
 
 describe('numbers', () => {
   describe('roundTen', () => {
diff --git a/test/utils/helpers/qrCodes.test.ts b/shlink-web-component/test/utils/helpers/qrCodes.test.ts
similarity index 90%
rename from test/utils/helpers/qrCodes.test.ts
rename to shlink-web-component/test/utils/helpers/qrCodes.test.ts
index 04004ec6..a1cae693 100644
--- a/test/utils/helpers/qrCodes.test.ts
+++ b/shlink-web-component/test/utils/helpers/qrCodes.test.ts
@@ -1,5 +1,5 @@
-import type { QrCodeFormat, QrErrorCorrection } from '../../../shlink-web-component/src/utils/helpers/qrCodes';
-import { buildQrCodeUrl } from '../../../shlink-web-component/src/utils/helpers/qrCodes';
+import type { QrCodeFormat, QrErrorCorrection } from '../../../src/utils/helpers/qrCodes';
+import { buildQrCodeUrl } from '../../../src/utils/helpers/qrCodes';
 
 describe('qrCodes', () => {
   describe('buildQrCodeUrl', () => {
diff --git a/test/utils/helpers/query.test.ts b/shlink-web-component/test/utils/helpers/query.test.ts
similarity index 88%
rename from test/utils/helpers/query.test.ts
rename to shlink-web-component/test/utils/helpers/query.test.ts
index 2449382e..68e1350c 100644
--- a/test/utils/helpers/query.test.ts
+++ b/shlink-web-component/test/utils/helpers/query.test.ts
@@ -1,4 +1,4 @@
-import { parseQuery, stringifyQuery } from '../../../shlink-web-component/src/utils/helpers/query';
+import { parseQuery, stringifyQuery } from '../../../src/utils/helpers/query';
 
 describe('query', () => {
   describe('parseQuery', () => {
diff --git a/test/utils/services/ColorGenerator.test.ts b/shlink-web-component/test/utils/services/ColorGenerator.test.ts
similarity index 90%
rename from test/utils/services/ColorGenerator.test.ts
rename to shlink-web-component/test/utils/services/ColorGenerator.test.ts
index 92e199b9..700b2d30 100644
--- a/test/utils/services/ColorGenerator.test.ts
+++ b/shlink-web-component/test/utils/services/ColorGenerator.test.ts
@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { ColorGenerator } from '../../../shlink-web-component/src/utils/services/ColorGenerator';
-import type { LocalStorage } from '../../../src/utils/services/LocalStorage';
-import { MAIN_COLOR } from '../../../src/utils/theme';
+import type { LocalStorage } from '../../../../src/utils/services/LocalStorage';
+import { MAIN_COLOR } from '../../../../src/utils/theme';
+import { ColorGenerator } from '../../../src/utils/services/ColorGenerator';
 
 describe('ColorGenerator', () => {
   let colorGenerator: ColorGenerator;
diff --git a/shlink-web-component/test/utils/services/ImageDownloader.test.ts b/shlink-web-component/test/utils/services/ImageDownloader.test.ts
new file mode 100644
index 00000000..22b9bf59
--- /dev/null
+++ b/shlink-web-component/test/utils/services/ImageDownloader.test.ts
@@ -0,0 +1,21 @@
+import { ImageDownloader } from '../../../src/utils/services/ImageDownloader';
+import { windowMock } from '../../__mocks__/Window.mock';
+
+describe('ImageDownloader', () => {
+  const fetch = vi.fn();
+  let imageDownloader: ImageDownloader;
+
+  beforeEach(() => {
+    (global as any).URL = { createObjectURL: () => '' };
+
+    imageDownloader = new ImageDownloader(fetch, windowMock);
+  });
+
+  it('calls URL with response type blob', async () => {
+    fetch.mockResolvedValue({ blob: () => new Blob() });
+
+    await imageDownloader.saveImage('/foo/bar.png', 'my-image.png');
+
+    expect(fetch).toHaveBeenCalledWith('/foo/bar.png');
+  });
+});
diff --git a/shlink-web-component/test/utils/services/LocalStorage.test.ts b/shlink-web-component/test/utils/services/LocalStorage.test.ts
new file mode 100644
index 00000000..c3e44066
--- /dev/null
+++ b/shlink-web-component/test/utils/services/LocalStorage.test.ts
@@ -0,0 +1,43 @@
+import { fromPartial } from '@total-typescript/shoehorn';
+import { LocalStorage } from '../../../src/utils/services/LocalStorage';
+
+describe('LocalStorage', () => {
+  const getItem = vi.fn((key) => (key === 'shlink.foo' ? JSON.stringify({ foo: 'bar' }) : null));
+  const setItem = vi.fn();
+  const localStorageMock = fromPartial<Storage>({ getItem, setItem });
+  let storage: LocalStorage;
+
+  beforeEach(() => {
+    storage = new LocalStorage(localStorageMock);
+  });
+
+  describe('set', () => {
+    it('writes an stringified representation of provided value in local storage', () => {
+      const value = { bar: 'baz' };
+
+      storage.set('foo', value);
+
+      expect(setItem).toHaveBeenCalledTimes(1);
+      expect(setItem).toHaveBeenCalledWith('shlink.foo', JSON.stringify(value));
+    });
+  });
+
+  describe('get', () => {
+    it('fetches item from local storage', () => {
+      storage.get('foo');
+      expect(getItem).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns parsed value when requested value is found in local storage', () => {
+      const value = storage.get('foo');
+
+      expect(value).toEqual({ foo: 'bar' });
+    });
+
+    it('returns undefined when requested value is not found in local storage', () => {
+      const value = storage.get('bar');
+
+      expect(value).toBeUndefined();
+    });
+  });
+});
diff --git a/test/common/services/ReportExporter.test.ts b/shlink-web-component/test/utils/services/ReportExporter.test.ts
similarity index 85%
rename from test/common/services/ReportExporter.test.ts
rename to shlink-web-component/test/utils/services/ReportExporter.test.ts
index b2222117..f105b047 100644
--- a/test/common/services/ReportExporter.test.ts
+++ b/shlink-web-component/test/utils/services/ReportExporter.test.ts
@@ -1,6 +1,6 @@
-import type { ExportableShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { ReportExporter } from '../../../shlink-web-component/src/utils/services/ReportExporter';
-import type { NormalizedVisit } from '../../../shlink-web-component/src/visits/types';
+import type { ExportableShortUrl } from '../../../src/short-urls/data';
+import { ReportExporter } from '../../../src/utils/services/ReportExporter';
+import type { NormalizedVisit } from '../../../src/visits/types';
 import { windowMock } from '../../__mocks__/Window.mock';
 
 describe('ReportExporter', () => {
diff --git a/test/utils/services/__mocks__/ColorGenerator.mock.ts b/shlink-web-component/test/utils/services/__mocks__/ColorGenerator.mock.ts
similarity index 68%
rename from test/utils/services/__mocks__/ColorGenerator.mock.ts
rename to shlink-web-component/test/utils/services/__mocks__/ColorGenerator.mock.ts
index cf028621..d898575d 100644
--- a/test/utils/services/__mocks__/ColorGenerator.mock.ts
+++ b/shlink-web-component/test/utils/services/__mocks__/ColorGenerator.mock.ts
@@ -1,5 +1,5 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ColorGenerator } from '../../../../shlink-web-component/src/utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../../src/utils/services/ColorGenerator';
 
 export const colorGeneratorMock = fromPartial<ColorGenerator>({
   getColorForKey: vi.fn(() => 'red'),
diff --git a/test/utils/table/TableOrderIcon.test.tsx b/shlink-web-component/test/utils/table/TableOrderIcon.test.tsx
similarity index 86%
rename from test/utils/table/TableOrderIcon.test.tsx
rename to shlink-web-component/test/utils/table/TableOrderIcon.test.tsx
index 3908dcd5..9da07451 100644
--- a/test/utils/table/TableOrderIcon.test.tsx
+++ b/shlink-web-component/test/utils/table/TableOrderIcon.test.tsx
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/react';
-import type { OrderDir } from '../../../shlink-frontend-kit/src/ordering/ordering';
-import { TableOrderIcon } from '../../../shlink-web-component/src/utils/table/TableOrderIcon';
+import type { OrderDir } from '../../../../shlink-frontend-kit/src/ordering/ordering';
+import { TableOrderIcon } from '../../../src/utils/table/TableOrderIcon';
 
 describe('<TableOrderIcon />', () => {
   const setUp = (field: string, currentDir?: OrderDir, className?: string) => render(
diff --git a/test/utils/table/__snapshots__/TableOrderIcon.test.tsx.snap b/shlink-web-component/test/utils/table/__snapshots__/TableOrderIcon.test.tsx.snap
similarity index 100%
rename from test/utils/table/__snapshots__/TableOrderIcon.test.tsx.snap
rename to shlink-web-component/test/utils/table/__snapshots__/TableOrderIcon.test.tsx.snap
diff --git a/test/visits/DomainVisits.test.tsx b/shlink-web-component/test/visits/DomainVisits.test.tsx
similarity index 84%
rename from test/visits/DomainVisits.test.tsx
rename to shlink-web-component/test/visits/DomainVisits.test.tsx
index 9640f9ca..b87f29d6 100644
--- a/test/visits/DomainVisits.test.tsx
+++ b/shlink-web-component/test/visits/DomainVisits.test.tsx
@@ -2,9 +2,9 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import { DomainVisits as createDomainVisits } from '../../shlink-web-component/src/visits/DomainVisits';
-import type { DomainVisits } from '../../shlink-web-component/src/visits/reducers/domainVisits';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { DomainVisits as createDomainVisits } from '../../src/visits/DomainVisits';
+import type { DomainVisits } from '../../src/visits/reducers/domainVisits';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 vi.mock('react-router-dom', async () => ({
diff --git a/test/visits/NonOrphanVisits.test.tsx b/shlink-web-component/test/visits/NonOrphanVisits.test.tsx
similarity index 86%
rename from test/visits/NonOrphanVisits.test.tsx
rename to shlink-web-component/test/visits/NonOrphanVisits.test.tsx
index c7955fe9..fb024b52 100644
--- a/test/visits/NonOrphanVisits.test.tsx
+++ b/shlink-web-component/test/visits/NonOrphanVisits.test.tsx
@@ -2,9 +2,9 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import { NonOrphanVisits as createNonOrphanVisits } from '../../shlink-web-component/src/visits/NonOrphanVisits';
-import type { VisitsInfo } from '../../shlink-web-component/src/visits/reducers/types';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { NonOrphanVisits as createNonOrphanVisits } from '../../src/visits/NonOrphanVisits';
+import type { VisitsInfo } from '../../src/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<NonOrphanVisits />', () => {
diff --git a/test/visits/OrphanVisits.test.tsx b/shlink-web-component/test/visits/OrphanVisits.test.tsx
similarity index 82%
rename from test/visits/OrphanVisits.test.tsx
rename to shlink-web-component/test/visits/OrphanVisits.test.tsx
index 0288f645..53bad336 100644
--- a/test/visits/OrphanVisits.test.tsx
+++ b/shlink-web-component/test/visits/OrphanVisits.test.tsx
@@ -2,9 +2,9 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import { OrphanVisits as createOrphanVisits } from '../../shlink-web-component/src/visits/OrphanVisits';
-import type { VisitsInfo } from '../../shlink-web-component/src/visits/reducers/types';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import { OrphanVisits as createOrphanVisits } from '../../src/visits/OrphanVisits';
+import type { VisitsInfo } from '../../src/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<OrphanVisits />', () => {
diff --git a/test/visits/ShortUrlVisits.test.tsx b/shlink-web-component/test/visits/ShortUrlVisits.test.tsx
similarity index 82%
rename from test/visits/ShortUrlVisits.test.tsx
rename to shlink-web-component/test/visits/ShortUrlVisits.test.tsx
index 669c0669..cf6014a9 100644
--- a/test/visits/ShortUrlVisits.test.tsx
+++ b/shlink-web-component/test/visits/ShortUrlVisits.test.tsx
@@ -3,10 +3,10 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { identity } from 'ramda';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import type { ShortUrlVisits as ShortUrlVisitsState } from '../../shlink-web-component/src/visits/reducers/shortUrlVisits';
-import type { ShortUrlVisitsProps } from '../../shlink-web-component/src/visits/ShortUrlVisits';
-import { ShortUrlVisits as createShortUrlVisits } from '../../shlink-web-component/src/visits/ShortUrlVisits';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { ShortUrlVisits as ShortUrlVisitsState } from '../../src/visits/reducers/shortUrlVisits';
+import type { ShortUrlVisitsProps } from '../../src/visits/ShortUrlVisits';
+import { ShortUrlVisits as createShortUrlVisits } from '../../src/visits/ShortUrlVisits';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<ShortUrlVisits />', () => {
diff --git a/test/visits/ShortUrlVisitsHeader.test.tsx b/shlink-web-component/test/visits/ShortUrlVisitsHeader.test.tsx
similarity index 85%
rename from test/visits/ShortUrlVisitsHeader.test.tsx
rename to shlink-web-component/test/visits/ShortUrlVisitsHeader.test.tsx
index c6a04735..12863cee 100644
--- a/test/visits/ShortUrlVisitsHeader.test.tsx
+++ b/shlink-web-component/test/visits/ShortUrlVisitsHeader.test.tsx
@@ -1,9 +1,9 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatDistance, parseISO } from 'date-fns';
-import type { ShortUrlDetail } from '../../shlink-web-component/src/short-urls/reducers/shortUrlDetail';
-import type { ShortUrlVisits } from '../../shlink-web-component/src/visits/reducers/shortUrlVisits';
-import { ShortUrlVisitsHeader } from '../../shlink-web-component/src/visits/ShortUrlVisitsHeader';
+import type { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail';
+import type { ShortUrlVisits } from '../../src/visits/reducers/shortUrlVisits';
+import { ShortUrlVisitsHeader } from '../../src/visits/ShortUrlVisitsHeader';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<ShortUrlVisitsHeader />', () => {
diff --git a/test/visits/TagVisits.test.tsx b/shlink-web-component/test/visits/TagVisits.test.tsx
similarity index 80%
rename from test/visits/TagVisits.test.tsx
rename to shlink-web-component/test/visits/TagVisits.test.tsx
index 86a5b71c..72b28df3 100644
--- a/test/visits/TagVisits.test.tsx
+++ b/shlink-web-component/test/visits/TagVisits.test.tsx
@@ -2,10 +2,10 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router';
-import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub';
-import type { TagVisits as TagVisitsStats } from '../../shlink-web-component/src/visits/reducers/tagVisits';
-import type { TagVisitsProps } from '../../shlink-web-component/src/visits/TagVisits';
-import { TagVisits as createTagVisits } from '../../shlink-web-component/src/visits/TagVisits';
+import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { TagVisits as TagVisitsStats } from '../../src/visits/reducers/tagVisits';
+import type { TagVisitsProps } from '../../src/visits/TagVisits';
+import { TagVisits as createTagVisits } from '../../src/visits/TagVisits';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 vi.mock('react-router-dom', async () => ({
diff --git a/test/visits/TagVisitsHeader.test.tsx b/shlink-web-component/test/visits/TagVisitsHeader.test.tsx
similarity index 77%
rename from test/visits/TagVisitsHeader.test.tsx
rename to shlink-web-component/test/visits/TagVisitsHeader.test.tsx
index b88c67f4..6c936c44 100644
--- a/test/visits/TagVisitsHeader.test.tsx
+++ b/shlink-web-component/test/visits/TagVisitsHeader.test.tsx
@@ -1,8 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ColorGenerator } from '../../shlink-web-component/src/utils/services/ColorGenerator';
-import type { TagVisits } from '../../shlink-web-component/src/visits/reducers/tagVisits';
-import { TagVisitsHeader } from '../../shlink-web-component/src/visits/TagVisitsHeader';
+import type { ColorGenerator } from '../../src/utils/services/ColorGenerator';
+import type { TagVisits } from '../../src/visits/reducers/tagVisits';
+import { TagVisitsHeader } from '../../src/visits/TagVisitsHeader';
 
 describe('<TagVisitsHeader />', () => {
   const tagVisits = fromPartial<TagVisits>({
diff --git a/test/visits/VisitsHeader.test.tsx b/shlink-web-component/test/visits/VisitsHeader.test.tsx
similarity index 81%
rename from test/visits/VisitsHeader.test.tsx
rename to shlink-web-component/test/visits/VisitsHeader.test.tsx
index 8bffe92a..b2131af3 100644
--- a/test/visits/VisitsHeader.test.tsx
+++ b/shlink-web-component/test/visits/VisitsHeader.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { Visit } from '../../shlink-web-component/src/visits/types';
-import { VisitsHeader } from '../../shlink-web-component/src/visits/VisitsHeader';
+import type { Visit } from '../../src/visits/types';
+import { VisitsHeader } from '../../src/visits/VisitsHeader';
 
 describe('<VisitsHeader />', () => {
   const visits: Visit[] = [fromPartial({}), fromPartial({}), fromPartial({})];
diff --git a/test/visits/VisitsStats.test.tsx b/shlink-web-component/test/visits/VisitsStats.test.tsx
similarity index 93%
rename from test/visits/VisitsStats.test.tsx
rename to shlink-web-component/test/visits/VisitsStats.test.tsx
index ed58db4e..044b856d 100644
--- a/test/visits/VisitsStats.test.tsx
+++ b/shlink-web-component/test/visits/VisitsStats.test.tsx
@@ -2,10 +2,10 @@ import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
-import type { VisitsInfo } from '../../shlink-web-component/src/visits/reducers/types';
-import type { Visit } from '../../shlink-web-component/src/visits/types';
-import { VisitsStats } from '../../shlink-web-component/src/visits/VisitsStats';
-import { rangeOf } from '../../src/utils/utils';
+import { rangeOf } from '../../src/utils/helpers';
+import type { VisitsInfo } from '../../src/visits/reducers/types';
+import type { Visit } from '../../src/visits/types';
+import { VisitsStats } from '../../src/visits/VisitsStats';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<VisitsStats />', () => {
diff --git a/test/visits/VisitsTable.test.tsx b/shlink-web-component/test/visits/VisitsTable.test.tsx
similarity index 94%
rename from test/visits/VisitsTable.test.tsx
rename to shlink-web-component/test/visits/VisitsTable.test.tsx
index e0a94321..0457b652 100644
--- a/test/visits/VisitsTable.test.tsx
+++ b/shlink-web-component/test/visits/VisitsTable.test.tsx
@@ -1,9 +1,9 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { NormalizedVisit } from '../../shlink-web-component/src/visits/types';
-import type { VisitsTableProps } from '../../shlink-web-component/src/visits/VisitsTable';
-import { VisitsTable } from '../../shlink-web-component/src/visits/VisitsTable';
-import { rangeOf } from '../../src/utils/utils';
+import { rangeOf } from '../../src/utils/helpers';
+import type { NormalizedVisit } from '../../src/visits/types';
+import type { VisitsTableProps } from '../../src/visits/VisitsTable';
+import { VisitsTable } from '../../src/visits/VisitsTable';
 import { renderWithEvents } from '../__helpers__/setUpTest';
 
 describe('<VisitsTable />', () => {
diff --git a/test/visits/charts/ChartCard.test.tsx b/shlink-web-component/test/visits/charts/ChartCard.test.tsx
similarity index 88%
rename from test/visits/charts/ChartCard.test.tsx
rename to shlink-web-component/test/visits/charts/ChartCard.test.tsx
index 15b2848d..185bd023 100644
--- a/test/visits/charts/ChartCard.test.tsx
+++ b/shlink-web-component/test/visits/charts/ChartCard.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import type { ReactNode } from 'react';
-import { ChartCard } from '../../../shlink-web-component/src/visits/charts/ChartCard';
+import { ChartCard } from '../../../src/visits/charts/ChartCard';
 
 describe('<ChartCard />', () => {
   const setUp = (title: Function | string = '', footer?: ReactNode) => render(
diff --git a/test/visits/charts/DoughnutChart.test.tsx b/shlink-web-component/test/visits/charts/DoughnutChart.test.tsx
similarity index 86%
rename from test/visits/charts/DoughnutChart.test.tsx
rename to shlink-web-component/test/visits/charts/DoughnutChart.test.tsx
index 4e72d528..2dee8163 100644
--- a/test/visits/charts/DoughnutChart.test.tsx
+++ b/shlink-web-component/test/visits/charts/DoughnutChart.test.tsx
@@ -1,5 +1,5 @@
 import { screen } from '@testing-library/react';
-import { DoughnutChart } from '../../../shlink-web-component/src/visits/charts/DoughnutChart';
+import { DoughnutChart } from '../../../src/visits/charts/DoughnutChart';
 import { setUpCanvas } from '../../__helpers__/setUpTest';
 
 describe('<DoughnutChart />', () => {
diff --git a/test/visits/charts/DoughnutChartLegend.test.tsx b/shlink-web-component/test/visits/charts/DoughnutChartLegend.test.tsx
similarity index 91%
rename from test/visits/charts/DoughnutChartLegend.test.tsx
rename to shlink-web-component/test/visits/charts/DoughnutChartLegend.test.tsx
index 5af89cc5..27cac205 100644
--- a/test/visits/charts/DoughnutChartLegend.test.tsx
+++ b/shlink-web-component/test/visits/charts/DoughnutChartLegend.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import type { Chart, ChartDataset } from 'chart.js';
-import { DoughnutChartLegend } from '../../../shlink-web-component/src/visits/charts/DoughnutChartLegend';
+import { DoughnutChartLegend } from '../../../src/visits/charts/DoughnutChartLegend';
 
 describe('<DoughnutChartLegend />', () => {
   const labels = ['foo', 'bar', 'baz', 'foo2', 'bar2'];
diff --git a/test/visits/charts/HorizontalBarChart.test.tsx b/shlink-web-component/test/visits/charts/HorizontalBarChart.test.tsx
similarity index 72%
rename from test/visits/charts/HorizontalBarChart.test.tsx
rename to shlink-web-component/test/visits/charts/HorizontalBarChart.test.tsx
index cbb683f7..1ab15177 100644
--- a/test/visits/charts/HorizontalBarChart.test.tsx
+++ b/shlink-web-component/test/visits/charts/HorizontalBarChart.test.tsx
@@ -1,5 +1,5 @@
-import type { HorizontalBarChartProps } from '../../../shlink-web-component/src/visits/charts/HorizontalBarChart';
-import { HorizontalBarChart } from '../../../shlink-web-component/src/visits/charts/HorizontalBarChart';
+import type { HorizontalBarChartProps } from '../../../src/visits/charts/HorizontalBarChart';
+import { HorizontalBarChart } from '../../../src/visits/charts/HorizontalBarChart';
 import { setUpCanvas } from '../../__helpers__/setUpTest';
 
 describe('<HorizontalBarChart />', () => {
diff --git a/test/visits/charts/LineChartCard.test.tsx b/shlink-web-component/test/visits/charts/LineChartCard.test.tsx
similarity index 93%
rename from test/visits/charts/LineChartCard.test.tsx
rename to shlink-web-component/test/visits/charts/LineChartCard.test.tsx
index acc93dc1..64f3af52 100644
--- a/test/visits/charts/LineChartCard.test.tsx
+++ b/shlink-web-component/test/visits/charts/LineChartCard.test.tsx
@@ -2,8 +2,8 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO, subDays, subMonths, subYears } from 'date-fns';
-import { LineChartCard } from '../../../shlink-web-component/src/visits/charts/LineChartCard';
-import type { NormalizedVisit } from '../../../shlink-web-component/src/visits/types';
+import { LineChartCard } from '../../../src/visits/charts/LineChartCard';
+import type { NormalizedVisit } from '../../../src/visits/types';
 import { setUpCanvas } from '../../__helpers__/setUpTest';
 
 describe('<LineChartCard />', () => {
diff --git a/test/visits/charts/SortableBarChartCard.test.tsx b/shlink-web-component/test/visits/charts/SortableBarChartCard.test.tsx
similarity index 90%
rename from test/visits/charts/SortableBarChartCard.test.tsx
rename to shlink-web-component/test/visits/charts/SortableBarChartCard.test.tsx
index 4baa309e..e4875ab7 100644
--- a/test/visits/charts/SortableBarChartCard.test.tsx
+++ b/shlink-web-component/test/visits/charts/SortableBarChartCard.test.tsx
@@ -1,9 +1,9 @@
 import { screen } from '@testing-library/react';
 import { range } from 'ramda';
 import type { ReactNode } from 'react';
-import { SortableBarChartCard } from '../../../shlink-web-component/src/visits/charts/SortableBarChartCard';
-import type { Stats } from '../../../shlink-web-component/src/visits/types';
-import { rangeOf } from '../../../src/utils/utils';
+import { rangeOf } from '../../../src/utils/helpers';
+import { SortableBarChartCard } from '../../../src/visits/charts/SortableBarChartCard';
+import type { Stats } from '../../../src/visits/types';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<SortableBarChartCard />', () => {
diff --git a/test/visits/charts/__snapshots__/DoughnutChart.test.tsx.snap b/shlink-web-component/test/visits/charts/__snapshots__/DoughnutChart.test.tsx.snap
similarity index 100%
rename from test/visits/charts/__snapshots__/DoughnutChart.test.tsx.snap
rename to shlink-web-component/test/visits/charts/__snapshots__/DoughnutChart.test.tsx.snap
diff --git a/test/visits/charts/__snapshots__/HorizontalBarChart.test.tsx.snap b/shlink-web-component/test/visits/charts/__snapshots__/HorizontalBarChart.test.tsx.snap
similarity index 100%
rename from test/visits/charts/__snapshots__/HorizontalBarChart.test.tsx.snap
rename to shlink-web-component/test/visits/charts/__snapshots__/HorizontalBarChart.test.tsx.snap
diff --git a/test/visits/charts/__snapshots__/LineChartCard.test.tsx.snap b/shlink-web-component/test/visits/charts/__snapshots__/LineChartCard.test.tsx.snap
similarity index 100%
rename from test/visits/charts/__snapshots__/LineChartCard.test.tsx.snap
rename to shlink-web-component/test/visits/charts/__snapshots__/LineChartCard.test.tsx.snap
diff --git a/test/visits/charts/__snapshots__/SortableBarChartCard.test.tsx.snap b/shlink-web-component/test/visits/charts/__snapshots__/SortableBarChartCard.test.tsx.snap
similarity index 100%
rename from test/visits/charts/__snapshots__/SortableBarChartCard.test.tsx.snap
rename to shlink-web-component/test/visits/charts/__snapshots__/SortableBarChartCard.test.tsx.snap
diff --git a/test/visits/helpers/MapModal.test.tsx b/shlink-web-component/test/visits/helpers/MapModal.test.tsx
similarity index 80%
rename from test/visits/helpers/MapModal.test.tsx
rename to shlink-web-component/test/visits/helpers/MapModal.test.tsx
index 3283afa1..cad21269 100644
--- a/test/visits/helpers/MapModal.test.tsx
+++ b/shlink-web-component/test/visits/helpers/MapModal.test.tsx
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
-import { MapModal } from '../../../shlink-web-component/src/visits/helpers/MapModal';
-import type { CityStats } from '../../../shlink-web-component/src/visits/types';
+import { MapModal } from '../../../src/visits/helpers/MapModal';
+import type { CityStats } from '../../../src/visits/types';
 
 describe('<MapModal />', () => {
   const toggle = vi.fn();
diff --git a/test/visits/helpers/OpenMapModalBtn.test.tsx b/shlink-web-component/test/visits/helpers/OpenMapModalBtn.test.tsx
similarity index 91%
rename from test/visits/helpers/OpenMapModalBtn.test.tsx
rename to shlink-web-component/test/visits/helpers/OpenMapModalBtn.test.tsx
index fe6244a8..91a69f7b 100644
--- a/test/visits/helpers/OpenMapModalBtn.test.tsx
+++ b/shlink-web-component/test/visits/helpers/OpenMapModalBtn.test.tsx
@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
-import { OpenMapModalBtn } from '../../../shlink-web-component/src/visits/helpers/OpenMapModalBtn';
-import type { CityStats } from '../../../shlink-web-component/src/visits/types';
+import { OpenMapModalBtn } from '../../../src/visits/helpers/OpenMapModalBtn';
+import type { CityStats } from '../../../src/visits/types';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<OpenMapModalBtn />', () => {
diff --git a/test/visits/helpers/VisitsFilterDropdown.test.tsx b/shlink-web-component/test/visits/helpers/VisitsFilterDropdown.test.tsx
similarity index 92%
rename from test/visits/helpers/VisitsFilterDropdown.test.tsx
rename to shlink-web-component/test/visits/helpers/VisitsFilterDropdown.test.tsx
index c0b304a8..113e0d66 100644
--- a/test/visits/helpers/VisitsFilterDropdown.test.tsx
+++ b/shlink-web-component/test/visits/helpers/VisitsFilterDropdown.test.tsx
@@ -1,6 +1,6 @@
 import { screen } from '@testing-library/react';
-import { VisitsFilterDropdown } from '../../../shlink-web-component/src/visits/helpers/VisitsFilterDropdown';
-import type { OrphanVisitType, VisitsFilter } from '../../../shlink-web-component/src/visits/types';
+import { VisitsFilterDropdown } from '../../../src/visits/helpers/VisitsFilterDropdown';
+import type { OrphanVisitType, VisitsFilter } from '../../../src/visits/types';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<VisitsFilterDropdown />', () => {
diff --git a/test/visits/helpers/__snapshots__/MapModal.test.tsx.snap b/shlink-web-component/test/visits/helpers/__snapshots__/MapModal.test.tsx.snap
similarity index 100%
rename from test/visits/helpers/__snapshots__/MapModal.test.tsx.snap
rename to shlink-web-component/test/visits/helpers/__snapshots__/MapModal.test.tsx.snap
diff --git a/test/visits/helpers/__snapshots__/OpenMapModalBtn.test.tsx.snap b/shlink-web-component/test/visits/helpers/__snapshots__/OpenMapModalBtn.test.tsx.snap
similarity index 100%
rename from test/visits/helpers/__snapshots__/OpenMapModalBtn.test.tsx.snap
rename to shlink-web-component/test/visits/helpers/__snapshots__/OpenMapModalBtn.test.tsx.snap
diff --git a/test/visits/reducers/domainVisits.test.ts b/shlink-web-component/test/visits/reducers/domainVisits.test.ts
similarity index 90%
rename from test/visits/reducers/domainVisits.test.ts
rename to shlink-web-component/test/visits/reducers/domainVisits.test.ts
index 016c574e..7b12c6e6 100644
--- a/test/visits/reducers/domainVisits.test.ts
+++ b/shlink-web-component/test/visits/reducers/domainVisits.test.ts
@@ -1,22 +1,22 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { formatIsoDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { rangeOf } from '../../../../src/utils/utils';
+import type { ShlinkVisits } from '../../../src/api/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import type {
   DomainVisits, LoadDomainVisits,
-} from '../../../shlink-web-component/src/visits/reducers/domainVisits';
+} from '../../../src/visits/reducers/domainVisits';
 import {
   DEFAULT_DOMAIN,
   domainVisitsReducerCreator,
   getDomainVisits as getDomainVisitsCreator,
-} from '../../../shlink-web-component/src/visits/reducers/domainVisits';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisits } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
-import { rangeOf } from '../../../src/utils/utils';
+} from '../../../src/visits/reducers/domainVisits';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('domainVisitsReducer', () => {
   const now = new Date();
diff --git a/test/visits/reducers/nonOrphanVisits.test.ts b/shlink-web-component/test/visits/reducers/nonOrphanVisits.test.ts
similarity index 89%
rename from test/visits/reducers/nonOrphanVisits.test.ts
rename to shlink-web-component/test/visits/reducers/nonOrphanVisits.test.ts
index 93bc5ee9..6df4a7b1 100644
--- a/test/visits/reducers/nonOrphanVisits.test.ts
+++ b/shlink-web-component/test/visits/reducers/nonOrphanVisits.test.ts
@@ -1,18 +1,18 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import { formatIsoDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { rangeOf } from '../../../../src/utils/utils';
+import type { ShlinkVisits } from '../../../src/api/types';
+import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import {
   getNonOrphanVisits as getNonOrphanVisitsCreator,
   nonOrphanVisitsReducerCreator,
-} from '../../../shlink-web-component/src/visits/reducers/nonOrphanVisits';
-import type { VisitsInfo } from '../../../shlink-web-component/src/visits/reducers/types';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisits } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
-import { rangeOf } from '../../../src/utils/utils';
+} from '../../../src/visits/reducers/nonOrphanVisits';
+import type { VisitsInfo } from '../../../src/visits/reducers/types';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('nonOrphanVisitsReducer', () => {
   const now = new Date();
diff --git a/test/visits/reducers/orphanVisits.test.ts b/shlink-web-component/test/visits/reducers/orphanVisits.test.ts
similarity index 89%
rename from test/visits/reducers/orphanVisits.test.ts
rename to shlink-web-component/test/visits/reducers/orphanVisits.test.ts
index 253e2324..7afc1e22 100644
--- a/test/visits/reducers/orphanVisits.test.ts
+++ b/shlink-web-component/test/visits/reducers/orphanVisits.test.ts
@@ -1,18 +1,18 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import { formatIsoDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { rangeOf } from '../../../../src/utils/utils';
+import type { ShlinkVisits } from '../../../src/api/types';
+import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import {
   getOrphanVisits as getOrphanVisitsCreator,
   orphanVisitsReducerCreator,
-} from '../../../shlink-web-component/src/visits/reducers/orphanVisits';
-import type { VisitsInfo } from '../../../shlink-web-component/src/visits/reducers/types';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisits } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
-import { rangeOf } from '../../../src/utils/utils';
+} from '../../../src/visits/reducers/orphanVisits';
+import type { VisitsInfo } from '../../../src/visits/reducers/types';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('orphanVisitsReducer', () => {
   const now = new Date();
diff --git a/test/visits/reducers/shortUrlVisits.test.ts b/shlink-web-component/test/visits/reducers/shortUrlVisits.test.ts
similarity index 91%
rename from test/visits/reducers/shortUrlVisits.test.ts
rename to shlink-web-component/test/visits/reducers/shortUrlVisits.test.ts
index 7f278a33..b6571c49 100644
--- a/test/visits/reducers/shortUrlVisits.test.ts
+++ b/shlink-web-component/test/visits/reducers/shortUrlVisits.test.ts
@@ -1,19 +1,19 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import { formatIsoDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { rangeOf } from '../../../../src/utils/utils';
+import type { ShlinkVisits } from '../../../src/api/types';
+import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import type {
-  ShortUrlVisits } from '../../../shlink-web-component/src/visits/reducers/shortUrlVisits';
+  ShortUrlVisits } from '../../../src/visits/reducers/shortUrlVisits';
 import {
   getShortUrlVisits as getShortUrlVisitsCreator,
   shortUrlVisitsReducerCreator,
-} from '../../../shlink-web-component/src/visits/reducers/shortUrlVisits';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisits } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
-import { rangeOf } from '../../../src/utils/utils';
+} from '../../../src/visits/reducers/shortUrlVisits';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('shortUrlVisitsReducer', () => {
   const now = new Date();
diff --git a/test/visits/reducers/tagVisits.test.ts b/shlink-web-component/test/visits/reducers/tagVisits.test.ts
similarity index 90%
rename from test/visits/reducers/tagVisits.test.ts
rename to shlink-web-component/test/visits/reducers/tagVisits.test.ts
index 85744091..2395f826 100644
--- a/test/visits/reducers/tagVisits.test.ts
+++ b/shlink-web-component/test/visits/reducers/tagVisits.test.ts
@@ -1,19 +1,19 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { addDays, formatISO, subDays } from 'date-fns';
-import { formatIsoDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import { rangeOf } from '../../../../src/utils/utils';
+import type { ShlinkVisits } from '../../../src/api/types';
+import { formatIsoDate } from '../../../src/utils/dates/helpers/date';
+import type { DateInterval } from '../../../src/utils/dates/helpers/dateIntervals';
 import type {
-  TagVisits } from '../../../shlink-web-component/src/visits/reducers/tagVisits';
+  TagVisits } from '../../../src/visits/reducers/tagVisits';
 import {
   getTagVisits as getTagVisitsCreator,
   tagVisitsReducerCreator,
-} from '../../../shlink-web-component/src/visits/reducers/tagVisits';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisits } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
-import { rangeOf } from '../../../src/utils/utils';
+} from '../../../src/visits/reducers/tagVisits';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('tagVisitsReducer', () => {
   const now = new Date();
diff --git a/test/visits/reducers/visitCreation.test.ts b/shlink-web-component/test/visits/reducers/visitCreation.test.ts
similarity index 63%
rename from test/visits/reducers/visitCreation.test.ts
rename to shlink-web-component/test/visits/reducers/visitCreation.test.ts
index 90390999..30dbf7e7 100644
--- a/test/visits/reducers/visitCreation.test.ts
+++ b/shlink-web-component/test/visits/reducers/visitCreation.test.ts
@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
-import type { Visit } from '../../../shlink-web-component/src/visits/types';
+import type { ShortUrl } from '../../../src/short-urls/data';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
+import type { Visit } from '../../../src/visits/types';
 
 describe('visitCreationReducer', () => {
   describe('createNewVisits', () => {
diff --git a/test/visits/reducers/visitsOverview.test.ts b/shlink-web-component/test/visits/reducers/visitsOverview.test.ts
similarity index 92%
rename from test/visits/reducers/visitsOverview.test.ts
rename to shlink-web-component/test/visits/reducers/visitsOverview.test.ts
index 47918a03..8ff9004e 100644
--- a/test/visits/reducers/visitsOverview.test.ts
+++ b/shlink-web-component/test/visits/reducers/visitsOverview.test.ts
@@ -1,17 +1,17 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation';
+import type { ShlinkApiClient } from '../../../../src/api/services/ShlinkApiClient';
+import type { ShlinkState } from '../../../../src/container/types';
+import type { ShlinkVisitsOverview } from '../../../src/api/types';
+import { createNewVisits } from '../../../src/visits/reducers/visitCreation';
 import type {
   PartialVisitsSummary,
   VisitsOverview,
-} from '../../../shlink-web-component/src/visits/reducers/visitsOverview';
+} from '../../../src/visits/reducers/visitsOverview';
 import {
   loadVisitsOverview as loadVisitsOverviewCreator,
   visitsOverviewReducerCreator,
-} from '../../../shlink-web-component/src/visits/reducers/visitsOverview';
-import type { OrphanVisit } from '../../../shlink-web-component/src/visits/types';
-import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
-import type { ShlinkVisitsOverview } from '../../../src/api/types';
-import type { ShlinkState } from '../../../src/container/types';
+} from '../../../src/visits/reducers/visitsOverview';
+import type { OrphanVisit } from '../../../src/visits/types';
 
 describe('visitsOverviewReducer', () => {
   const getVisitsOverview = vi.fn();
diff --git a/test/visits/services/VisitsParser.test.ts b/shlink-web-component/test/visits/services/VisitsParser.test.ts
similarity index 98%
rename from test/visits/services/VisitsParser.test.ts
rename to shlink-web-component/test/visits/services/VisitsParser.test.ts
index ece8480c..6797601f 100644
--- a/test/visits/services/VisitsParser.test.ts
+++ b/shlink-web-component/test/visits/services/VisitsParser.test.ts
@@ -1,6 +1,6 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { normalizeVisits, processStatsFromVisits } from '../../../shlink-web-component/src/visits/services/VisitsParser';
-import type { OrphanVisit, Visit, VisitsStats } from '../../../shlink-web-component/src/visits/types';
+import { normalizeVisits, processStatsFromVisits } from '../../../src/visits/services/VisitsParser';
+import type { OrphanVisit, Visit, VisitsStats } from '../../../src/visits/types';
 
 describe('VisitsParser', () => {
   const visits: Visit[] = [
diff --git a/test/visits/types/helpers.test.ts b/shlink-web-component/test/visits/types/helpers.test.ts
similarity index 90%
rename from test/visits/types/helpers.test.ts
rename to shlink-web-component/test/visits/types/helpers.test.ts
index 8f271a99..9b8d52f7 100644
--- a/test/visits/types/helpers.test.ts
+++ b/shlink-web-component/test/visits/types/helpers.test.ts
@@ -1,9 +1,9 @@
 import { fromPartial } from '@total-typescript/shoehorn';
-import { formatIsoDate, parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date';
-import type { CreateVisit, OrphanVisit, VisitsParams } from '../../../shlink-web-component/src/visits/types';
-import type { GroupedNewVisits } from '../../../shlink-web-component/src/visits/types/helpers';
-import { groupNewVisitsByType, toApiParams } from '../../../shlink-web-component/src/visits/types/helpers';
 import type { ShlinkVisitsParams } from '../../../src/api/types';
+import { formatIsoDate, parseDate } from '../../../src/utils/dates/helpers/date';
+import type { CreateVisit, OrphanVisit, VisitsParams } from '../../../src/visits/types';
+import type { GroupedNewVisits } from '../../../src/visits/types/helpers';
+import { groupNewVisitsByType, toApiParams } from '../../../src/visits/types/helpers';
 
 describe('visitsTypeHelpers', () => {
   describe('groupNewVisitsByType', () => {
diff --git a/src/common/services/ReportExporter.ts b/src/common/services/ReportExporter.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/utils/dates/DateIntervalSelector.tsx b/src/utils/dates/DateIntervalSelector.tsx
index d64dfc2f..0e20f8ef 100644
--- a/src/utils/dates/DateIntervalSelector.tsx
+++ b/src/utils/dates/DateIntervalSelector.tsx
@@ -5,7 +5,7 @@ import type { Settings } from '../../../shlink-web-component/src';
 import { rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
 import type { Defined } from '../types';
 
-type DateInterval = Defined<Settings['visits']>['defaultInterval'];
+export type DateInterval = Defined<Settings['visits']>['defaultInterval'];
 
 export interface DateIntervalSelectorProps {
   active?: DateInterval;
@@ -13,7 +13,7 @@ export interface DateIntervalSelectorProps {
   onChange: (interval: DateInterval) => void;
 }
 
-const INTERVAL_TO_STRING_MAP: Record<Exclude<DateInterval, 'all'>, string> = {
+export const INTERVAL_TO_STRING_MAP: Record<Exclude<DateInterval, 'all'>, string> = {
   today: 'Today',
   yesterday: 'Yesterday',
   last7Days: 'Last 7 days',
diff --git a/test/__helpers__/TestModalWrapper.tsx b/test/__helpers__/TestModalWrapper.tsx
index a673827b..a6690fa3 100644
--- a/test/__helpers__/TestModalWrapper.tsx
+++ b/test/__helpers__/TestModalWrapper.tsx
@@ -1,5 +1,5 @@
 import type { FC, ReactElement } from 'react';
-import { useToggle } from '../../src/utils/helpers/hooks';
+import { useToggle } from '../../shlink-frontend-kit/src';
 
 interface RenderModalArgs {
   isOpen: boolean;
diff --git a/test/__helpers__/setUpTest.ts b/test/__helpers__/setUpTest.ts
index 5d125c73..7fccbf98 100644
--- a/test/__helpers__/setUpTest.ts
+++ b/test/__helpers__/setUpTest.ts
@@ -2,18 +2,6 @@ import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import type { ReactElement } from 'react';
 
-export const setUpCanvas = (element: ReactElement) => {
-  const result = render(element);
-  const { container } = result;
-  const getEvents = () => {
-    const context = container.querySelector('canvas')?.getContext('2d');
-    // @ts-expect-error __getEvents is set by vitest-canvas-mock
-    return context?.__getEvents(); // eslint-disable-line no-underscore-dangle
-  };
-
-  return { ...result, events: getEvents(), getEvents };
-};
-
 export const renderWithEvents = (element: ReactElement) => ({
   user: userEvent.setup(),
   ...render(element),
diff --git a/test/common/services/ImageDownloader.test.ts b/test/common/services/ImageDownloader.test.ts
deleted file mode 100644
index a02b77c0..00000000
--- a/test/common/services/ImageDownloader.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { fromPartial } from '@total-typescript/shoehorn';
-import { ImageDownloader } from '../../../shlink-web-component/src/utils/services/ImageDownloader';
-import type { HttpClient } from '../../../src/common/services/HttpClient';
-import { windowMock } from '../../__mocks__/Window.mock';
-
-describe('ImageDownloader', () => {
-  const fetchBlob = vi.fn();
-  const httpClient = fromPartial<HttpClient>({ fetchBlob });
-  let imageDownloader: ImageDownloader;
-
-  beforeEach(() => {
-    (global as any).URL = { createObjectURL: () => '' };
-
-    imageDownloader = new ImageDownloader(httpClient, windowMock);
-  });
-
-  it('calls URL with response type blob', async () => {
-    fetchBlob.mockResolvedValue(new Blob());
-
-    await imageDownloader.saveImage('/foo/bar.png', 'my-image.png');
-
-    expect(fetchBlob).toHaveBeenCalledWith('/foo/bar.png');
-  });
-});
diff --git a/test/utils/dates/DateIntervalSelector.test.tsx b/test/utils/dates/DateIntervalSelector.test.tsx
index fab73edb..56c38eaf 100644
--- a/test/utils/dates/DateIntervalSelector.test.tsx
+++ b/test/utils/dates/DateIntervalSelector.test.tsx
@@ -1,7 +1,6 @@
 import { screen, waitFor } from '@testing-library/react';
-import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
-import { rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals';
-import { DateIntervalSelector } from '../../../src/utils/dates/DateIntervalSelector';
+import type { DateInterval } from '../../../src/utils/dates/DateIntervalSelector';
+import { DateIntervalSelector, INTERVAL_TO_STRING_MAP } from '../../../src/utils/dates/DateIntervalSelector';
 import { renderWithEvents } from '../../__helpers__/setUpTest';
 
 describe('<DateIntervalSelector />', () => {
@@ -20,7 +19,7 @@ describe('<DateIntervalSelector />', () => {
 
     const items = screen.getAllByRole('menuitem');
 
-    expect(btn).toHaveTextContent(rangeOrIntervalToString(activeInterval) ?? '');
+    expect(btn).toHaveTextContent(INTERVAL_TO_STRING_MAP[activeInterval] ?? '');
     expect(items).toHaveLength(8);
   });
 });