diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
index b05d8a1c3a..9839507d57 100644
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
+++ b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
@@ -2,73 +2,95 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { DsoPageVersionButtonComponent } from './dso-page-version-button.component';
 import { Item } from '../../../core/shared/item.model';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
+import { Observable, of, of as observableOf } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterTestingModule } from '@angular/router/testing';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
 
 describe('DsoPageVersionButtonComponent', () => {
   let component: DsoPageVersionButtonComponent;
   let fixture: ComponentFixture<DsoPageVersionButtonComponent>;
 
   let authorizationService: AuthorizationDataService;
+  let versionHistoryService: VersionHistoryDataService;
+
   let dso: Item;
+  let tooltipMsg: Observable<string>;
+
+  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+
+  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
+    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', 'hasDraftVersion$']
+  );
 
   beforeEach(waitForAsync(() => {
     dso = Object.assign(new Item(), {
       id: 'test-item',
       _links: {
-        self: { href: 'test-item-selflink' }
-      }
-    });
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+        self: { href: 'test-item-selflink' },
+        version: { href: 'test-item-version-selflink' },
+      },
     });
+    tooltipMsg = of('tooltip-msg');
+
     TestBed.configureTestingModule({
       declarations: [DsoPageVersionButtonComponent],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
       providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService }
+        { provide: AuthorizationDataService, useValue: authorizationServiceSpy },
+        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
       ]
     }).compileComponents();
+
+    authorizationService = TestBed.inject(AuthorizationDataService);
+    versionHistoryService = TestBed.inject(VersionHistoryDataService);
+
+    versionHistoryServiceSpy.hasDraftVersion$.and.returnValue(observableOf(true));
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DsoPageVersionButtonComponent);
     component = fixture.componentInstance;
     component.dso = dso;
+    component.tooltipMsg$ = tooltipMsg;
     fixture.detectChanges();
   });
 
   it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self);
+    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanCreateVersion, dso.self);
+  });
+
+  it('should check if the item has a draft version', () => {
+    expect(versionHistoryServiceSpy.hasDraftVersion$).toHaveBeenCalledWith(dso._links.version.href);
   });
 
   describe('when the user is authorized', () => {
     beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
+      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(true));
       component.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).not.toBeNull();
+    it('should render a button', () => {
+      const button = fixture.debugElement.query(By.css('button'));
+      expect(button).not.toBeNull();
     });
   });
 
   describe('when the user is not authorized', () => {
     beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(false));
       component.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should not render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).toBeNull();
+    it('should render a button', () => {
+      const button = fixture.debugElement.query(By.css('button'));
+      expect(button).toBeNull();
     });
   });
+
 });
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
index 77e6b6b775..2849ba4909 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
+++ b/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
@@ -52,20 +52,12 @@ describe('ItemVersionsNoticeComponent', () => {
   firstVersion.item = createSuccessfulRemoteDataObject$(firstItem);
   latestVersion.item = createSuccessfulRemoteDataObject$(latestItem);
 
-  // versionHistoryService.getLatestVersionFromHistory$.createSpy('getLatestVersionFromHistory$').and.callFake((id) => {
-  //   return of(latestVersion);
-  // });
-  // versionHistoryService.isLatest$.createSpy('isLatest$').and.callFake((id) => {
-  //   return of(true);
-  // });
-
+  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
+    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ]
+  );
 
   beforeEach(waitForAsync(() => {
 
-    const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
-      ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ]
-    );
-
     TestBed.configureTestingModule({
       declarations: [ItemVersionsNoticeComponent],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],