diff --git a/src/app/core/config/models/config-object-factory.ts b/src/app/core/config/models/config-object-factory.ts
index 5dbba7a11f..44b2e377c4 100644
--- a/src/app/core/config/models/config-object-factory.ts
+++ b/src/app/core/config/models/config-object-factory.ts
@@ -6,6 +6,9 @@ import { NormalizedSubmissionFormsModel } from './normalized-config-submission-f
 import { NormalizedSubmissionSectionModel } from './normalized-config-submission-section.model';
 import { NormalizedSubmissionUploadsModel } from './normalized-config-submission-uploads.model';
 
+/**
+ * Class to return normalized models for config objects
+ */
 export class ConfigObjectFactory {
   public static getConstructor(type): GenericConstructor<ConfigObject> {
     switch (type) {
diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts
index a3a55c26bf..6e173b4139 100644
--- a/src/app/pagenotfound/pagenotfound.component.ts
+++ b/src/app/pagenotfound/pagenotfound.component.ts
@@ -2,6 +2,9 @@ import { ServerResponseService } from '../shared/services/server-response.servic
 import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { AuthService } from '../core/auth/auth.service';
 
+/**
+ * This component representing the `PageNotFound` DSpace page.
+ */
 @Component({
   selector: 'ds-pagenotfound',
   styleUrls: ['./pagenotfound.component.scss'],
@@ -9,10 +12,20 @@ import { AuthService } from '../core/auth/auth.service';
   changeDetection: ChangeDetectionStrategy.Default
 })
 export class PageNotFoundComponent implements OnInit {
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {AuthService} authservice
+   * @param {ServerResponseService} responseService
+   */
   constructor(private authservice: AuthService, private responseService: ServerResponseService) {
     this.responseService.setNotFound();
   }
 
+  /**
+   * Remove redirect url from the state
+   */
   ngOnInit(): void {
     this.authservice.clearRedirectUrl();
   }
diff --git a/src/app/shared/mocks/mock-form-operations-service.ts b/src/app/shared/mocks/mock-form-operations-service.ts
index ce8ca6d4e5..6fb6127087 100644
--- a/src/app/shared/mocks/mock-form-operations-service.ts
+++ b/src/app/shared/mocks/mock-form-operations-service.ts
@@ -1,5 +1,8 @@
 import { SectionFormOperationsService } from '../../submission/sections/form/section-form-operations.service';
 
+/**
+ * Mock for [[FormOperationsService]]
+ */
 export function getMockFormOperationsService(): SectionFormOperationsService {
   return jasmine.createSpyObj('SectionFormOperationsService', {
     dispatchOperationsFromEvent: jasmine.createSpy('dispatchOperationsFromEvent'),
diff --git a/src/app/shared/mocks/mock-form-service.ts b/src/app/shared/mocks/mock-form-service.ts
index bae76eb69f..d0510f3a68 100644
--- a/src/app/shared/mocks/mock-form-service.ts
+++ b/src/app/shared/mocks/mock-form-service.ts
@@ -2,6 +2,9 @@ import { of as observableOf } from 'rxjs';
 
 import { FormService } from '../form/form.service';
 
+/**
+ * Mock for [[FormService]]
+ */
 export function getMockFormService(
   id$: string = 'random_id'
 ): FormService {
diff --git a/src/app/shared/mocks/mock-router.ts b/src/app/shared/mocks/mock-router.ts
index 9ebe321cf6..929e2644e8 100644
--- a/src/app/shared/mocks/mock-router.ts
+++ b/src/app/shared/mocks/mock-router.ts
@@ -1,5 +1,8 @@
-import { Observable, of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 
+/**
+ * Mock for [[RouterService]]
+ */
 export class MockRouter {
   public events = observableOf({});
   public routerState = {
diff --git a/src/app/shared/mocks/mock-scroll-to-service.ts b/src/app/shared/mocks/mock-scroll-to-service.ts
index 9c600e405e..03b68e55d2 100644
--- a/src/app/shared/mocks/mock-scroll-to-service.ts
+++ b/src/app/shared/mocks/mock-scroll-to-service.ts
@@ -1,5 +1,8 @@
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
 
+/**
+ * Mock for [[ScrollToService]]
+ */
 export function getMockScrollToService(): ScrollToService {
   return jasmine.createSpyObj('scrollToService', {
     scrollTo: jasmine.createSpy('scrollTo')
diff --git a/src/app/shared/mocks/mock-section-upload.service.ts b/src/app/shared/mocks/mock-section-upload.service.ts
index 6b27c11ac5..9098fa64c0 100644
--- a/src/app/shared/mocks/mock-section-upload.service.ts
+++ b/src/app/shared/mocks/mock-section-upload.service.ts
@@ -1,5 +1,8 @@
 import { SubmissionFormsConfigService } from '../../core/config/submission-forms-config.service';
 
+/**
+ * Mock for [[SubmissionFormsConfigService]]
+ */
 export function getMockSectionUploadService(): SubmissionFormsConfigService {
   return jasmine.createSpyObj('SectionUploadService', {
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),