diff --git a/src/views/AllCalendarView.tsx b/src/views/AllCalendarView.tsx
index f5124b5..b545465 100644
--- a/src/views/AllCalendarView.tsx
+++ b/src/views/AllCalendarView.tsx
@@ -5,8 +5,7 @@ import {
   MenuSection,
   Pane
 } from '@folio/stripes/components';
-import { IfPermission, useStripes } from '@folio/stripes/core';
-import { TitleManager } from '@folio/stripes/core/index.js';
+import { IfPermission, useStripes, TitleManager } from '@folio/stripes/core';
 import React, { FunctionComponent, ReactNode, useRef, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import {
diff --git a/src/views/CalendarSettings.test.tsx b/src/views/CalendarSettings.test.tsx
index 494b505..fb97b63 100644
--- a/src/views/CalendarSettings.test.tsx
+++ b/src/views/CalendarSettings.test.tsx
@@ -2,10 +2,13 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { SettingsProps } from '@folio/stripes/smart-components';
 import CalendarSettings from './CalendarSettings';
+import withIntlConfiguration from '../test/util/withIntlConfiguration';
 
 jest.mock('@folio/stripes-smart-components/lib/Settings', () => jest.fn().mockReturnValue('Settings'));
 
-const renderCalendarSettings = () => render(<CalendarSettings {...({} as unknown as SettingsProps)} />);
+const renderCalendarSettings = () => render(withIntlConfiguration(
+  <CalendarSettings {...({} as unknown as SettingsProps)} />
+));
 
 describe('Calender Settings', () => {
   it('should render Calendar Settings', () => {
diff --git a/src/views/CalendarSettings.tsx b/src/views/CalendarSettings.tsx
index dde8ab7..5beb52e 100644
--- a/src/views/CalendarSettings.tsx
+++ b/src/views/CalendarSettings.tsx
@@ -1,8 +1,7 @@
 import { ErrorBoundary } from '@folio/stripes/components';
 import { Settings, SettingsProps } from '@folio/stripes/smart-components';
 import React, { FunctionComponent } from 'react';
-import { FormattedMessage, useIntl } from 'react-intl';
-import { TitleManager } from '@folio/stripes/core/index.js';
+import { FormattedMessage, useIntl, TitleManager } from 'react-intl';
 import AllCalendarView from './AllCalendarView';
 import CurrentAssignmentView from './CurrentAssignmentView';
 import MonthlyCalendarPickerView from './MonthlyCalendarPickerView';
diff --git a/src/views/CreateEditCalendarLayer.tsx b/src/views/CreateEditCalendarLayer.tsx
index 828f626..ddd47e8 100644
--- a/src/views/CreateEditCalendarLayer.tsx
+++ b/src/views/CreateEditCalendarLayer.tsx
@@ -7,7 +7,7 @@ import {
   PaneFooter,
   Paneset,
 } from '@folio/stripes/components';
-import { TitleManager } from '@folio/stripes/core/index.js';
+import { TitleManager } from '@folio/stripes/core';
 import React, { FunctionComponent, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import DataRepository from '../data/DataRepository';
diff --git a/src/views/CurrentAssignmentView.tsx b/src/views/CurrentAssignmentView.tsx
index 81f0cb8..0046c2d 100644
--- a/src/views/CurrentAssignmentView.tsx
+++ b/src/views/CurrentAssignmentView.tsx
@@ -1,6 +1,5 @@
 import { Button, LoadingPane, Pane, PaneMenu } from '@folio/stripes/components';
-import { IfPermission } from '@folio/stripes/core';
-import { TitleManager } from '@folio/stripes/core/index.js';
+import { IfPermission, TitleManager } from '@folio/stripes/core';
 import React, { FunctionComponent, ReactNode, useRef } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import {
diff --git a/src/views/MonthlyCalendarPickerView.tsx b/src/views/MonthlyCalendarPickerView.tsx
index c36269b..94bdebf 100644
--- a/src/views/MonthlyCalendarPickerView.tsx
+++ b/src/views/MonthlyCalendarPickerView.tsx
@@ -7,7 +7,7 @@ import {
   NavListSection,
   Pane
 } from '@folio/stripes/components';
-import { TitleManager } from '@folio/stripes/core/index.js';
+import { TitleManager } from '@folio/stripes/core';
 import classNames from 'classnames';
 import React, {
   FunctionComponent,