diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts
index 67863cad74..a7cdd9e786 100644
--- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts
+++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-rest.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
@@ -24,7 +25,6 @@ import { NoContent } from '../../../shared/NoContent.model';
 import {CoreState} from '../../../core-state.model';
 import {FindListOptions} from '../../../data/find-list-options.model';
 
-/* tslint:disable:max-classes-per-file */
 
 /**
  * A private DataService implementation to delegate specific methods to.
diff --git a/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
index f070e7303a..0bf7942f75 100644
--- a/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
+++ b/src/app/core/suggestion-notifications/qa/models/quality-assurance-event.model.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Observable } from 'rxjs';
 import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
 import { QUALITY_ASSURANCE_EVENT_OBJECT } from './quality-assurance-event-object.resource-type';
diff --git a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts
index 10bcfbe896..6b5ca806ff 100644
--- a/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts
+++ b/src/app/core/suggestion-notifications/qa/source/quality-assurance-source-rest.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
@@ -22,8 +23,6 @@ import { PaginatedList } from '../../../data/paginated-list.model';
 import {CoreState} from '../../../core-state.model';
 import {FindListOptions} from '../../../data/find-list-options.model';
 
-/* tslint:disable:max-classes-per-file */
-
 /**
  * A private DataService implementation to delegate specific methods to.
  */
diff --git a/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts b/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts
index da9d95d290..a2f2498fca 100644
--- a/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts
+++ b/src/app/core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
@@ -22,8 +23,6 @@ import { PaginatedList } from '../../../data/paginated-list.model';
 import {CoreState} from '../../../core-state.model';
 import {FindListOptions} from '../../../data/find-list-options.model';
 
-/* tslint:disable:max-classes-per-file */
-
 /**
  * A private DataService implementation to delegate specific methods to.
  */
diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts
index b423be3f58..ef6d99e9ea 100644
--- a/src/app/shared/mocks/notifications.mock.ts
+++ b/src/app/shared/mocks/notifications.mock.ts
@@ -5,7 +5,6 @@ import { QualityAssuranceEventObject } from '../../core/suggestion-notifications
 import { QualityAssuranceTopicRestService } from '../../core/suggestion-notifications/qa/topics/quality-assurance-topic-rest.service';
 import { QualityAssuranceEventRestService } from '../../core/suggestion-notifications/qa/events/quality-assurance-event-rest.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { NotificationsStateService } from '../../notifications/notifications-state.service';
 import { Item } from '../../core/shared/item.model';
 import {
   createNoContentRemoteDataObject$,
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
index 4dcecf7b27..06db9dda06 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
 import { QualityAssuranceSourceObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-source.model';
@@ -16,8 +17,6 @@ export const QualityAssuranceSourceActionTypes = {
   RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/suggestion-notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
 };
 
-/* tslint:disable:max-classes-per-file */
-
 /**
  * An ngrx action to retrieve all the Quality Assurance source.
  */
diff --git a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
index 512530f8de..2f588125b2 100644
--- a/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/suggestion-notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -11,7 +11,7 @@ import {
   qualityAssuranceSourceObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
-import { SuggestionNotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
index 991a40ada1..2459d4352a 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
 import { QualityAssuranceTopicObject } from '../../../core/suggestion-notifications/qa/models/quality-assurance-topic.model';
@@ -16,8 +17,6 @@ export const QualityAssuranceTopicActionTypes = {
   RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/suggestion-notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
 };
 
-/* tslint:disable:max-classes-per-file */
-
 /**
  * An ngrx action to retrieve all the Quality Assurance topics.
  */
diff --git a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
index 01e1cc2fc8..6e933a0e80 100644
--- a/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/suggestion-notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
 import { CommonModule } from '@angular/common';
 import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -11,7 +12,7 @@ import {
   qualityAssuranceTopicObjectMorePid
 } from '../../../shared/mocks/notifications.mock';
 import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
-import { SuggestionNotificationsStateService } from '../../notifications-state.service';
+import { SuggestionNotificationsStateService } from '../../suggestion-notifications-state.service';
 import { cold } from 'jasmine-marbles';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { PaginationService } from '../../../core/pagination/pagination.service';