diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
index f859c9f54e..5878500f1d 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.spec.ts
@@ -23,15 +23,15 @@ import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../../shared/mocks/mock-form-builder-service';
-import { MockRouter } from '../../../../shared/mocks/mock-router';
-import { getMockTranslateService } from '../../../../shared/mocks/mock-translate.service';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { GroupMock, GroupMock2 } from '../../../../shared/testing/group-mock';
-import { MockTranslateLoader } from '../../../../shared/testing/mock-translate-loader';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
 import { GroupFormComponent } from './group-form.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
@@ -90,13 +90,13 @@ describe('GroupFormComponent', () => {
     };
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
-    router = new MockRouter();
+    router = new RouterMock();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 07fab49ca5..7cefda27dc 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.spec.ts
@@ -16,17 +16,17 @@ import { EPerson } from '../../../../../core/eperson/models/eperson.model';
 import { Group } from '../../../../../core/eperson/models/group.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../../../shared/mocks/mock-form-builder-service';
-import { MockRouter } from '../../../../../shared/mocks/mock-router';
-import { getMockTranslateService } from '../../../../../shared/mocks/mock-translate.service';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson-mock';
 import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
-import { MockTranslateLoader } from '../../../../../shared/testing/mock-translate-loader';
-import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service-stub';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
 import { MembersListComponent } from './members-list.component';
+import { EPersonMock, EPersonMock2 } from '../../../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+import { RouterMock } from '../../../../../shared/mocks/router.mock';
 
 describe('MembersListComponent', () => {
   let component: MembersListComponent;
@@ -119,7 +119,7 @@ describe('MembersListComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
@@ -129,7 +129,7 @@ describe('MembersListComponent', () => {
         { provide: GroupDataService, useValue: groupsDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: FormBuilderService, useValue: builderService },
-        { provide: Router, useValue: new MockRouter() },
+        { provide: Router, useValue: new RouterMock() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
index 4bd088b513..68942289ff 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.spec.ts
@@ -14,16 +14,16 @@ import { GroupDataService } from '../../../../../core/eperson/group-data.service
 import { Group } from '../../../../../core/eperson/models/group.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../../../shared/mocks/mock-form-builder-service';
-import { MockRouter } from '../../../../../shared/mocks/mock-router';
-import { getMockTranslateService } from '../../../../../shared/mocks/mock-translate.service';
 import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { GroupMock, GroupMock2 } from '../../../../../shared/testing/group-mock';
-import { MockTranslateLoader } from '../../../../../shared/testing/mock-translate-loader';
-import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service-stub';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
 import { SubgroupsListComponent } from './subgroups-list.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { RouterMock } from '../../../../../shared/mocks/router.mock';
+import { getMockFormBuilderService } from '../../../../../shared/mocks/form-builder-service.mock';
+import { getMockTranslateService } from '../../../../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
 
 describe('SubgroupsListComponent', () => {
   let component: SubgroupsListComponent;
@@ -82,7 +82,7 @@ describe('SubgroupsListComponent', () => {
         return observableOf(new RestResponse(true, 200, 'Success'));
       }
     };
-    routerStub = new MockRouter();
+    routerStub = new RouterMock();
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
     TestBed.configureTestingModule({
@@ -90,7 +90,7 @@ describe('SubgroupsListComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
index 7dff4f9bd1..deca1b951b 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.spec.ts
@@ -15,15 +15,15 @@ import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { Group } from '../../../core/eperson/models/group.model';
 import { RouteService } from '../../../core/services/route.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { MockRouter } from '../../../shared/mocks/mock-router';
-import { MockTranslateLoader } from '../../../shared/mocks/mock-translate-loader';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson-mock';
 import { GroupMock, GroupMock2 } from '../../../shared/testing/group-mock';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
-import { routeServiceStub } from '../../../shared/testing/route-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { GroupsRegistryComponent } from './groups-registry.component';
+import { EPersonMock, EPersonMock2 } from '../../../shared/testing/eperson.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterMock } from '../../../shared/mocks/router.mock';
 
 describe('GroupRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -82,7 +82,7 @@ describe('GroupRegistryComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
@@ -92,7 +92,7 @@ describe('GroupRegistryComponent', () => {
         { provide: GroupDataService, useValue: groupsDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: RouteService, useValue: routeServiceStub },
-        { provide: Router, useValue: new MockRouter() },
+        { provide: Router, useValue: new RouterMock() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
index c8ab102d30..6f606b6801 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.ts
@@ -47,7 +47,7 @@ export class GroupsRegistryComponent implements OnInit {
   // Current search in groups registry
   currentSearchQuery: string;
 
-  constructor(private groupService: GroupDataService,
+  constructor(public groupService: GroupDataService,
               private ePersonDataService: EPersonDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
diff --git a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
index 15a13884f3..b86a9e88cb 100644
--- a/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
+++ b/src/app/+item-page/bitstreams/upload/upload-bitstream.component.spec.ts
@@ -9,21 +9,18 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { UploadBitstreamComponent } from './upload-bitstream.component';
 import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../shared/testing/auth-service-stub';
 import { Item } from '../../../core/shared/item.model';
 import { of as observableOf } from 'rxjs';
-import {
-  createPaginatedList,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../../shared/testing/utils';
-import { RouterStub } from '../../../shared/testing/router-stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { RequestService } from '../../../core/data/request.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
 
 describe('UploadBistreamComponent', () => {
   let comp: UploadBitstreamComponent;
diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 75377d45b3..b432a05b16 100644
--- a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -27,12 +27,12 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
   updates$: Observable<FieldUpdates>;
 
   constructor(
-    protected itemService: ItemDataService,
-    protected objectUpdatesService: ObjectUpdatesService,
-    protected router: Router,
-    protected notificationsService: NotificationsService,
-    protected translateService: TranslateService,
-    protected route: ActivatedRoute
+    public itemService: ItemDataService,
+    public objectUpdatesService: ObjectUpdatesService,
+    public router: Router,
+    public notificationsService: NotificationsService,
+    public translateService: TranslateService,
+    public route: ActivatedRoute
   ) {
     super(objectUpdatesService, notificationsService, translateService)
   }
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
index d02aafcfa1..d9242f1787 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
@@ -46,7 +46,6 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version
     EditItemPageComponent,
     ItemOperationComponent,
     AbstractSimpleItemActionComponent,
-    AbstractItemUpdateComponent,
     ModifyItemOverviewComponent,
     ItemWithdrawComponent,
     ItemReinstateComponent,
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 9184889257..cc1ec39bad 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -11,14 +11,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { GLOBAL_CONFIG } from '../../../../config';
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
-import { RouterStub } from '../../../shared/testing/router-stub';
 import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { getMockRequestService } from '../../../shared/mocks/mock-request.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
@@ -27,6 +24,8 @@ import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { RestResponse } from '../../../core/cache/response.models';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -158,7 +157,6 @@ describe('ItemBitstreamsComponent', () => {
         { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: route },
         { provide: NotificationsService, useValue: notificationsService },
-        { provide: GLOBAL_CONFIG, useValue: { item: { edit: { undoTimeout: 10 } } } as any },
         { provide: BitstreamDataService, useValue: bitstreamService },
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index bdb1ec23a5..009cc978b2 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -8,7 +8,6 @@ import { ObjectUpdatesService } from '../../../core/data/object-updates/object-u
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { zip as observableZip, combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
@@ -86,7 +85,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public router: Router,
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
-    @Inject(GLOBAL_CONFIG) public EnvConfig: GlobalConfig,
     public route: ActivatedRoute,
     public bitstreamService: BitstreamDataService,
     public objectCache: ObjectCacheService,
@@ -94,7 +92,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService
   ) {
-    super(itemService, objectUpdatesService, router, notificationsService, translateService, EnvConfig, route);
+    super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
 
   /**
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
index 704fa0122e..03d1d00520 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
@@ -10,11 +10,12 @@ import { BundleDataService } from '../../../../../core/data/bundle-data.service'
 import { createMockRDObs } from '../../item-bitstreams.component.spec';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
-import { createPaginatedList, createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { take } from 'rxjs/operators';
 import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../../shared/testing/utils.test';
 
 describe('PaginatedDragAndDropBitstreamListComponent', () => {
   let comp: PaginatedDragAndDropBitstreamListComponent;
diff --git a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
index 6112f44a27..77e772b0b6 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
@@ -1,14 +1,11 @@
-import { Component, Inject } from '@angular/core';
-import { LinkService } from '../../../core/cache/builders/link.service';
+import { Component } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { cloneDeep } from 'lodash';
 import { Observable } from 'rxjs';
-import {
-  Identifiable
-} from '../../../core/data/object-updates/object-updates.reducer';
+import { Identifiable } from '../../../core/data/object-updates/object-updates.reducer';
 import { first, map, switchMap, take, tap } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../../../core/shared/operators';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -36,13 +33,13 @@ export class ItemMetadataComponent extends AbstractItemUpdateComponent {
   metadataFields$: Observable<string[]>;
 
   constructor(
-    protected itemService: ItemDataService,
-    protected objectUpdatesService: ObjectUpdatesService,
-    protected router: Router,
-    protected notificationsService: NotificationsService,
-    protected translateService: TranslateService,
-    protected route: ActivatedRoute,
-    protected metadataFieldService: RegistryService,
+    public itemService: ItemDataService,
+    public objectUpdatesService: ObjectUpdatesService,
+    public router: Router,
+    public notificationsService: NotificationsService,
+    public translateService: TranslateService,
+    public route: ActivatedRoute,
+    public metadataFieldService: RegistryService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 69adbf4c73..2634b4e262 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -48,17 +48,17 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
   entityType$: Observable<ItemType>;
 
   constructor(
-    protected itemService: ItemDataService,
-    protected objectUpdatesService: ObjectUpdatesService,
-    protected router: Router,
-    protected notificationsService: NotificationsService,
-    protected translateService: TranslateService,
-    protected route: ActivatedRoute,
-    protected relationshipService: RelationshipService,
-    protected objectCache: ObjectCacheService,
-    protected requestService: RequestService,
-    protected entityTypeService: EntityTypeService,
-    protected cdr: ChangeDetectorRef,
+    public itemService: ItemDataService,
+    public objectUpdatesService: ObjectUpdatesService,
+    public router: Router,
+    public notificationsService: NotificationsService,
+    public translateService: TranslateService,
+    public route: ActivatedRoute,
+    public relationshipService: RelationshipService,
+    public objectCache: ObjectCacheService,
+    public requestService: RequestService,
+    public entityTypeService: EntityTypeService,
+    public cdr: ChangeDetectorRef,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index fca0f6b650..b328141d7b 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -2,14 +2,14 @@ import { BitstreamDataService } from './bitstream-data.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RequestService } from './request.service';
 import { Bitstream } from '../shared/bitstream.model';
-import { getMockRequestService } from '../../shared/mocks/mock-request.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { BitstreamFormatDataService } from './bitstream-format-data.service';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../shared/bitstream-format-support-level';
 import { PutRequest } from './request.models';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index 138cf547f2..28d10cfcf1 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -10,13 +10,7 @@ import {
   GroupRegistryCancelGroupAction,
   GroupRegistryEditGroupAction
 } from '../../+admin/admin-access-control/group-registry/group-registry.actions';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/mock-remote-data-build.service';
-import { getMockRequestService } from '../../shared/mocks/mock-request.service';
-import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson-mock';
 import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
 import { SearchParam } from '../cache/models/search-param.model';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
@@ -28,6 +22,12 @@ import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { Item } from '../shared/item.model';
 import { PageInfo } from '../shared/page-info.model';
 import { GroupDataService } from './group-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
 
 describe('GroupDataService', () => {
   let service: GroupDataService;
@@ -63,7 +63,7 @@ describe('GroupDataService', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         }),
       ],
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index 3c134831d9..35e7c4602f 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -15,7 +15,6 @@ import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.se
 import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../testing/utils';
 import { getMockSearchService } from '../../mocks/search-service.mock';
 import { getMockRequestService } from '../../mocks/request.service.mock';
 import { RequestService } from '../../../core/data/request.service';
@@ -23,6 +22,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
 import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { VarDirective } from '../../utils/var.directive';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
index 912671bd4b..705563941e 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
@@ -4,9 +4,9 @@ import { By } from '@angular/platform-browser';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task-actions-edit-metadata.component';
-import { MockTranslateLoader } from '../../../mocks/mock-translate-loader';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { TranslateLoaderMock } from '../../../testing/translate-loader.mock';
 
 let component: ClaimedTaskActionsEditMetadataComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsEditMetadataComponent>;
@@ -20,7 +20,7 @@ describe('ClaimedTaskActionsEditMetadataComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: MockTranslateLoader
+            useClass: TranslateLoaderMock
           }
         })
       ],
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 7c7b83cd8a..0cb2871bf5 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -21,7 +21,7 @@
     <div class="alert alert-info" role="alert">
       {{'submission.workflow.tasks.claimed.reject.reason.info' | translate}}
     </div>
-    <form (ngSubmit)="submitTask(rejectModal);" [formGroup]="rejectForm" >
+    <form (ngSubmit)="submitTask();" [formGroup]="rejectForm" >
       <textarea style="width: 100%"
                 formControlName="reason"
                 rows="4"
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
index b71adc7a25..036b08634a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
@@ -1,13 +1,13 @@
 import { ClaimedTaskActionsLoaderComponent } from './claimed-task-actions-loader.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, Component, ComponentFactoryResolver, NO_ERRORS_SCHEMA } from '@angular/core';
-import { spyOnExported } from '../../../testing/utils';
+import { ChangeDetectionStrategy, ComponentFactoryResolver, NO_ERRORS_SCHEMA } from '@angular/core';
 import * as decorators from './claimed-task-actions-decorator';
 import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { spyOnExported } from '../../../testing/utils.test';
 
 describe('ClaimedTaskActionsLoaderComponent', () => {
   let comp: ClaimedTaskActionsLoaderComponent;
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
index 84f3381880..9fcfd21586 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
@@ -6,11 +6,12 @@ import { Observable } from 'rxjs/internal/Observable';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { RemoteData } from '../../core/data/remote-data';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { createPaginatedList, createSuccessfulRemoteDataObject } from '../testing/utils';
 import { FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { PaginationComponent } from '../pagination/pagination.component';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { createPaginatedList } from '../testing/utils.test';
 
 class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
 
diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts
index 00068a5eea..04395ae8fa 100644
--- a/src/app/shared/testing/group-mock.ts
+++ b/src/app/shared/testing/group-mock.ts
@@ -1,5 +1,5 @@
 import { Group } from '../../core/eperson/models/group.model';
-import { EPersonMock } from './eperson-mock';
+import { EPersonMock } from './eperson.mock';
 
 export const GroupMock2: Group = Object.assign(new Group(), {
     handle: null,
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 6a0bc37b5d..566e6dec49 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -16,6 +16,11 @@ export const environment: Partial<GlobalConfig> = {
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/angular-dspace',
   },
+  item: {
+    edit: {
+      undoTimeout: 10
+    }
+  },
   submission: {
     autosave: {
       // NOTE: which metadata trigger an autosave