diff --git a/src/app/core/data/version-history-data.service.spec.ts b/src/app/core/data/version-history-data.service.spec.ts
index 6ffefa1c07..6728df71f1 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -26,7 +26,7 @@ describe('VersionHistoryDataService', () => {
     let result;
 
     beforeEach(() => {
-      result = service.getVersions(1);
+      result = service.getVersions('1');
     });
 
     it('should configure a GET request', () => {
@@ -49,6 +49,6 @@ describe('VersionHistoryDataService', () => {
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
 
-    service = new VersionHistoryDataService(requestService, rdbService, null, null, objectCache, halService, notificationsService, null, null);
+    service = new VersionHistoryDataService(requestService, rdbService, null, objectCache, halService, notificationsService, null, null);
   }
 });
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
index 37cbe47c72..4f899edaa8 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
@@ -27,12 +27,12 @@ describe('OrgUnitItemMetadataListElementComponent', () => {
     }).compileComponents();
   }));
 
-  beforeEach(async(() => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(OrgUnitItemMetadataListElementComponent);
     comp = fixture.componentInstance;
     comp.metadataRepresentation = mockItemMetadataRepresentation;
     fixture.detectChanges();
-  }));
+  });
 
   it('should show the name of the organisation as a link', () => {
     const linkText = fixture.debugElement.query(By.css('a')).nativeElement.textContent;
diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/shared/item/item-versions/item-versions.component.spec.ts
index 4e1cc80215..18fa4cf983 100644
--- a/src/app/shared/item/item-versions/item-versions.component.spec.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.spec.ts
@@ -16,17 +16,17 @@ describe('ItemVersionsComponent', () => {
   let fixture: ComponentFixture<ItemVersionsComponent>;
 
   const versionHistory = Object.assign(new VersionHistory(), {
-    id: 1
+    id: '1'
   });
   const version1 = Object.assign(new Version(), {
-    id: 1,
+    id: '1',
     version: 1,
     created: new Date(2020, 1, 1),
     summary: 'first version',
     versionhistory: createSuccessfulRemoteDataObject$(versionHistory)
   });
   const version2 = Object.assign(new Version(), {
-    id: 2,
+    id: '2',
     version: 2,
     summary: 'second version',
     created: new Date(2020, 1, 2),
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts
index 6623c32e4b..b45857af2f 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.ts
@@ -13,7 +13,6 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
 import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { AlertType } from '../../alert/aletr-type';
-import { hasValueOperator } from '../../empty.util';
 import { followLink } from '../../utils/follow-link-config.model';
 
 @Component({
@@ -104,7 +103,7 @@ export class ItemVersionsComponent implements OnInit {
       switchMap(([versionHistory, page]: [VersionHistory, number]) =>
         this.versionHistoryService.getVersions(versionHistory.id,
           new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })}),
-          followLink('item')))
+          followLink('item'), followLink('eperson')))
     );
     this.hasEpersons$ = this.versionsRD$.pipe(
       getAllSucceededRemoteData(),