diff --git a/lib/core/services/upload.service.spec.ts b/lib/core/services/upload.service.spec.ts
index e443d65205..db517cd02c 100644
--- a/lib/core/services/upload.service.spec.ts
+++ b/lib/core/services/upload.service.spec.ts
@@ -16,13 +16,12 @@
  */
 
 import { EventEmitter } from '@angular/core';
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { FileModel, FileUploadOptions, FileUploadStatus } from '../models/file.model';
 import { AppConfigModule } from '../app-config/app-config.module';
 import { UploadService } from './upload.service';
 import { AppConfigService } from '../app-config/app-config.service';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { StorageService } from './storage.service';
 
 import { setupTestBed } from '../testing/setupTestBed';
 import { CoreTestingModule } from '../testing/core.testing.module';
@@ -31,6 +30,7 @@ declare let jasmine: any;
 
 describe('UploadService', () => {
     let service: UploadService;
+    let alfrescoApiService: AlfrescoApiService;
 
     setupTestBed({
         imports: [CoreTestingModule, AppConfigModule]
@@ -46,6 +46,7 @@ describe('UploadService', () => {
         };
 
         service = TestBed.get(UploadService);
+        alfrescoApiService = TestBed.get(AlfrescoApiService);
         service.queue = [];
         service.activeTask = null;
         jasmine.Ajax.install();
@@ -157,7 +158,7 @@ describe('UploadService', () => {
     });
 
     it('If newVersion is set, name should be a param', () => {
-        let uploadFileSpy = spyOn(service.apiService.getInstance().upload, 'uploadFile').and.callThrough();
+        let uploadFileSpy = spyOn(alfrescoApiService.getInstance().upload, 'uploadFile').and.callThrough();
 
         let emitter = new EventEmitter();
 
diff --git a/lib/core/services/upload.service.ts b/lib/core/services/upload.service.ts
index e3ba6fe6a9..1be7fa6d71 100644
--- a/lib/core/services/upload.service.ts
+++ b/lib/core/services/upload.service.ts
@@ -33,14 +33,15 @@ let minimatch: any = (<any> minimatch_).default || minimatch_;
 @Injectable()
 export class UploadService {
 
-    private queue: FileModel[] = [];
     private cache: { [key: string]: any } = {};
     private totalComplete: number = 0;
     private totalAborted: number = 0;
     private totalError: number = 0;
-    private activeTask: Promise<any> = null;
     private excludedFileList: String[] = [];
 
+    activeTask: Promise<any> = null;
+    queue: FileModel[] = [];
+
     queueChanged: Subject<FileModel[]> = new Subject<FileModel[]>();
     fileUpload: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
     fileUploadStarting: Subject<FileUploadEvent> = new Subject<FileUploadEvent>();
diff --git a/lib/core/settings/host-settings.component.spec.ts b/lib/core/settings/host-settings.component.spec.ts
index 226007fc31..e634a2ea8f 100644
--- a/lib/core/settings/host-settings.component.spec.ts
+++ b/lib/core/settings/host-settings.component.spec.ts
@@ -216,7 +216,6 @@ describe('HostSettingsComponent', () => {
 
     describe('OAUTH ', () => {
 
-        let ecmUrlInput;
         let bpmUrlInput;
         let oauthHostUrlInput;
         let clientIdInput;
diff --git a/lib/core/settings/host-settings.component.ts b/lib/core/settings/host-settings.component.ts
index 38ddf894d6..6d338d2c7f 100644
--- a/lib/core/settings/host-settings.component.ts
+++ b/lib/core/settings/host-settings.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, EventEmitter, Output, ViewEncapsulation, OnInit } from '@angular/core';
 import { Validators, FormGroup, FormBuilder, AbstractControl } from '@angular/forms';
-import { UserPreferencesService } from '../services';
+import { UserPreferencesService } from '../services/user-preferences.service';
 
 @Component({
     selector: 'adf-host-settings',
diff --git a/lib/process-services/attachment/process-attachment-list.component.spec.ts b/lib/process-services/attachment/process-attachment-list.component.spec.ts
index c57658ba10..b777d523e9 100644
--- a/lib/process-services/attachment/process-attachment-list.component.spec.ts
+++ b/lib/process-services/attachment/process-attachment-list.component.spec.ts
@@ -97,6 +97,7 @@ describe('ProcessAttachmentListComponent', () => {
     });
 
     afterEach(() => {
+        fixture.destroy();
         const overlayContainers = <any> window.document.querySelectorAll('.cdk-overlay-container');
 
         overlayContainers.forEach((overlayContainer) => {
diff --git a/lib/process-services/process-list/components/process-list.component.spec.ts b/lib/process-services/process-list/components/process-list.component.spec.ts
index 38c3544bb3..10b050b0ba 100644
--- a/lib/process-services/process-list/components/process-list.component.spec.ts
+++ b/lib/process-services/process-list/components/process-list.component.spec.ts
@@ -562,7 +562,6 @@ class EmptyTemplateComponent {
 }
 
 describe('Custom EmptyTemplateComponent', () => {
-    let component: EmptyTemplateComponent;
     let fixture: ComponentFixture<EmptyTemplateComponent>;
 
     setupTestBed({
@@ -574,7 +573,6 @@ describe('Custom EmptyTemplateComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(EmptyTemplateComponent);
         fixture.detectChanges();
-        component = fixture.componentInstance;
     });
 
     it('should render the custom template', async(() => {
diff --git a/lib/process-services/task-list/components/task-filters.component.spec.ts b/lib/process-services/task-list/components/task-filters.component.spec.ts
index 1dc46429ad..b60a554be7 100644
--- a/lib/process-services/task-list/components/task-filters.component.spec.ts
+++ b/lib/process-services/task-list/components/task-filters.component.spec.ts
@@ -64,7 +64,7 @@ describe('TaskFiltersComponent', () => {
         error: 'wrong request'
     };
 
-    let mockErrorFilterPromise = new Promise.reject(mockErrorFilterList);
+    let mockErrorFilterPromise = Promise.reject(mockErrorFilterList);
 
     let component: TaskFiltersComponent;
     let fixture: ComponentFixture<TaskFiltersComponent>;