diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
index 8857ae0dd4..9e5f45992b 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -29,10 +29,11 @@ describe('EPeopleRegistryComponent', () => {
   let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  const mockEPeople = [EPersonMock, EPersonMock2];
+  let mockEPeople;
   let ePersonDataServiceStub: any;
 
   beforeEach(async(() => {
+    mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts
index 87684f52aa..42b31d61e9 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.reducers.ts
@@ -26,7 +26,6 @@ const initialState: EPeopleRegistryState = {
  * @param action  The EPeopleRegistryAction to perform on the state
  */
 export function ePeopleRegistryReducer(state = initialState, action: EPeopleRegistryAction): EPeopleRegistryState {
-
   switch (action.type) {
 
     case EPeopleRegistryActionTypes.EDIT_EPERSON: {
diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index cf236c980e..a4db98bdc1 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -38,10 +38,11 @@ describe('EPersonFormComponent', () => {
   let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  const mockEPeople = [EPersonMock, EPersonMock2];
+  let mockEPeople;
   let ePersonDataServiceStub: any;
 
   beforeEach(async(() => {
+    mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index 1831386321..cd7bc72884 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -19,7 +19,6 @@ import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson-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 { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
 import { PaginatedList } from '../data/paginated-list';
@@ -39,43 +38,15 @@ describe('EPersonDataService', () => {
   let requestService: RequestService;
   let scheduler: TestScheduler;
 
-  const epeople = [EPersonMock, EPersonMock2];
+  let epeople;
 
-  const restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
-  const epersonsEndpoint = `${restEndpointURL}/epersons`;
-  let halService: any = new HALEndpointServiceStub(restEndpointURL);
-  const epeople$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [epeople]));
-  const rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/epersons': epeople$ });
-  const objectCache = Object.assign({
-    /* tslint:disable:no-empty */
-    remove: () => {
-    },
-    hasBySelfLinkObservable: () => observableOf(false)
-    /* tslint:enable:no-empty */
-  }) as ObjectCacheService;
+  let restEndpointURL;
+  let epersonsEndpoint;
+  let halService: any;
+  let epeople$;
+  let rdbService;
 
-  TestBed.configureTestingModule({
-    imports: [
-      CommonModule,
-      StoreModule.forRoot({}),
-      TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: MockTranslateLoader
-        }
-      }),
-    ],
-    declarations: [],
-    providers: [],
-    schemas: [CUSTOM_ELEMENTS_SCHEMA]
-  });
-
-  const getRequestEntry$ = (successful: boolean) => {
-    return observableOf({
-      completed: true,
-      response: { isSuccessful: successful, payload: epeople } as any
-    } as RequestEntry)
-  };
+  let getRequestEntry$;
 
   function initTestService() {
     return new EPersonDataService(
@@ -90,7 +61,39 @@ describe('EPersonDataService', () => {
     );
   }
 
+  function init() {
+    getRequestEntry$ = (successful: boolean) => {
+      return observableOf({
+        completed: true,
+        response: { isSuccessful: successful, payload: epeople } as any
+      } as RequestEntry)
+    };
+    restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
+    epersonsEndpoint = `${restEndpointURL}/epersons`;
+    epeople = [EPersonMock, EPersonMock2];
+    epeople$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [epeople]));
+    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/epersons': epeople$ });
+    halService = new HALEndpointServiceStub(restEndpointURL);
+
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        StoreModule.forRoot({}),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          }
+        }),
+      ],
+      declarations: [],
+      providers: [],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    });
+  }
+
   beforeEach(() => {
+    init();
     requestService = getMockRequestService(getRequestEntry$(true));
     store = new Store<CoreState>(undefined, undefined, undefined);
     service = initTestService();
diff --git a/src/app/core/eperson/group-data.service.spec.ts b/src/app/core/eperson/group-data.service.spec.ts
index c1519a6029..b4a15a46d2 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -34,35 +34,44 @@ describe('GroupDataService', () => {
   let store: Store<CoreState>;
   let requestService: RequestService;
 
-  const restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
-  const groupsEndpoint = `${restEndpointURL}/groups`;
-  const groups = [GroupMock, GroupMock2];
-  const groups$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), groups));
-  const halService: any = new HALEndpointServiceStub(restEndpointURL);
-  const rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
+  let restEndpointURL;
+  let groupsEndpoint;
+  let groups;
+  let groups$;
+  let halService;
+  let rdbService;
 
-  TestBed.configureTestingModule({
-    imports: [
-      CommonModule,
-      StoreModule.forRoot({}),
-      TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: MockTranslateLoader
-        }
-      }),
-    ],
-    declarations: [],
-    providers: [],
-    schemas: [CUSTOM_ELEMENTS_SCHEMA]
-  });
+  let getRequestEntry$;
 
-  const getRequestEntry$ = (successful: boolean) => {
-    return observableOf({
-      completed: true,
-      response: { isSuccessful: successful, payload: groups } as any
-    } as RequestEntry)
-  };
+  function init() {
+    getRequestEntry$ = (successful: boolean) => {
+      return observableOf({
+        completed: true,
+        response: { isSuccessful: successful, payload: groups } as any
+      } as RequestEntry)
+    };
+    restEndpointURL = 'https://dspace.4science.it/dspace-spring-rest/api/eperson';
+    groupsEndpoint = `${restEndpointURL}/groups`;
+    groups = [GroupMock, GroupMock2];
+    groups$ = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), groups));
+    rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups': groups$ });
+    halService = new HALEndpointServiceStub(restEndpointURL);
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        StoreModule.forRoot({}),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          }
+        }),
+      ],
+      declarations: [],
+      providers: [],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    });
+  }
 
   function initTestService() {
     return new GroupDataService(
@@ -78,6 +87,7 @@ describe('GroupDataService', () => {
   };
 
   beforeEach(() => {
+    init();
     requestService = getMockRequestService(getRequestEntry$(true));
     store = new Store<CoreState>(undefined, undefined, undefined);
     service = initTestService();