From 8452f26458e3d617ad5d55d5ac7b22a068502668 Mon Sep 17 00:00:00 2001
From: Jacob Boddey <boddey@google.com>
Date: Wed, 13 Dec 2023 09:42:25 +0000
Subject: [PATCH 1/2] Add UI and update README

---
 README.md                                     |  19 +-
 modules/test/dns/conf/module_config.json      |   6 -
 modules/test/tls/conf/module_config.json      |  12 -
 modules/test/tls/python/src/tls_util.py       |   5 +-
 modules/ui/src/app/app-routing.module.ts      |   8 +-
 modules/ui/src/app/app.component.html         |  45 +-
 modules/ui/src/app/app.component.spec.ts      | 111 +++-
 modules/ui/src/app/app.component.ts           |  23 +-
 .../device-item/device-item.component.html    |   5 +-
 .../device-item/device-item.component.spec.ts |   8 +
 .../device-item/device-item.component.ts      |   5 +
 .../device-tests/device-tests.component.html  |   2 +-
 .../device-tests.component.spec.ts            |  22 +-
 .../filter-chips/filter-chips.component.scss  |   4 +
 .../general-settings.component.html           |  18 +-
 .../general-settings.component.scss           |   4 +
 .../general-settings.component.spec.ts        |   4 +-
 .../general-settings.component.ts             |  20 +-
 .../components/version/version.component.html |   5 +-
 .../device-repository.component.html          |   2 +-
 .../device-repository.component.scss          |   4 +-
 .../ui/src/app/history/history.component.html |  48 +-
 .../ui/src/app/history/history.component.scss |  19 +-
 .../src/app/history/history.component.spec.ts |  42 +-
 .../ui/src/app/history/history.component.ts   |  11 +-
 .../error-handler.interceptor.spec.ts         |  50 ++
 .../interceptors/error-handler.interceptor.ts |  42 ++
 .../interceptors/error.interceptor.spec.ts    |  15 +
 .../src/app/interceptors/error.interceptor.ts |  15 +
 .../interceptors/loading.interceptor.spec.ts  |  15 +
 .../app/interceptors/loading.interceptor.ts   |  15 +
 modules/ui/src/app/mocks/progress.mock.ts     |   6 +
 modules/ui/src/app/model/routes.ts            |  21 +
 .../progress-initiate-form.component.html     |   4 +-
 .../progress-initiate-form.component.spec.ts  | 105 ++--
 .../progress-initiate-form.component.ts       | 112 ++--
 .../src/app/progress/progress.component.scss  |   2 +-
 .../ui/src/app/progress/progress.component.ts |   2 +-
 .../src/app/services/test-run.service.spec.ts |  13 +-
 .../ui/src/app/services/test-run.service.ts   | 553 +++++++++---------
 modules/ui/src/assets/icons/desktop.svg       |  23 +
 41 files changed, 912 insertions(+), 533 deletions(-)
 create mode 100644 modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
 create mode 100644 modules/ui/src/app/interceptors/error-handler.interceptor.ts
 create mode 100644 modules/ui/src/app/model/routes.ts
 create mode 100644 modules/ui/src/assets/icons/desktop.svg

diff --git a/README.md b/README.md
index 7b026c2e9..d8db6054e 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,30 @@
   <img width="200" alt="Testrun logo" src="https://user-images.githubusercontent.com/7399056/221927867-4190a4e8-a571-4e40-9c2b-65780ad9264c.png" alt="Testrun">
 
 ## Introduction :wave:
-Testrun automates specific test cases to verify network and security functionality in IoT devices. It is an open source tool which allows external manufacturers to test their devices for the purposes of Device Qualification within the BOS program.
+Testrun automates specific test cases to verify network and security functionality in IoT devices. It is an open source tool which allows manufacturers of IP capable devices to test their devices for the purposes of Device Qualification within the BOS program.
 
 ## Motivation :bulb:
-Without tools like Testrun, testing labs may be maintaining a large and complex network using equipment such as: A managed layer 3 switch, an enterprise-grade network router, virtualized or physical servers to provide DNS, NTP, 802.1x etc. With this amount of moving parts, all with dynamic configuration files and constant software updates, more time is likely to be spent on preparation and clean up of functinality or penetration testing - not forgetting the number of software tools required to perform the testing. The major issues which can and should be solved:
+Without tools like Testrun, test labs and engineers may need to  maintain a large and complex network coupled with dynamic configuration files and constant software updates. The major issues which can and should be solved are:
  1) The complexity of managing a testing network
  2) The time required to perform testing of network functionality
  3) The accuracy and consistency of testing network functionality
 
 ## How it works :triangular_ruler:
-Testrun creates an isolated and controlled network environment to fully simulate enterprise network deployments in your device testing lab. 
-This removes the necessity for complex hardware, advanced knowledge and networking experience whilst enabling semi-technical engineers to validate device 
-behaviour against industry cyber standards. 
+Testrun creates an isolated and controlled network environment on a linux machine. This removes the necessity for complex hardware, advanced knowledge and networking experience whilst enabling test engineers to validate device behaviour against Google’s Building Operating System requirements.
 
-Two runtime modes are supported by Testrun:
+Two modes are supported by Testrun:
 
 1) <strong>Automated testing</strong>
 
-Once the device has become operational (steady state), automated testing of the device under test will begin. Containerized test modules will then execute against the device (one module at a time). Once all test modules have completed execution, a final test report will be produced - presenting the results and further description of findings.
+Once the device has become operational (steady state), automated testing of the DUT (device under test) will begin. Containerized test modules will then execute against the device, one module at a time. Once all test modules have been executed, a report will be produced - presenting the results.
 
 2) <strong>Lab network</strong>
 
-Testrun cannot automate everything, and so additional manual testing may be required (or configuration changes may be required on the device). Rather than having to maintain a separate but idential lab network, Testrun will provide the network and some tools to assist an engineer performing the additional testing. At the same time, packet captures of the device behaviour will be recorded, alongside logs for each network service, for further debugging.
+When manual testing or configuration changes are required, Testrun will provide the network and some tools to assist an engineer performing the additional testing. This reduces the need to maintain a separate but identical lab network. Testrun will take care of packet captures and logs for each network service for further debugging.
 
 ## Minimum requirements :computer:
 ### Hardware
- - PC running Ubuntu LTS (laptop or desktop)
+ - PC running Ubuntu LTS 20.04 or 22.04 (laptop or desktop)
  - 2x USB ethernet adapter (One may be built in ethernet)
  - Internet connection
 ### Software
@@ -64,8 +62,7 @@ The contributing requirements can be found in [CONTRIBUTING.md](CONTRIBUTING.md)
   
 3) Can I run Testrun on a virtual machine?
 
-  Probably. Provided that the required 2x USB ethernet adapters are passed to the virtual machine as USB devices rather than network adapters, Testrun should
-  still work. We will look to test and approve the use of virtualisation to run Testrun in the future.
+  Testrun can be virtualized if the 2x ethernet adapters are passed through to a Virtual Box VM as a USB device rather than managed network adapters. A full guide will be provided once virtualization of Testrun has been fully tested.
 
  4) Can I connect multiple devices to Testrun?
 
diff --git a/modules/test/dns/conf/module_config.json b/modules/test/dns/conf/module_config.json
index a30e28077..9cff229c4 100644
--- a/modules/test/dns/conf/module_config.json
+++ b/modules/test/dns/conf/module_config.json
@@ -23,12 +23,6 @@
         "test_description": "Verify the device allows for a DNS server to be entered automatically", 
         "expected_behavior": "The device sends DNS requests to the DNS server provided by the DHCP server",
         "required_result": "Roadmap"
-      },
-      {
-        "name": "dns.mdns",
-        "test_description": "If the device has MDNS (or any kind of IP multicast), can it be disabled",
-        "expected_behavior": "Device may send MDNS requests",
-        "required_result": "Recommended"
       }
     ]
   }
diff --git a/modules/test/tls/conf/module_config.json b/modules/test/tls/conf/module_config.json
index 194d1198c..c5b1283eb 100644
--- a/modules/test/tls/conf/module_config.json
+++ b/modules/test/tls/conf/module_config.json
@@ -18,23 +18,11 @@
         "expected_behavior": "TLS 1.2 certificate is issued to the web browser client when accessed",
         "required_result": "Required"
       },
-      {
-        "name": "security.tls.v1_3_server",
-        "test_description": "Check the device web server TLS 1.3 & certificate is valid",
-        "expected_behavior": "TLS 1.3 certificate is issued to the web browser client when accessed",
-        "required_result": "Recommended"
-      },
       {
         "name": "security.tls.v1_2_client",
         "test_description": "Device uses TLS with connection to an external service on port 443 (or any other port which could be running the webserver-HTTPS)",
         "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.2 and support for ECDH and ECDSA ciphers",
         "required_result": "Required"
-      },
-      {
-        "name": "security.tls.v1_3_client",
-        "test_description": "Device uses TLS with connection to an external service on port 443 (or any other port which could be running the webserver-HTTPS)",
-        "expected_behavior": "The packet indicates a TLS connection with at least TLS 1.3",
-        "required_result": "Recommended"
       }
     ]
   }
diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py
index 2cb7011cd..86eedb604 100644
--- a/modules/test/tls/python/src/tls_util.py
+++ b/modules/test/tls/python/src/tls_util.py
@@ -380,8 +380,9 @@ def validate_tls_client(self, client_ip, tls_version, capture_file):
           tls_client_details += 'Completed handshake detected from server: '
           tls_client_details += result + '\n'
     else:
-      LOGGER.info('No client hello packets detected. Skipping')
-      tls_client_details = 'No client hello packets detected. Skipping'
+      LOGGER.info('No client hello packets detected')
+      tls_client_details = 'No client hello packets detected'
+      return True, tls_client_details
     return tls_client_valid, tls_client_details
 
   def is_ecdh_and_ecdsa(self, ciphers):
diff --git a/modules/ui/src/app/app-routing.module.ts b/modules/ui/src/app/app-routing.module.ts
index 792643198..59be3e59d 100644
--- a/modules/ui/src/app/app-routing.module.ts
+++ b/modules/ui/src/app/app-routing.module.ts
@@ -18,25 +18,25 @@ import { RouterModule, Routes } from '@angular/router';
 
 const routes: Routes = [
   {
-    path: 'runtime',
+    path: 'testrun',
     loadChildren: () =>
       import('./progress/progress.module').then(m => m.ProgressModule),
   },
   {
-    path: 'device-repository',
+    path: 'devices',
     loadChildren: () =>
       import('./device-repository/device-repository.module').then(
         m => m.DeviceRepositoryModule
       ),
   },
   {
-    path: 'results',
+    path: 'reports',
     loadChildren: () =>
       import('./history/history.module').then(m => m.HistoryModule),
   },
   {
     path: '',
-    redirectTo: 'device-repository',
+    redirectTo: 'devices',
     pathMatch: 'full',
   },
 ];
diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index 308a8f459..9b78ec850 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -21,10 +21,10 @@
         *ngTemplateOutlet="
           navButtonRoute;
           context: {
-            route: '/runtime',
+            route: Routes.Testrun,
             svgIcon: 'testrun_logo_small',
             label: 'Testrun',
-            name: 'runtime'
+            name: 'testrun'
           }
         ">
       </ng-container>
@@ -32,10 +32,10 @@
         *ngTemplateOutlet="
           navButtonRoute;
           context: {
-            route: '/device-repository',
+            route: Routes.Devices,
             svgIcon: 'devices',
             label: 'Devices',
-            name: 'device-repository'
+            name: 'devices'
           }
         ">
       </ng-container>
@@ -43,10 +43,10 @@
         *ngTemplateOutlet="
           navButtonRoute;
           context: {
-            route: '/results',
+            route: Routes.Reports,
             svgIcon: 'reports',
             label: 'Reports',
-            name: 'results'
+            name: 'reports'
           }
         ">
       </ng-container>
@@ -64,7 +64,7 @@
         (keydown.tab)="skipToNavigation($event)">
         <mat-icon>menu</mat-icon>
       </button>
-      <a class="logo-link" routerLink="/runtime" aria-label="Test run ui logo">
+      <a class="logo-link" routerLink="/runtime" aria-label="Testrun ui logo">
         <mat-icon svgIcon="testrun_logo_color"></mat-icon>
         <h1 class="main-heading">Testrun</h1>
       </a>
@@ -81,8 +81,20 @@ <h1 class="main-heading">Testrun</h1>
     <div class="app-content-main" role="main" id="main">
       <app-callout
         [type]="CalloutType.Info"
-        *ngIf="!(devices$ | async)?.length && isDevicesLoaded">
-        Step 1: To perform a device test please
+        *ngIf="
+          (hasConnectionSetting$ | async) !== true && isConnectionSettingsLoaded
+        ">
+        Step 1: To perform a device test, please, select ports in Connection
+        settings.
+      </app-callout>
+      <app-callout
+        [type]="CalloutType.Info"
+        *ngIf="
+          (hasConnectionSetting$ | async) === true &&
+          !(devices$ | async)?.length &&
+          isDevicesLoaded
+        ">
+        Step 2: To perform a device test please
         <a
           (click)="navigateToDeviceRepository()"
           (keydown.enter)="navigateToDeviceRepository()"
@@ -97,12 +109,14 @@ <h1 class="main-heading">Testrun</h1>
       <app-callout
         [type]="CalloutType.Info"
         *ngIf="
+          (hasConnectionSetting$ | async) === true &&
           (devices$ | async)?.length &&
-          !(systemStatus$ | async)?.status &&
-          isStatusLoaded
+          (!(systemStatus$ | async)?.status ||
+            (systemStatus$ | async)?.status === StatusOfTestrun.Idle) &&
+          isStatusLoaded &&
+          (isTestrunStarted$ | async) === false
         ">
-        Step 2: Once device is created navigate to Testrun Runtime tab where you
-        can set up and
+        Step 3: Once device is created navigate to
         <a
           (click)="navigateToRuntime()"
           (keydown.enter)="navigateToRuntime()"
@@ -110,8 +124,9 @@ <h1 class="main-heading">Testrun</h1>
           tabindex="0"
           role="button"
           class="message-link"
-          >Run the Test</a
-        >.
+          >Testrun</a
+        >
+        tab.
       </app-callout>
       <router-outlet></router-outlet>
     </div>
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index 1b864611c..68bcc31c5 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -40,8 +40,12 @@ import SpyObj = jasmine.SpyObj;
 import { BypassComponent } from './components/bypass/bypass.component';
 import { VersionComponent } from './components/version/version.component';
 import { CalloutComponent } from './components/callout/callout.component';
-import { MOCK_PROGRESS_DATA_IN_PROGRESS } from './mocks/progress.mock';
+import {
+  MOCK_PROGRESS_DATA_IDLE,
+  MOCK_PROGRESS_DATA_IN_PROGRESS,
+} from './mocks/progress.mock';
 import { LoaderService } from './services/loader.service';
+import { Routes } from './model/routes';
 
 describe('AppComponent', () => {
   let component: AppComponent;
@@ -75,6 +79,8 @@ describe('AppComponent', () => {
       'fetchVersion',
       'setIsOpenAddDevice',
       'systemStatus$',
+      'isTestrunStarted$',
+      'hasConnectionSetting$',
     ]);
 
     mockLoaderService = jasmine.createSpyObj(['setLoading']);
@@ -83,6 +89,8 @@ describe('AppComponent', () => {
     );
     mockService.getSystemInterfaces.and.returnValue(of([]));
     (mockService.systemStatus$ as unknown) = of({});
+    mockService.isTestrunStarted$ = of(true);
+    mockService.hasConnectionSetting$ = of(true);
 
     TestBed.configureTestingModule({
       imports: [
@@ -173,37 +181,37 @@ describe('AppComponent', () => {
     expect(generalSettingsButton).toBeDefined();
   });
 
-  it('should navigate to the device repository when "device repository" button is clicked', fakeAsync(() => {
+  it('should navigate to the devices when "devices" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-device-repository'
+      '.app-sidebar-button-devices'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/device-repository`);
+    expect(router.url).toBe(Routes.Devices);
   }));
 
-  it('should navigate to the runtime when "runtime" button is clicked', fakeAsync(() => {
+  it('should navigate to the testrun when "testrun" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-runtime'
+      '.app-sidebar-button-testrun'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/runtime`);
+    expect(router.url).toBe(Routes.Testrun);
   }));
 
-  it('should navigate to the results when "results" button is clicked', fakeAsync(() => {
+  it('should navigate to the reports when "reports" button is clicked', fakeAsync(() => {
     const button = compiled.querySelector(
-      '.app-sidebar-button-results'
+      '.app-sidebar-button-reports'
     ) as HTMLButtonElement;
 
     button?.click();
     tick();
 
-    expect(router.url).toBe(`/results`);
+    expect(router.url).toBe(Routes.Reports);
   }));
 
   it('should call toggleSettingsBtn focus when settingsDrawer close on closeSetting', fakeAsync(() => {
@@ -316,6 +324,43 @@ describe('AppComponent', () => {
     expect(version).toBeTruthy();
   });
 
+  describe('with no connection settings', () => {
+    beforeEach(() => {
+      mockService.hasConnectionSetting$ = of(false);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should have callout component with "Step 1" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 1');
+    });
+  });
+
+  describe('with system status as "Idle"', () => {
+    beforeEach(() => {
+      mockService.hasConnectionSetting$ = of(true);
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.systemStatus$ = of(MOCK_PROGRESS_DATA_IDLE);
+      mockService.isTestrunStarted$ = of(false);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should have callout component with "Step 3" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 3');
+    });
+  });
+
   describe('with no devices setted', () => {
     beforeEach(() => {
       mockService.getDevices.and.returnValue(
@@ -331,6 +376,14 @@ describe('AppComponent', () => {
       expect(callout).toBeTruthy();
     });
 
+    it('should have callout component with "Step 2" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 2');
+    });
+
     it('should have callout content with "Create a Device" link ', () => {
       const calloutLinkEl = compiled.querySelector(
         '.message-link'
@@ -350,7 +403,7 @@ describe('AppComponent', () => {
         calloutLinkEl.dispatchEvent(testCase.event);
         flush();
 
-        expect(router.url).toBe(`/device-repository`);
+        expect(router.url).toBe(Routes.Devices);
       }));
     });
 
@@ -362,21 +415,30 @@ describe('AppComponent', () => {
       calloutLinkEl.click();
       flush();
 
-      expect(router.url).toBe(`/device-repository`);
+      expect(router.url).toBe(Routes.Devices);
       expect(mockService.setIsOpenAddDevice).toHaveBeenCalledWith(true);
     }));
   });
 
-  describe('with devices setted but without run the test ', () => {
+  describe('with devices setted but without systemStatus data', () => {
     beforeEach(() => {
       mockService.getDevices.and.returnValue(
         new BehaviorSubject<Device[] | null>([device])
       );
+      mockService.isTestrunStarted$ = of(false);
       component.ngOnInit();
       fixture.detectChanges();
     });
 
-    it('should have callout component with "Run the Test" link', () => {
+    it('should have callout component with "Step 3" text', () => {
+      const callout = compiled.querySelector('app-callout');
+      const calloutContent = callout?.innerHTML.trim();
+
+      expect(callout).toBeTruthy();
+      expect(calloutContent).toContain('Step 3');
+    });
+
+    it('should have callout component with "Testrun" link', () => {
       const callout = compiled.querySelector('app-callout');
       const calloutLinkEl = compiled.querySelector(
         '.message-link'
@@ -384,7 +446,7 @@ describe('AppComponent', () => {
       const calloutLinkContent = calloutLinkEl.innerHTML.trim();
 
       expect(callout).toBeTruthy();
-      expect(calloutLinkContent).toContain('Run the Test');
+      expect(calloutLinkContent).toContain('Testrun');
     });
 
     keyboardCases.forEach(testCase => {
@@ -396,11 +458,28 @@ describe('AppComponent', () => {
         calloutLinkEl.dispatchEvent(testCase.event);
         flush();
 
-        expect(router.url).toBe(`/runtime`);
+        expect(router.url).toBe(Routes.Testrun);
       }));
     });
   });
 
+  describe('with devices setted, without systemStatus data, but run the tests ', () => {
+    beforeEach(() => {
+      mockService.getDevices.and.returnValue(
+        new BehaviorSubject<Device[] | null>([device])
+      );
+      mockService.isTestrunStarted$ = of(true);
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should not have callout component', () => {
+      const callout = compiled.querySelector('app-callout');
+
+      expect(callout).toBeNull();
+    });
+  });
+
   describe('with devices setted and systemStatus data ', () => {
     beforeEach(() => {
       mockService.getDevices.and.returnValue(
diff --git a/modules/ui/src/app/app.component.ts b/modules/ui/src/app/app.component.ts
index 7e83ef9c4..41eb73ab2 100644
--- a/modules/ui/src/app/app.component.ts
+++ b/modules/ui/src/app/app.component.ts
@@ -27,12 +27,13 @@ import { TestRunService } from './services/test-run.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { Device } from './model/device';
 import { take } from 'rxjs';
-import { TestrunStatus } from './model/testrun-status';
+import { TestrunStatus, StatusOfTestrun } from './model/testrun-status';
 import { Router } from '@angular/router';
 import { LoaderService } from './services/loader.service';
 import { CalloutType } from './model/callout-type';
 import { tap } from 'rxjs/internal/operators/tap';
 import { shareReplay } from 'rxjs/internal/operators/shareReplay';
+import { Routes } from './model/routes';
 
 const DEVICES_LOGO_URL = '/assets/icons/devices.svg';
 const REPORTS_LOGO_URL = '/assets/icons/reports.svg';
@@ -49,9 +50,14 @@ export class AppComponent implements OnInit {
   public readonly CalloutType = CalloutType;
   devices$!: Observable<Device[] | null>;
   systemStatus$!: Observable<TestrunStatus>;
+  isTestrunStarted$!: Observable<boolean>;
+  hasConnectionSetting$!: Observable<boolean | null>;
   interfaces: string[] = [];
   isDevicesLoaded = false;
   isStatusLoaded = false;
+  isConnectionSettingsLoaded = false;
+  public readonly StatusOfTestrun = StatusOfTestrun;
+  public readonly Routes = Routes;
 
   @ViewChild('settingsDrawer') public settingsDrawer!: MatDrawer;
   @ViewChild('toggleSettingsBtn') public toggleSettingsBtn!: HTMLButtonElement;
@@ -102,15 +108,26 @@ export class AppComponent implements OnInit {
     this.systemStatus$ = this.testRunService.systemStatus$.pipe(
       tap(() => (this.isStatusLoaded = true))
     );
+
+    this.isTestrunStarted$ = this.testRunService.isTestrunStarted$;
+
+    this.hasConnectionSetting$ = this.testRunService.hasConnectionSetting$.pipe(
+      tap(result => {
+        if (result !== null) {
+          this.isConnectionSettingsLoaded = true;
+        }
+      }),
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
   }
 
   navigateToDeviceRepository(): void {
-    this.route.navigate(['/device-repository']);
+    this.route.navigate([Routes.Devices]);
     this.testRunService.setIsOpenAddDevice(true);
   }
 
   navigateToRuntime(): void {
-    this.route.navigate(['/runtime']);
+    this.route.navigate([Routes.Testrun]);
   }
 
   async closeSetting(): Promise<void> {
diff --git a/modules/ui/src/app/components/device-item/device-item.component.html b/modules/ui/src/app/components/device-item/device-item.component.html
index 5b3db9de2..19683b6f1 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.html
+++ b/modules/ui/src/app/components/device-item/device-item.component.html
@@ -14,8 +14,9 @@
 limitations under the License.
 -->
 <button
+  [tabIndex]="tabIndex"
   (click)="itemClick()"
-  [attr.aria-label]="'Edit device ' + device.model"
+  [attr.aria-label]="label"
   class="device-item"
   type="button">
   <div [attr.aria-label]="device.model" class="item-name">
@@ -27,5 +28,5 @@
   <div [attr.aria-label]="device.mac_addr" class="item-mac-address">
     {{ device.mac_addr }}
   </div>
-  <div aria-label="Device icon" class="item-icon"></div>
+  <div class="item-icon"></div>
 </button>
diff --git a/modules/ui/src/app/components/device-item/device-item.component.spec.ts b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
index 102ee6dc8..2105fd66e 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.spec.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
@@ -65,4 +65,12 @@ describe('DeviceItemComponent', () => {
 
     expect(clickSpy).toHaveBeenCalledWith(component.device);
   });
+
+  it('should have tabindex', () => {
+    component.tabIndex = -2;
+    fixture.detectChanges();
+    const item = compiled.querySelector('.device-item') as HTMLElement;
+
+    expect(item.tabIndex).toBe(-2);
+  });
 });
diff --git a/modules/ui/src/app/components/device-item/device-item.component.ts b/modules/ui/src/app/components/device-item/device-item.component.ts
index e4125f194..a72d2516d 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.ts
@@ -24,9 +24,14 @@ import { Device } from '../../model/device';
 })
 export class DeviceItemComponent {
   @Input() device!: Device;
+  @Input() tabIndex = 0;
   @Output() itemClicked = new EventEmitter<Device>();
 
   itemClick(): void {
     this.itemClicked.emit(this.device);
   }
+
+  get label() {
+    return `${this.device.model} ${this.device.manufacturer} ${this.device.mac_addr}`;
+  }
 }
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.html b/modules/ui/src/app/components/device-tests/device-tests.component.html
index 0a20401a4..7f939de9a 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.html
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.html
@@ -22,7 +22,7 @@
     <p
       *ngFor="let test of test_modules.controls; let i = index"
       [class.disabled]="disabled">
-      <mat-checkbox [formControlName]="i">
+      <mat-checkbox [formControlName]="i" [tabIndex]="disabled ? -1 : 0">
         {{ testModules[i].displayName }}
       </mat-checkbox>
     </p>
diff --git a/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts b/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
index b459ca688..0599af372 100644
--- a/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
+++ b/modules/ui/src/app/components/device-tests/device-tests.component.spec.ts
@@ -46,11 +46,14 @@ describe('DeviceTestsComponent', () => {
     component.deviceForm = new FormBuilder().group({
       test_modules: new FormArray([]),
     });
-    fixture.detectChanges();
     compiled = fixture.nativeElement;
   });
 
   describe('component tests', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+    });
+
     it('should create', () => {
       expect(component).toBeTruthy();
     });
@@ -79,6 +82,7 @@ describe('DeviceTestsComponent', () => {
 
   describe('DOM tests', () => {
     it('should have checkboxes', () => {
+      fixture.detectChanges();
       const test = compiled.querySelectorAll('mat-checkbox input');
       const testLabel = compiled.querySelectorAll('mat-checkbox label');
 
@@ -88,5 +92,21 @@ describe('DeviceTestsComponent', () => {
       expect(testLabel[0].innerHTML.trim()).toEqual('Connection');
       expect(testLabel[1].innerHTML.trim()).toEqual('DNS');
     });
+
+    it('should have tabindex -1 if disabled', () => {
+      component.disabled = true;
+      fixture.detectChanges();
+      const test = compiled.querySelectorAll('mat-checkbox input');
+
+      expect((test[0] as HTMLElement).tabIndex).toEqual(-1);
+    });
+
+    it('should have tabindex 0 if enabled', () => {
+      component.disabled = false;
+      fixture.detectChanges();
+      const test = compiled.querySelectorAll('mat-checkbox input');
+
+      expect((test[0] as HTMLElement).tabIndex).toEqual(0);
+    });
   });
 });
diff --git a/modules/ui/src/app/components/filter-chips/filter-chips.component.scss b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
index 1088c4780..3b3eeddb0 100644
--- a/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
+++ b/modules/ui/src/app/components/filter-chips/filter-chips.component.scss
@@ -27,6 +27,10 @@
   cursor: pointer;
   color: $primary;
   font-weight: 400;
+  height: 32px;
+  margin: 4px 0 4px 8px;
+  border-radius: 16px;
+  flex-shrink: 0;
 }
 
 .filter-chip.mat-mdc-chip {
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.html b/modules/ui/src/app/components/general-settings/general-settings.component.html
index 7e42ef8b2..4e1954a2b 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.html
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.html
@@ -17,7 +17,7 @@
   <h2 class="settings-drawer-header-title">Connection settings</h2>
   <button
     (click)="closeSetting()"
-    [disabled]="!isFormValues || !hasSetting"
+    [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
     aria-label="close"
     class="settings-drawer-header-button"
     mat-button>
@@ -28,15 +28,20 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
   <form
     *ngIf="interfaces.length; else warning_message"
     [formGroup]="settingForm">
+    <app-callout
+      [type]="CalloutType.Warning"
+      *ngIf="interfaces.length === 1"
+      class="two-ports-message">
+      Warning! Testrun requires two ports to operate correctly.
+    </app-callout>
     <label
-      class="setting-form-label"
+      class="setting-form-label internet-label"
       id="internet-radio-group-label"
       for="internet-group">
       Select port used for Internet connection
     </label>
     <p class="setting-label-description">
-      Choose one of the following ports on your Laptop or Desktop: VLAN, USB,
-      HDMI, etc.
+      Choose one of the following ports on your Laptop or Desktop
     </p>
     <mat-radio-group
       aria-labelledby="internet-radio-group-label"
@@ -50,9 +55,6 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
         {{ interface }}
       </mat-radio-button>
     </mat-radio-group>
-    <app-callout [type]="CalloutType.Warning" *ngIf="interfaces.length === 1">
-      Warning! Testrun requires two ports to operate correctly.
-    </app-callout>
     <label
       class="setting-form-label device-label"
       id="device-radio-group-label"
@@ -101,7 +103,7 @@ <h2 class="settings-drawer-header-title">Connection settings</h2>
   <button
     mat-flat-button
     (click)="closeSetting()"
-    [disabled]="!isFormValues || !hasSetting"
+    [disabled]="!isFormValues || (hasConnectionSetting$ | async) !== true"
     class="close-button">
     Cancel
   </button>
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.scss b/modules/ui/src/app/components/general-settings/general-settings.component.scss
index fab9aa61f..84d49e514 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.scss
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.scss
@@ -86,6 +86,10 @@
   }
 }
 
+:host:has(.two-ports-message) .internet-label {
+  padding-top: 16px;
+}
+
 .setting-label-description {
   font-family: $font-secondary;
   font-size: 14px;
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
index 8d9649e3b..6448b80a1 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.spec.ts
@@ -64,6 +64,8 @@ describe('GeneralSettingsComponent', () => {
       'setSystemConfig',
       'createSystemConfig',
       'setIsOpenAddDevice',
+      'hasConnectionSetting$',
+      'setHasConnectionSetting',
     ]);
     testRunServiceMock.getSystemInterfaces.and.returnValue(of([]));
     testRunServiceMock.getSystemConfig.and.returnValue(
@@ -72,6 +74,7 @@ describe('GeneralSettingsComponent', () => {
     testRunServiceMock.createSystemConfig.and.returnValue(
       of(MOCK_SYSTEM_CONFIG_WITH_DATA)
     );
+    testRunServiceMock.hasConnectionSetting$ = of(true);
 
     await TestBed.configureTestingModule({
       declarations: [
@@ -237,7 +240,6 @@ describe('GeneralSettingsComponent', () => {
       component.internetControl.setValue(
         MOCK_SYSTEM_CONFIG_WITH_DATA.network?.internet_intf
       );
-      component.hasSetting = false;
 
       component.saveSetting();
 
diff --git a/modules/ui/src/app/components/general-settings/general-settings.component.ts b/modules/ui/src/app/components/general-settings/general-settings.component.ts
index 0cf751a72..1d19d0e56 100644
--- a/modules/ui/src/app/components/general-settings/general-settings.component.ts
+++ b/modules/ui/src/app/components/general-settings/general-settings.component.ts
@@ -31,6 +31,8 @@ import { Subject, takeUntil, tap } from 'rxjs';
 import { TestRunService } from '../../services/test-run.service';
 import { OnlyDifferentValuesValidator } from './only-different-values.validator';
 import { CalloutType } from '../../model/callout-type';
+import { Observable } from 'rxjs/internal/Observable';
+import { shareReplay } from 'rxjs/internal/operators/shareReplay';
 
 @Component({
   selector: 'app-general-settings',
@@ -45,7 +47,7 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   public readonly CalloutType = CalloutType;
   public settingForm!: FormGroup;
   public isSubmitting = false;
-  public hasSetting = false;
+  hasConnectionSetting$!: Observable<boolean | null>;
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
   get deviceControl(): FormControl {
@@ -75,6 +77,10 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
+    this.hasConnectionSetting$ = this.testRunService.hasConnectionSetting$.pipe(
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
+
     this.createSettingForm();
     this.setSettingView();
     this.cleanFormErrorMessage();
@@ -120,12 +126,14 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
         if (config?.network) {
           const { device_intf, internet_intf } = config.network;
           if (device_intf && internet_intf) {
-            this.hasSetting = true;
+            this.testRunService.setHasConnectionSetting(true);
           } else {
+            this.testRunService.setHasConnectionSetting(false);
             this.openSetting();
           }
           this.setDefaultFormValues(device_intf, internet_intf);
         } else {
+          this.testRunService.setHasConnectionSetting(false);
           this.openSetting();
         }
         this.testRunService.setSystemConfig(config);
@@ -164,15 +172,11 @@ export class GeneralSettingsComponent implements OnInit, OnDestroy {
       .subscribe(() => {
         this.closeSetting();
         this.testRunService.setSystemConfig(data);
-        this.setOpenAddDevice();
-        this.hasSetting = true;
+        this.testRunService.setIsOpenAddDevice(true);
+        this.testRunService.setHasConnectionSetting(true);
       });
   }
 
-  private setOpenAddDevice(): void {
-    this.testRunService.setIsOpenAddDevice(!this.hasSetting);
-  }
-
   private openSetting(): void {
     this.openSettingEvent.emit();
   }
diff --git a/modules/ui/src/app/components/version/version.component.html b/modules/ui/src/app/components/version/version.component.html
index b00233aed..7d396e169 100644
--- a/modules/ui/src/app/components/version/version.component.html
+++ b/modules/ui/src/app/components/version/version.component.html
@@ -25,7 +25,10 @@
     mat-button
     *ngIf="version.update_available"
     class="version-content-update"
-    aria-label="click to open update window"
+    [attr.aria-label]="
+      version?.installed_version +
+      ' New version is available. Click here to update'
+    "
     (click)="openUpdateWindow()">
     {{ version?.installed_version }}
     <span
diff --git a/modules/ui/src/app/device-repository/device-repository.component.html b/modules/ui/src/app/device-repository/device-repository.component.html
index a63578867..00679934b 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.html
+++ b/modules/ui/src/app/device-repository/device-repository.component.html
@@ -15,7 +15,7 @@
 -->
 <ng-container *ngIf="(devices$ | async)?.length; else empty">
   <mat-toolbar class="device-repository-toolbar">
-    <h2 class="title">Device Repository</h2>
+    <h2 class="title">Devices</h2>
     <ng-container *ngTemplateOutlet="addDeviceButton"></ng-container>
   </mat-toolbar>
   <div class="device-repository-content">
diff --git a/modules/ui/src/app/device-repository/device-repository.component.scss b/modules/ui/src/app/device-repository/device-repository.component.scss
index 46c0bd9a9..d83737755 100644
--- a/modules/ui/src/app/device-repository/device-repository.component.scss
+++ b/modules/ui/src/app/device-repository/device-repository.component.scss
@@ -30,7 +30,7 @@
 }
 
 .device-repository-toolbar {
-  padding-left: 40px;
+  padding-left: 32px;
   gap: 16px;
   background: $white;
   height: 72px;
@@ -38,7 +38,7 @@
 
 .device-repository-content {
   align-content: start;
-  padding: 24px;
+  padding: 24px 32px;
   display: grid;
   grid-template-columns: repeat(auto-fit, $device-item-width);
   gap: 16px;
diff --git a/modules/ui/src/app/history/history.component.html b/modules/ui/src/app/history/history.component.html
index 181d90894..25fdff3b5 100644
--- a/modules/ui/src/app/history/history.component.html
+++ b/modules/ui/src/app/history/history.component.html
@@ -16,10 +16,12 @@
 <ng-container *ngIf="dataLoaded">
   <ng-container *ngIf="this.dataSource?.data?.length; else empty">
     <mat-toolbar class="history-toolbar">
-      <h2 class="title">Results</h2>
+      <h2 class="title">Reports</h2>
     </mat-toolbar>
 
-    <div class="history-content">
+    <div
+      class="history-content"
+      [class.history-content-empty]="dataSource.filteredData.length === 0">
       <table
         (matSortChange)="sortData($event)"
         [dataSource]="dataSource"
@@ -159,6 +161,22 @@ <h2 class="title">Results</h2>
           mat-header-row
           [class.hidden]="isFiltersEmpty()"></tr>
 
+        <tr class="mat-row" *matNoDataRow>
+          <td class="mat-cell" [attr.colspan]="displayedColumns.length">
+            <div class="results-content-filter-empty">
+              <ng-container
+                *ngTemplateOutlet="
+                  emptyMessage;
+                  context: {
+                    header:
+                      'Sorry, there are no reports matching the search criteria.',
+                    message: 'Please consider change or clear filters.'
+                  }
+                "></ng-container>
+            </div>
+          </td>
+        </tr>
+
         <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
       </table>
     </div>
@@ -166,15 +184,15 @@ <h2 class="title">Results</h2>
 </ng-container>
 <ng-template #empty>
   <div class="results-content-empty">
-    <div class="results-content-empty-message">
-      <span class="results-content-empty-message-header"
-        >Sorry, there are no reports yet!</span
-      >
-      <span class="results-content-empty-message-main"
-        >Reports will automatically generate following a test attempt
-        completion.</span
-      >
-    </div>
+    <ng-container
+      *ngTemplateOutlet="
+        emptyMessage;
+        context: {
+          header: 'Sorry, there are no reports yet!',
+          message:
+            'Reports will automatically generate following a test attempt completion.'
+        }
+      "></ng-container>
   </div>
 </ng-template>
 
@@ -193,3 +211,11 @@ <h2 class="title">Results</h2>
     >
   </button>
 </ng-template>
+
+<ng-template #emptyMessage let-header="header" let-message="message">
+  <div class="results-content-empty-message">
+    <div class="results-content-empty-message-img"></div>
+    <span class="results-content-empty-message-header">{{ header }}</span>
+    <span class="results-content-empty-message-main">{{ message }}</span>
+  </div>
+</ng-template>
diff --git a/modules/ui/src/app/history/history.component.scss b/modules/ui/src/app/history/history.component.scss
index 24107ca4d..622da24c7 100644
--- a/modules/ui/src/app/history/history.component.scss
+++ b/modules/ui/src/app/history/history.component.scss
@@ -43,6 +43,11 @@
   max-height: stretch;
 }
 
+.history-content-empty,
+.history-content-empty table {
+  height: 100%;
+}
+
 .history-content table {
   th {
     font-weight: 700;
@@ -87,7 +92,8 @@
   }
 }
 
-.results-content-empty {
+.results-content-empty,
+.results-content-filter-empty {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -125,3 +131,14 @@
 .hidden {
   display: none;
 }
+
+.results-content-empty-message-img {
+  width: 293px;
+  height: 154px;
+  background-image: url(/assets/icons/desktop.svg);
+}
+
+.results-content-filter-empty .results-content-empty-message-main {
+  line-height: 20px;
+  font-size: 14px;
+}
diff --git a/modules/ui/src/app/history/history.component.spec.ts b/modules/ui/src/app/history/history.component.spec.ts
index 00887faac..57b83267a 100644
--- a/modules/ui/src/app/history/history.component.spec.ts
+++ b/modules/ui/src/app/history/history.component.spec.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 
 import { HistoryComponent } from './history.component';
 import { TestRunService } from '../services/test-run.service';
@@ -28,6 +28,7 @@ import { ElementRef } from '@angular/core';
 import { FilterName, ReportFilters } from '../model/filters';
 import SpyObj = jasmine.SpyObj;
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { MatSort } from '@angular/material/sort';
 
 const history = [
   {
@@ -83,10 +84,26 @@ describe('HistoryComponent', () => {
       expect(component).toBeTruthy();
     });
 
-    it('should set dataSource data', () => {
-      component.ngOnInit();
+    describe('ngOnInit', () => {
+      it('should set dataSource data', () => {
+        component.ngOnInit();
+
+        expect(component.dataSource.data).toBeTruthy();
+      });
+
+      it('should update sort', fakeAsync(() => {
+        const sort = new MatSort();
+        component.sort = sort;
+        component.ngOnInit();
+
+        expect(component.dataSource.sort).toBeTruthy();
+      }));
+
+      it('should update filter', fakeAsync(() => {
+        component.ngOnInit();
 
-      expect(component.dataSource.data).toBeTruthy();
+        expect(component.dataSource.filter).toBeTruthy();
+      }));
     });
 
     it('#sortData should call liveAnnouncer with sorted direction message', () => {
@@ -275,11 +292,26 @@ describe('HistoryComponent', () => {
         );
       });
 
-      it('should have filter ships', () => {
+      it('should have filter chips', () => {
         const chips = compiled.querySelector('app-filter-chips');
 
         expect(chips).toBeTruthy();
       });
+
+      it('should have empty state when no data satisfy filters', () => {
+        component.dataSource.filter = JSON.stringify({
+          deviceInfo: 'some not existing data',
+          deviceFirmware: 'some not existing data',
+          results: [],
+          dateRange: '',
+        });
+        fixture.detectChanges();
+        const emptyMessage = compiled.querySelector(
+          '.results-content-filter-empty'
+        );
+
+        expect(emptyMessage).toBeTruthy();
+      });
     });
   });
 });
diff --git a/modules/ui/src/app/history/history.component.ts b/modules/ui/src/app/history/history.component.ts
index f8f1dd9ba..ebcfb3bda 100644
--- a/modules/ui/src/app/history/history.component.ts
+++ b/modules/ui/src/app/history/history.component.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import {
-  AfterViewInit,
   Component,
   ElementRef,
   OnDestroy,
@@ -42,7 +41,7 @@ import { DateRange, FilterName, Filters } from '../model/filters';
   templateUrl: './history.component.html',
   styleUrls: ['./history.component.scss'],
 })
-export class HistoryComponent implements OnInit, AfterViewInit, OnDestroy {
+export class HistoryComponent implements OnInit, OnDestroy {
   displayedColumns: string[] = [
     'started',
     'duration',
@@ -66,7 +65,7 @@ export class HistoryComponent implements OnInit, AfterViewInit, OnDestroy {
     dateRange: '',
   };
   private destroy$: Subject<boolean> = new Subject<boolean>();
-  @ViewChild(MatSort) sort!: MatSort;
+  @ViewChild(MatSort, { static: false }) sort!: MatSort;
   dataLoaded = false;
   constructor(
     private testRunService: TestRunService,
@@ -99,14 +98,11 @@ export class HistoryComponent implements OnInit, AfterViewInit, OnDestroy {
         };
         this.dataSource.filterPredicate = this.customFilterPredicate();
         this.dataSource.filter = JSON.stringify(this.filteredValues);
+        this.dataSource.sort = this.sort;
         this.dataLoaded = true;
       });
   }
 
-  ngAfterViewInit() {
-    this.dataSource.sort = this.sort;
-  }
-
   customFilterPredicate() {
     const filterPredicate = (data: HistoryTestrun, filter: string): boolean => {
       const searchString = JSON.parse(filter);
@@ -194,7 +190,6 @@ export class HistoryComponent implements OnInit, AfterViewInit, OnDestroy {
   getFormattedDateString(date: string | null) {
     return date ? this.datePipe.transform(date, 'd MMM y H:mm') : '';
   }
-
   sortData(sortState: Sort) {
     this.dataSource.sort = this.sort;
     if (sortState.direction) {
diff --git a/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts b/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
new file mode 100644
index 000000000..89289f2f9
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error-handler.interceptor.spec.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TestBed } from '@angular/core/testing';
+
+import {
+  ErrorHandlerInterceptor,
+  WINDOW_TOKEN,
+} from './error-handler.interceptor';
+
+const windowMock = {
+  location: {
+    reload: jasmine.createSpy('reload'),
+  },
+};
+describe('ErrorHandlerInterceptor', () => {
+  let interceptor: ErrorHandlerInterceptor;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ErrorHandlerInterceptor,
+        { provide: WINDOW_TOKEN, useValue: windowMock },
+      ],
+    });
+    interceptor = TestBed.inject(ErrorHandlerInterceptor);
+    window.onbeforeunload = () => 'Oh no!';
+  });
+
+  it('should be created', () => {
+    expect(interceptor).toBeTruthy();
+  });
+
+  it('should reload page if chunk error happens', () => {
+    interceptor.handleError(new Error('Loading chunk 123 failed'));
+
+    expect(windowMock.location.reload).toHaveBeenCalled();
+  });
+});
diff --git a/modules/ui/src/app/interceptors/error-handler.interceptor.ts b/modules/ui/src/app/interceptors/error-handler.interceptor.ts
new file mode 100644
index 000000000..07b1fb3f7
--- /dev/null
+++ b/modules/ui/src/app/interceptors/error-handler.interceptor.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  ErrorHandler,
+  Inject,
+  Injectable,
+  InjectionToken,
+  Optional,
+} from '@angular/core';
+export const WINDOW_TOKEN = new InjectionToken('Window');
+
+/**
+ * Interceptor to fix chunk error https://medium.com/@kamrankhatti/angular-lazy-routes-loading-chunk-failed-42b16c22a377
+ */
+@Injectable()
+export class ErrorHandlerInterceptor implements ErrorHandler {
+  constructor(
+    @Optional()
+    @Inject(WINDOW_TOKEN)
+    private window: Window = window
+  ) {}
+  handleError(error: Error): void {
+    const chunkFailedMessage = /Loading chunk [\d]+ failed/;
+
+    if (chunkFailedMessage.test(error.message)) {
+      this.window.location.reload();
+    }
+  }
+}
diff --git a/modules/ui/src/app/interceptors/error.interceptor.spec.ts b/modules/ui/src/app/interceptors/error.interceptor.spec.ts
index 74d6285cc..9fff32863 100644
--- a/modules/ui/src/app/interceptors/error.interceptor.spec.ts
+++ b/modules/ui/src/app/interceptors/error.interceptor.spec.ts
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { TestBed } from '@angular/core/testing';
 
 import { ErrorInterceptor } from './error.interceptor';
diff --git a/modules/ui/src/app/interceptors/error.interceptor.ts b/modules/ui/src/app/interceptors/error.interceptor.ts
index ff403e01e..6eb651c2f 100644
--- a/modules/ui/src/app/interceptors/error.interceptor.ts
+++ b/modules/ui/src/app/interceptors/error.interceptor.ts
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { Injectable } from '@angular/core';
 import {
   HttpErrorResponse,
diff --git a/modules/ui/src/app/interceptors/loading.interceptor.spec.ts b/modules/ui/src/app/interceptors/loading.interceptor.spec.ts
index 1fd019665..1ecb6a714 100644
--- a/modules/ui/src/app/interceptors/loading.interceptor.spec.ts
+++ b/modules/ui/src/app/interceptors/loading.interceptor.spec.ts
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { TestBed } from '@angular/core/testing';
 
 import { LoadingInterceptor } from './loading.interceptor';
diff --git a/modules/ui/src/app/interceptors/loading.interceptor.ts b/modules/ui/src/app/interceptors/loading.interceptor.ts
index 8e45bc3fc..6a00847d4 100644
--- a/modules/ui/src/app/interceptors/loading.interceptor.ts
+++ b/modules/ui/src/app/interceptors/loading.interceptor.ts
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { Injectable } from '@angular/core';
 import {
   HttpEvent,
diff --git a/modules/ui/src/app/mocks/progress.mock.ts b/modules/ui/src/app/mocks/progress.mock.ts
index 12526ab70..f39ba4ba7 100644
--- a/modules/ui/src/app/mocks/progress.mock.ts
+++ b/modules/ui/src/app/mocks/progress.mock.ts
@@ -89,6 +89,12 @@ export const MOCK_PROGRESS_DATA_CANCELLED: TestrunStatus =
 export const MOCK_PROGRESS_DATA_MONITORING: TestrunStatus =
   PROGRESS_DATA_RESPONSE(StatusOfTestrun.Monitoring, null, TEST_DATA);
 
+export const MOCK_PROGRESS_DATA_IDLE: TestrunStatus = PROGRESS_DATA_RESPONSE(
+  StatusOfTestrun.Idle,
+  null,
+  []
+);
+
 export const MOCK_PROGRESS_DATA_NOT_STARTED: TestrunStatus = {
   ...MOCK_PROGRESS_DATA_IN_PROGRESS,
   status: StatusOfTestrun.Idle,
diff --git a/modules/ui/src/app/model/routes.ts b/modules/ui/src/app/model/routes.ts
new file mode 100644
index 000000000..97c7beb85
--- /dev/null
+++ b/modules/ui/src/app/model/routes.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export enum Routes {
+  Devices = '/devices',
+  Testrun = '/testrun',
+  Reports = '/reports',
+}
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
index 0303fc010..b09a53581 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.html
@@ -22,18 +22,20 @@
     <ng-container *ngIf="selectedDevice === null">
       <ng-container *ngFor="let device of devices">
         <app-device-item
+          [class.device-item-focused]="device === prevDevice"
           (itemClicked)="deviceSelected(device)"
           [device]="device"></app-device-item>
       </ng-container>
     </ng-container>
     <app-device-item
       *ngIf="selectedDevice !== null"
+      [tabIndex]="-1"
       [device]="selectedDevice"></app-device-item>
     <mat-form-field
       [class.hidden]="selectedDevice === null"
       appearance="outline">
       <mat-label>Firmware</mat-label>
-      <input formControlName="firmware" matInput />
+      <input formControlName="firmware" matInput #firmwareInput />
       <mat-hint>Please enter device firmware</mat-hint>
       <mat-error *ngIf="firmware.errors?.['required']">
         <span>Firmware is <strong>required</strong></span>
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
index 18a3a23d5..121e51465 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.spec.ts
@@ -13,13 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  ComponentFixture,
-  discardPeriodicTasks,
-  fakeAsync,
-  TestBed,
-  tick,
-} from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ProgressInitiateFormComponent } from './progress-initiate-form.component';
 import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
@@ -33,11 +27,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { DeviceTestsComponent } from '../../components/device-tests/device-tests.component';
 import { device } from '../../mocks/device.mock';
 import { of } from 'rxjs';
-import {
-  MOCK_PROGRESS_DATA_IN_PROGRESS,
-  MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE,
-} from '../../mocks/progress.mock';
-import { NotificationService } from '../../services/notification.service';
+import { MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE } from '../../mocks/progress.mock';
 import { SpinnerComponent } from '../../components/spinner/spinner.component';
 
 describe('ProgressInitiateFormComponent', () => {
@@ -45,7 +35,6 @@ describe('ProgressInitiateFormComponent', () => {
   let fixture: ComponentFixture<ProgressInitiateFormComponent>;
   let compiled: HTMLElement;
 
-  const notificationServiceMock = jasmine.createSpyObj(['notify', 'dismiss']);
   const testRunServiceMock = jasmine.createSpyObj([
     'getDevices',
     'fetchDevices',
@@ -78,7 +67,6 @@ describe('ProgressInitiateFormComponent', () => {
       declarations: [ProgressInitiateFormComponent],
       providers: [
         { provide: TestRunService, useValue: testRunServiceMock },
-        { provide: NotificationService, useValue: notificationServiceMock },
         {
           provide: MatDialogRef,
           useValue: {
@@ -104,54 +92,6 @@ describe('ProgressInitiateFormComponent', () => {
 
   afterEach(() => {
     testRunServiceMock.getSystemStatus.calls.reset();
-    notificationServiceMock.notify.calls.reset();
-  });
-
-  describe('when test run started', () => {
-    beforeEach(() => {
-      component.testRunStarted = true;
-    });
-    describe('with status "Waiting for device"', () => {
-      beforeEach(async () => {
-        testRunServiceMock.systemStatus$ = of(
-          MOCK_PROGRESS_DATA_WAITING_FOR_DEVICE
-        );
-      });
-
-      it('should call again getSystemStatus', fakeAsync(() => {
-        fixture.detectChanges();
-        tick(10000);
-
-        expect(testRunServiceMock.getSystemStatus).toHaveBeenCalledTimes(2);
-
-        discardPeriodicTasks();
-      }));
-
-      it('should notify about status', fakeAsync(() => {
-        fixture.detectChanges();
-
-        expect(notificationServiceMock.notify).toHaveBeenCalledWith(
-          'Waiting for Device',
-          0
-        );
-
-        discardPeriodicTasks();
-      }));
-    });
-
-    describe('with status not "Waiting for device"', () => {
-      beforeEach(async () => {
-        testRunServiceMock.systemStatus$ = of(MOCK_PROGRESS_DATA_IN_PROGRESS);
-      });
-
-      it('should call again getSystemStatus', fakeAsync(() => {
-        spyOn(component.dialogRef, 'close');
-        fixture.detectChanges();
-
-        expect(notificationServiceMock.dismiss).toHaveBeenCalledWith();
-        expect(component.dialogRef.close).toHaveBeenCalled();
-      }));
-    });
   });
 
   describe('Class tests', () => {
@@ -242,6 +182,41 @@ describe('ProgressInitiateFormComponent', () => {
         });
       });
     });
+
+    describe('#ngAfterViewChecked', () => {
+      it('should focus button with previously selected device', () => {
+        component.prevDevice = device;
+        const buttonSpy = spyOn(component, 'focusButton');
+        component.ngAfterViewChecked();
+        fixture.detectChanges();
+
+        expect(component.prevDevice).toBeNull();
+        expect(buttonSpy).toHaveBeenCalled();
+      });
+
+      it('should focus firmware', () => {
+        component.selectedDevice = device;
+        component.setFirmwareFocus = true;
+        const firmwareSpy = spyOn(
+          component.firmwareInput.nativeElement,
+          'focus'
+        );
+        component.ngAfterViewChecked();
+        fixture.detectChanges();
+
+        expect(firmwareSpy).toHaveBeenCalled();
+      });
+    });
+
+    it('should focus element on focusButton ', function () {
+      const deviceButton = compiled.querySelector(
+        'app-device-item button'
+      ) as HTMLButtonElement;
+      const buttonFocusSpy = spyOn(deviceButton, 'focus');
+      component.focusButton(deviceButton);
+
+      expect(buttonFocusSpy).toHaveBeenCalled();
+    });
   });
 
   describe('DOM tests', () => {
@@ -292,6 +267,12 @@ describe('ProgressInitiateFormComponent', () => {
         expect(deviceItem).toBeTruthy();
       });
 
+      it('should have tabindex -1 for device item', () => {
+        const deviceItem = compiled.querySelector('app-device-item button');
+
+        expect((deviceItem as HTMLElement).tabIndex).toBe(-1);
+      });
+
       it('should display firmware if device selected', () => {
         const firmware = compiled.querySelector('input');
 
diff --git a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
index 1a6b17a56..b9f9de250 100644
--- a/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
+++ b/modules/ui/src/app/progress/progress-initiate-form/progress-initiate-form.component.ts
@@ -13,7 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  AfterViewChecked,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { TestRunService } from '../../services/test-run.service';
 import { Observable } from 'rxjs/internal/Observable';
@@ -25,13 +32,8 @@ import {
   FormGroup,
 } from '@angular/forms';
 import { DeviceValidators } from '../../device-repository/device-form/device.validators';
-import { StatusOfTestrun, TestrunStatus } from '../../model/testrun-status';
-import { tap } from 'rxjs/internal/operators/tap';
-import { interval } from 'rxjs/internal/observable/interval';
-import { takeUntil } from 'rxjs/internal/operators/takeUntil';
-import { Subject } from 'rxjs/internal/Subject';
-import { NotificationService } from '../../services/notification.service';
 import { EscapableDialogComponent } from '../../components/escapable-dialog/escapable-dialog.component';
+import { take } from 'rxjs';
 
 @Component({
   selector: 'app-progress-initiate-form',
@@ -40,22 +42,22 @@ import { EscapableDialogComponent } from '../../components/escapable-dialog/esca
 })
 export class ProgressInitiateFormComponent
   extends EscapableDialogComponent
-  implements OnInit, OnDestroy
+  implements OnInit, AfterViewChecked
 {
+  @ViewChild('firmwareInput') firmwareInput!: ElementRef;
   initiateForm!: FormGroup;
   devices$!: Observable<Device[] | null>;
   selectedDevice: Device | null = null;
   testModules: TestModule[] = [];
-  public systemStatus$!: Observable<TestrunStatus>;
-  startInterval = false;
-  destroy$: Subject<boolean> = new Subject<boolean>();
+  prevDevice: Device | null = null;
+  setFirmwareFocus = false;
 
   constructor(
     public override dialogRef: MatDialogRef<ProgressInitiateFormComponent>,
     private readonly testRunService: TestRunService,
     private fb: FormBuilder,
     private deviceValidators: DeviceValidators,
-    private notificationService: NotificationService
+    private readonly changeDetectorRef: ChangeDetectorRef
   ) {
     super(dialogRef);
   }
@@ -68,39 +70,16 @@ export class ProgressInitiateFormComponent
     this.dialogRef.close();
   }
 
-  testRunStarted = false;
-
   ngOnInit() {
     this.devices$ = this.testRunService.getDevices();
     this.createInitiateForm();
     this.testModules = this.testRunService.getTestModules();
-
-    this.testRunService.systemStatus$
-      .pipe(
-        tap(res => {
-          if (this.testRunStarted) {
-            if (
-              res.status === StatusOfTestrun.WaitingForDevice &&
-              !this.startInterval
-            ) {
-              this.pullingSystemStatusData();
-              this.notify(res.status, 0);
-            }
-            if (res.status !== StatusOfTestrun.WaitingForDevice) {
-              this.dismiss();
-              this.destroy$.next(true);
-              this.startInterval = false;
-              this.dialogRef.close();
-            }
-          }
-        }),
-        takeUntil(this.destroy$)
-      )
-      .subscribe();
   }
 
   deviceSelected(device: Device) {
     this.selectedDevice = device;
+    this.prevDevice = device;
+    this.setFirmwareFocus = true;
   }
 
   changeDevice() {
@@ -108,6 +87,27 @@ export class ProgressInitiateFormComponent
     this.firmware.setValue('');
   }
 
+  ngAfterViewChecked() {
+    // When change device clicked, previously selected item should be focused
+    const item = window.document.querySelector(
+      '.device-item-focused button'
+    ) as HTMLButtonElement;
+    if (item) {
+      this.focusButton(item);
+      this.prevDevice = null;
+      this.changeDetectorRef.detectChanges();
+    }
+    if (this.setFirmwareFocus) {
+      this.firmwareInput?.nativeElement.focus();
+      this.setFirmwareFocus = false;
+      this.changeDetectorRef.detectChanges();
+    }
+  }
+
+  focusButton(button: HTMLButtonElement) {
+    button.focus();
+  }
+
   startTestRun() {
     if (!this.firmware.value.trim()) {
       this.firmware.setErrors({ required: true });
@@ -123,16 +123,11 @@ export class ProgressInitiateFormComponent
       this.selectedDevice.firmware = this.firmware.value.trim();
       this.testRunService
         .startTestrun(this.selectedDevice)
-        .pipe(takeUntil(this.destroy$))
-        .subscribe(
-          () => {
-            this.testRunStarted = true;
-            this.testRunService.getSystemStatus();
-          },
-          () => {
-            this.startInterval = false;
-          }
-        );
+        .pipe(take(1))
+        .subscribe(() => {
+          this.testRunService.getSystemStatus();
+          this.cancel();
+        });
     }
   }
 
@@ -142,27 +137,4 @@ export class ProgressInitiateFormComponent
       test_modules: new FormArray([]),
     });
   }
-
-  ngOnDestroy() {
-    this.destroy$.next(true);
-    this.destroy$.unsubscribe();
-  }
-
-  private pullingSystemStatusData(): void {
-    this.startInterval = true;
-    interval(5000)
-      .pipe(
-        takeUntil(this.destroy$),
-        tap(() => this.testRunService.getSystemStatus())
-      )
-      .subscribe();
-  }
-
-  private notify(message: string, duration = 5000) {
-    this.notificationService.notify(message, duration);
-  }
-
-  private dismiss() {
-    this.notificationService.dismiss();
-  }
 }
diff --git a/modules/ui/src/app/progress/progress.component.scss b/modules/ui/src/app/progress/progress.component.scss
index aec8cbdd3..4df37a115 100644
--- a/modules/ui/src/app/progress/progress.component.scss
+++ b/modules/ui/src/app/progress/progress.component.scss
@@ -42,7 +42,7 @@
     flex-direction: column;
     flex: 1;
     min-width: 0;
-    padding: 0 32px 0 10px;
+    padding: 0 32px 0 0;
   }
 
   .toolbar-row {
diff --git a/modules/ui/src/app/progress/progress.component.ts b/modules/ui/src/app/progress/progress.component.ts
index 9eb8d224e..d4183a46c 100644
--- a/modules/ui/src/app/progress/progress.component.ts
+++ b/modules/ui/src/app/progress/progress.component.ts
@@ -160,7 +160,7 @@ export class ProgressComponent implements OnInit, OnDestroy {
       data: {
         title: 'Stop testrun',
         content:
-          'Are you sure you would like to stop testrun without any track records and report generation?',
+          'Are you sure you would like to stop testrun without a report generation?',
       },
       autoFocus: true,
       hasBackdrop: true,
diff --git a/modules/ui/src/app/services/test-run.service.spec.ts b/modules/ui/src/app/services/test-run.service.spec.ts
index f0ae9ee54..68b841487 100644
--- a/modules/ui/src/app/services/test-run.service.spec.ts
+++ b/modules/ui/src/app/services/test-run.service.spec.ts
@@ -72,11 +72,6 @@ describe('TestRunService', () => {
         name: 'ntp',
         enabled: true,
       },
-      {
-        displayName: 'DHCP',
-        name: 'dhcp',
-        enabled: true,
-      },
       {
         displayName: 'DNS',
         name: 'dns',
@@ -135,6 +130,14 @@ describe('TestRunService', () => {
     });
   });
 
+  it('setHasConnectionSetting should update the hasConnectionSetting$', () => {
+    service.setHasConnectionSetting(true);
+
+    service.hasConnectionSetting$.subscribe(data => {
+      expect(data).toEqual(true);
+    });
+  });
+
   it('getSystemConfig should return systemConfig data', () => {
     const apiUrl = 'http://localhost:8000/system/config';
 
diff --git a/modules/ui/src/app/services/test-run.service.ts b/modules/ui/src/app/services/test-run.service.ts
index e65373a2f..22b4d2328 100644
--- a/modules/ui/src/app/services/test-run.service.ts
+++ b/modules/ui/src/app/services/test-run.service.ts
@@ -1,274 +1,279 @@
-/**
- * Copyright 2023 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { Observable } from 'rxjs/internal/Observable';
-import { Device, TestModule } from '../model/device';
-import { map, ReplaySubject, retry } from 'rxjs';
-import { SystemConfig } from '../model/setting';
-import {
-  StatusOfTestResult,
-  StatusOfTestrun,
-  StatusResultClassName,
-  TestrunStatus,
-} from '../model/testrun-status';
-import { Version } from '../model/version';
-
-const API_URL = `http://${window.location.hostname}:8000`;
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TestRunService {
-  private readonly testModules: TestModule[] = [
-    {
-      displayName: 'Connection',
-      name: 'connection',
-      enabled: true,
-    },
-    {
-      displayName: 'NTP',
-      name: 'ntp',
-      enabled: true,
-    },
-    {
-      displayName: 'DHCP',
-      name: 'dhcp',
-      enabled: true,
-    },
-    {
-      displayName: 'DNS',
-      name: 'dns',
-      enabled: true,
-    },
-    {
-      displayName: 'Services',
-      name: 'nmap',
-      enabled: true,
-    },
-    {
-      displayName: 'Security',
-      name: 'security',
-      enabled: true,
-    },
-    {
-      displayName: 'TLS',
-      name: 'tls',
-      enabled: true,
-    },
-  ];
-
-  private devices = new BehaviorSubject<Device[] | null>(null);
-  private isOpenAddDeviceSub$ = new BehaviorSubject<boolean>(false);
-  public isOpenAddDevice$ = this.isOpenAddDeviceSub$.asObservable();
-  private _systemConfig = new BehaviorSubject<SystemConfig | null>(null);
-  public systemConfig$ = this._systemConfig.asObservable();
-  private systemStatusSubject = new ReplaySubject<TestrunStatus>(1);
-  public systemStatus$ = this.systemStatusSubject.asObservable();
-  private history = new BehaviorSubject<TestrunStatus[] | null>(null);
-  private version = new BehaviorSubject<Version | null>(null);
-
-  constructor(private http: HttpClient) {}
-
-  setIsOpenAddDevice(isOpen: boolean): void {
-    this.isOpenAddDeviceSub$.next(isOpen);
-  }
-  getDevices(): BehaviorSubject<Device[] | null> {
-    return this.devices;
-  }
-
-  setDevices(devices: Device[]): void {
-    this.devices.next(devices);
-  }
-
-  setSystemConfig(config: SystemConfig): void {
-    this._systemConfig.next(config);
-  }
-
-  setSystemStatus(status: TestrunStatus): void {
-    this.systemStatusSubject.next(status);
-  }
-
-  fetchDevices(): void {
-    this.http
-      .get<Device[]>(`${API_URL}/devices`)
-      .subscribe((devices: Device[]) => {
-        this.setDevices(devices);
-      });
-  }
-
-  getSystemConfig(): Observable<SystemConfig> {
-    return this.http.get<SystemConfig>(`${API_URL}/system/config`);
-  }
-
-  createSystemConfig(data: SystemConfig): Observable<SystemConfig> {
-    return this.http
-      .post<SystemConfig>(`${API_URL}/system/config`, data)
-      .pipe(retry(1));
-  }
-
-  getSystemInterfaces(): Observable<string[]> {
-    return this.http.get<string[]>(`${API_URL}/system/interfaces`);
-  }
-
-  /**
-   * Gets system status.
-   * Status Cancelling exist only on FE. Every status except Cancelled
-   * should be overriden with Cancelling value during cancelling process
-   * @param isCancelling - indicates if status should be overridden with Cancelling value
-   */
-  getSystemStatus(isCancelling?: boolean): void {
-    this.http
-      .get<TestrunStatus>(`${API_URL}/system/status`)
-      .subscribe((res: TestrunStatus) => {
-        if (isCancelling && res.status !== StatusOfTestrun.Cancelled) {
-          res.status = StatusOfTestrun.Cancelling;
-        }
-        this.setSystemStatus(res);
-      });
-  }
-
-  stopTestrun(): Observable<boolean> {
-    return this.http
-      .post<{ success: string }>(`${API_URL}/system/stop`, {})
-      .pipe(map(() => true));
-  }
-
-  getTestModules(): TestModule[] {
-    return this.testModules;
-  }
-
-  saveDevice(device: Device): Observable<boolean> {
-    return this.http
-      .post<boolean>(`${API_URL}/device`, JSON.stringify(device))
-      .pipe(map(() => true));
-  }
-
-  deleteDevice(device: Device): Observable<boolean> {
-    return this.http
-      .delete<boolean>(`${API_URL}/device`, {
-        body: JSON.stringify(device),
-      })
-      .pipe(map(() => true));
-  }
-
-  hasDevice(macAddress: string): boolean {
-    return (
-      this.devices.value?.some(
-        device => device.mac_addr === macAddress.trim()
-      ) || false
-    );
-  }
-
-  addDevice(device: Device): void {
-    this.devices.next(
-      this.devices.value ? this.devices.value.concat([device]) : [device]
-    );
-  }
-
-  updateDevice(deviceToUpdate: Device, update: Device): void {
-    const device = this.devices.value?.find(
-      device => update.mac_addr === device.mac_addr
-    );
-    if (device) {
-      device.model = update.model;
-      device.manufacturer = update.manufacturer;
-      device.test_modules = update.test_modules;
-
-      this.devices.next(this.devices.value);
-    }
-  }
-
-  removeDevice(deviceToDelete: Device): void {
-    const idx = this.devices.value?.findIndex(
-      device => deviceToDelete.mac_addr === device.mac_addr
-    );
-    if (typeof idx === 'number') {
-      this.devices.value?.splice(idx, 1);
-      this.devices.next(this.devices.value);
-    }
-  }
-
-  fetchHistory(): void {
-    this.http
-      .get<TestrunStatus[]>(`${API_URL}/reports`)
-      .pipe(retry(1))
-      .subscribe(data => {
-        this.history.next(data);
-      });
-  }
-
-  getHistory(): BehaviorSubject<TestrunStatus[] | null> {
-    return this.history;
-  }
-
-  public getResultClass(result: string): StatusResultClassName {
-    return {
-      green: result === StatusOfTestResult.Compliant,
-      red:
-        result === StatusOfTestResult.NonCompliant ||
-        result === StatusOfTestResult.Error,
-      blue:
-        result === StatusOfTestResult.SmartReady ||
-        result === StatusOfTestResult.Info,
-      grey:
-        result === StatusOfTestResult.Skipped ||
-        result === StatusOfTestResult.NotStarted,
-    };
-  }
-
-  startTestrun(device: Device): Observable<boolean> {
-    return this.http
-      .post<TestrunStatus>(
-        `${API_URL}/system/start`,
-        JSON.stringify({ device })
-      )
-      .pipe(map(() => true));
-  }
-
-  getVersion(): BehaviorSubject<Version | null> {
-    return this.version;
-  }
-
-  fetchVersion(): void {
-    this.http
-      .get<Version>(`${API_URL}/system/version`)
-      .pipe(retry(1))
-      .subscribe(version => {
-        this.version.next(version);
-      });
-  }
-
-  deleteReport(mac_addr: string, started: string): Observable<boolean> {
-    return this.http
-      .delete<boolean>(`${API_URL}/report`, {
-        body: JSON.stringify({ mac_addr, timestamp: started }),
-      })
-      .pipe(map(() => true));
-  }
-
-  removeReport(mac_addr: string, started: string): void {
-    const idx = this.history.value?.findIndex(
-      report =>
-        report.device.mac_addr === mac_addr && report.started === started
-    );
-    if (typeof idx === 'number') {
-      this.history.value?.splice(idx, 1);
-      this.history.next(this.history.value);
-    }
-  }
-}
+/**
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Observable } from 'rxjs/internal/Observable';
+import { Device, TestModule } from '../model/device';
+import { map, ReplaySubject, retry } from 'rxjs';
+import { SystemConfig } from '../model/setting';
+import {
+  StatusOfTestResult,
+  StatusOfTestrun,
+  StatusResultClassName,
+  TestrunStatus,
+} from '../model/testrun-status';
+import { Version } from '../model/version';
+
+const API_URL = 'http://localhost:8000';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TestRunService {
+  private readonly testModules: TestModule[] = [
+    {
+      displayName: 'Connection',
+      name: 'connection',
+      enabled: true,
+    },
+    {
+      displayName: 'NTP',
+      name: 'ntp',
+      enabled: true,
+    },
+    {
+      displayName: 'DNS',
+      name: 'dns',
+      enabled: true,
+    },
+    {
+      displayName: 'Services',
+      name: 'nmap',
+      enabled: true,
+    },
+    {
+      displayName: 'Security',
+      name: 'security',
+      enabled: true,
+    },
+    {
+      displayName: 'TLS',
+      name: 'tls',
+      enabled: true,
+    },
+  ];
+
+  private devices = new BehaviorSubject<Device[] | null>(null);
+  private isOpenAddDeviceSub$ = new BehaviorSubject<boolean>(false);
+  public isOpenAddDevice$ = this.isOpenAddDeviceSub$.asObservable();
+  private _systemConfig = new BehaviorSubject<SystemConfig | null>(null);
+  public systemConfig$ = this._systemConfig.asObservable();
+  private systemStatusSubject = new ReplaySubject<TestrunStatus>(1);
+  public systemStatus$ = this.systemStatusSubject.asObservable();
+  private isTestrunStartedSub$ = new BehaviorSubject<boolean>(false);
+  public isTestrunStarted$ = this.isTestrunStartedSub$.asObservable();
+  private hasConnectionSettingSub$ = new BehaviorSubject<boolean | null>(null);
+  public hasConnectionSetting$ = this.hasConnectionSettingSub$.asObservable();
+  private history = new BehaviorSubject<TestrunStatus[] | null>(null);
+  private version = new BehaviorSubject<Version | null>(null);
+
+  constructor(private http: HttpClient) {}
+
+  setIsOpenAddDevice(isOpen: boolean): void {
+    this.isOpenAddDeviceSub$.next(isOpen);
+  }
+
+  setHasConnectionSetting(hasSetting: boolean): void {
+    this.hasConnectionSettingSub$.next(hasSetting);
+  }
+  getDevices(): BehaviorSubject<Device[] | null> {
+    return this.devices;
+  }
+
+  setDevices(devices: Device[]): void {
+    this.devices.next(devices);
+  }
+
+  setSystemConfig(config: SystemConfig): void {
+    this._systemConfig.next(config);
+  }
+
+  setSystemStatus(status: TestrunStatus): void {
+    this.systemStatusSubject.next(status);
+  }
+
+  fetchDevices(): void {
+    this.http
+      .get<Device[]>(`${API_URL}/devices`)
+      .subscribe((devices: Device[]) => {
+        this.setDevices(devices);
+      });
+  }
+
+  getSystemConfig(): Observable<SystemConfig> {
+    return this.http.get<SystemConfig>(`${API_URL}/system/config`);
+  }
+
+  createSystemConfig(data: SystemConfig): Observable<SystemConfig> {
+    return this.http
+      .post<SystemConfig>(`${API_URL}/system/config`, data)
+      .pipe(retry(1));
+  }
+
+  getSystemInterfaces(): Observable<string[]> {
+    return this.http.get<string[]>(`${API_URL}/system/interfaces`);
+  }
+
+  /**
+   * Gets system status.
+   * Status Cancelling exist only on FE. Every status except Cancelled
+   * should be overriden with Cancelling value during cancelling process
+   * @param isCancelling - indicates if status should be overridden with Cancelling value
+   */
+  getSystemStatus(isCancelling?: boolean): void {
+    this.http
+      .get<TestrunStatus>(`${API_URL}/system/status`)
+      .subscribe((res: TestrunStatus) => {
+        if (isCancelling && res.status !== StatusOfTestrun.Cancelled) {
+          res.status = StatusOfTestrun.Cancelling;
+        }
+        this.setSystemStatus(res);
+      });
+  }
+
+  stopTestrun(): Observable<boolean> {
+    return this.http
+      .post<{ success: string }>(`${API_URL}/system/stop`, {})
+      .pipe(map(() => true));
+  }
+
+  getTestModules(): TestModule[] {
+    return this.testModules;
+  }
+
+  saveDevice(device: Device): Observable<boolean> {
+    return this.http
+      .post<boolean>(`${API_URL}/device`, JSON.stringify(device))
+      .pipe(map(() => true));
+  }
+
+  deleteDevice(device: Device): Observable<boolean> {
+    return this.http
+      .delete<boolean>(`${API_URL}/device`, {
+        body: JSON.stringify(device),
+      })
+      .pipe(map(() => true));
+  }
+
+  hasDevice(macAddress: string): boolean {
+    return (
+      this.devices.value?.some(
+        device => device.mac_addr === macAddress.trim()
+      ) || false
+    );
+  }
+
+  addDevice(device: Device): void {
+    this.devices.next(
+      this.devices.value ? this.devices.value.concat([device]) : [device]
+    );
+  }
+
+  updateDevice(deviceToUpdate: Device, update: Device): void {
+    const device = this.devices.value?.find(
+      device => update.mac_addr === device.mac_addr
+    );
+    if (device) {
+      device.model = update.model;
+      device.manufacturer = update.manufacturer;
+      device.test_modules = update.test_modules;
+
+      this.devices.next(this.devices.value);
+    }
+  }
+
+  removeDevice(deviceToDelete: Device): void {
+    const idx = this.devices.value?.findIndex(
+      device => deviceToDelete.mac_addr === device.mac_addr
+    );
+    if (typeof idx === 'number') {
+      this.devices.value?.splice(idx, 1);
+      this.devices.next(this.devices.value);
+    }
+  }
+
+  fetchHistory(): void {
+    this.http
+      .get<TestrunStatus[]>(`${API_URL}/reports`)
+      .pipe(retry(1))
+      .subscribe(data => {
+        this.history.next(data);
+      });
+  }
+
+  getHistory(): BehaviorSubject<TestrunStatus[] | null> {
+    return this.history;
+  }
+
+  public getResultClass(result: string): StatusResultClassName {
+    return {
+      green: result === StatusOfTestResult.Compliant,
+      red:
+        result === StatusOfTestResult.NonCompliant ||
+        result === StatusOfTestResult.Error,
+      blue:
+        result === StatusOfTestResult.SmartReady ||
+        result === StatusOfTestResult.Info,
+      grey:
+        result === StatusOfTestResult.Skipped ||
+        result === StatusOfTestResult.NotStarted,
+    };
+  }
+
+  startTestrun(device: Device): Observable<boolean> {
+    this.isTestrunStartedSub$.next(true);
+
+    return this.http
+      .post<TestrunStatus>(
+        `${API_URL}/system/start`,
+        JSON.stringify({ device })
+      )
+      .pipe(map(() => true));
+  }
+
+  getVersion(): BehaviorSubject<Version | null> {
+    return this.version;
+  }
+
+  fetchVersion(): void {
+    this.http
+      .get<Version>(`${API_URL}/system/version`)
+      .pipe(retry(1))
+      .subscribe(version => {
+        this.version.next(version);
+      });
+  }
+
+  deleteReport(mac_addr: string, started: string): Observable<boolean> {
+    return this.http
+      .delete<boolean>(`${API_URL}/report`, {
+        body: JSON.stringify({ mac_addr, timestamp: started }),
+      })
+      .pipe(map(() => true));
+  }
+
+  removeReport(mac_addr: string, started: string): void {
+    const idx = this.history.value?.findIndex(
+      report =>
+        report.device.mac_addr === mac_addr && report.started === started
+    );
+    if (typeof idx === 'number') {
+      this.history.value?.splice(idx, 1);
+      this.history.next(this.history.value);
+    }
+  }
+}
diff --git a/modules/ui/src/assets/icons/desktop.svg b/modules/ui/src/assets/icons/desktop.svg
new file mode 100644
index 000000000..1d779ed87
--- /dev/null
+++ b/modules/ui/src/assets/icons/desktop.svg
@@ -0,0 +1,23 @@
+<svg width="298" height="155" viewBox="0 0 298 155" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M62.8398 14H237.29V117.43H62.8398V96.98V14Z" fill="white" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.8398 28.0801H185.65" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.8398 96.6499H237.29" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M72.8191 22.8398C73.6641 22.8398 74.3491 22.1548 74.3491 21.3098C74.3491 20.4648 73.6641 19.7798 72.8191 19.7798C71.9741 19.7798 71.2891 20.4648 71.2891 21.3098C71.2891 22.1548 71.9741 22.8398 72.8191 22.8398Z" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M80.5886 22.8398C81.4336 22.8398 82.1186 22.1548 82.1186 21.3098C82.1186 20.4648 81.4336 19.7798 80.5886 19.7798C79.7436 19.7798 79.0586 20.4648 79.0586 21.3098C79.0586 22.1548 79.7436 22.8398 80.5886 22.8398Z" stroke="#3C4043" stroke-miterlimit="10"/>
+<path d="M127.09 141.49C127.09 141.49 137.7 133.71 138.05 117.43H162.84C163.18 133.7 173.8 141.49 173.8 141.49H127.09Z" fill="#E8EAED" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M163.399 123.14C163.079 121.37 162.869 119.47 162.829 117.43H138.039L163.399 123.14Z" fill="#3C4043" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M222.25 91.7498C240.934 91.7498 256.08 76.6036 256.08 57.9198C256.08 39.236 240.934 24.0898 222.25 24.0898C203.566 24.0898 188.42 39.236 188.42 57.9198C188.42 76.6036 203.566 91.7498 222.25 91.7498Z" fill="#4285F4" stroke="#4285F4" stroke-miterlimit="10"/>
+<path d="M222.25 91.7498C240.934 91.7498 256.08 76.6036 256.08 57.9198C256.08 39.236 240.934 24.0898 222.25 24.0898C203.566 24.0898 188.42 39.236 188.42 57.9198C188.42 76.6036 203.566 91.7498 222.25 91.7498Z" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M244.09 83.75L271.5 117.43" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M47.1595 48.3598C46.7395 38.7598 52.7195 30.5098 60.5495 30.5098C68.3795 30.5098 74.3695 38.7598 73.9395 48.3698L71.1795 110.47H49.9195L47.1595 48.3598Z" fill="#34A853" stroke="#34A853" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.0201 89.6102C21.7801 83.2002 20.2001 73.3802 25.8101 71.3002C33.2901 68.5302 40.4901 75.4802 43.5601 84.0002C46.4201 91.9502 52.4701 110.47 52.4701 110.47H36.2201L25.0201 89.6102Z" fill="#34A853" stroke="#34A853" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M63.4198 110.11L68.1298 44.45C68.1298 35.58 63.7898 30.5 61.0098 30.5C58.5198 30.5 53.2598 36.5 53.2598 44.45L54.8698 110.11" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.8001 110.11C48.8001 110.11 40.4801 88.6202 37.2701 82.1602C33.2501 74.0402 28.0001 70.0802 25.8101 71.3002C23.1701 72.7702 25.0701 79.0502 28.4701 85.9102C31.6901 92.4002 42.8701 110.11 42.8701 110.11" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M54.6295 141.08C71.5395 141.08 85.2395 127.37 85.2395 110.47H24.0195C24.0195 127.37 37.7195 141.08 54.6295 141.08Z" fill="#E8EAED" stroke="#E8EAED" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M284.4 141.49H18.5" stroke="#3C4043" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<mask id="path-17-inside-1_2084_59325" fill="white">
+<path d="M219.442 63.138V61.122C219.442 60.142 219.554 59.302 219.778 58.602C220.03 57.874 220.422 57.188 220.954 56.544C221.514 55.872 222.228 55.13 223.096 54.318C223.712 53.758 224.258 53.226 224.734 52.722C225.21 52.218 225.574 51.686 225.826 51.126C226.106 50.538 226.246 49.88 226.246 49.152C226.246 47.836 225.812 46.758 224.944 45.918C224.104 45.078 222.9 44.658 221.332 44.658C220.324 44.658 219.47 44.868 218.77 45.288C218.07 45.708 217.51 46.24 217.09 46.884C216.67 47.528 216.348 48.172 216.124 48.816L212.848 47.43C213.156 46.562 213.66 45.652 214.36 44.7C215.06 43.748 215.984 42.936 217.132 42.264C218.28 41.592 219.68 41.256 221.332 41.256C223.04 41.256 224.524 41.606 225.784 42.306C227.072 42.978 228.066 43.916 228.766 45.12C229.494 46.296 229.858 47.64 229.858 49.152C229.858 50.328 229.606 51.378 229.102 52.302C228.626 53.226 228.066 54.024 227.422 54.696C226.778 55.34 226.218 55.886 225.742 56.334C225.154 56.866 224.664 57.384 224.272 57.888C223.88 58.392 223.586 58.924 223.39 59.484C223.194 60.044 223.096 60.674 223.096 61.374V63.138H219.442ZM221.29 72.252C220.534 72.252 219.89 72 219.358 71.496C218.854 70.964 218.602 70.32 218.602 69.564C218.602 68.836 218.854 68.22 219.358 67.716C219.89 67.184 220.534 66.918 221.29 66.918C222.018 66.918 222.634 67.184 223.138 67.716C223.67 68.22 223.936 68.836 223.936 69.564C223.936 70.32 223.67 70.964 223.138 71.496C222.634 72 222.018 72.252 221.29 72.252Z"/>
+</mask>
+<path d="M219.442 63.138V61.122C219.442 60.142 219.554 59.302 219.778 58.602C220.03 57.874 220.422 57.188 220.954 56.544C221.514 55.872 222.228 55.13 223.096 54.318C223.712 53.758 224.258 53.226 224.734 52.722C225.21 52.218 225.574 51.686 225.826 51.126C226.106 50.538 226.246 49.88 226.246 49.152C226.246 47.836 225.812 46.758 224.944 45.918C224.104 45.078 222.9 44.658 221.332 44.658C220.324 44.658 219.47 44.868 218.77 45.288C218.07 45.708 217.51 46.24 217.09 46.884C216.67 47.528 216.348 48.172 216.124 48.816L212.848 47.43C213.156 46.562 213.66 45.652 214.36 44.7C215.06 43.748 215.984 42.936 217.132 42.264C218.28 41.592 219.68 41.256 221.332 41.256C223.04 41.256 224.524 41.606 225.784 42.306C227.072 42.978 228.066 43.916 228.766 45.12C229.494 46.296 229.858 47.64 229.858 49.152C229.858 50.328 229.606 51.378 229.102 52.302C228.626 53.226 228.066 54.024 227.422 54.696C226.778 55.34 226.218 55.886 225.742 56.334C225.154 56.866 224.664 57.384 224.272 57.888C223.88 58.392 223.586 58.924 223.39 59.484C223.194 60.044 223.096 60.674 223.096 61.374V63.138H219.442ZM221.29 72.252C220.534 72.252 219.89 72 219.358 71.496C218.854 70.964 218.602 70.32 218.602 69.564C218.602 68.836 218.854 68.22 219.358 67.716C219.89 67.184 220.534 66.918 221.29 66.918C222.018 66.918 222.634 67.184 223.138 67.716C223.67 68.22 223.936 68.836 223.936 69.564C223.936 70.32 223.67 70.964 223.138 71.496C222.634 72 222.018 72.252 221.29 72.252Z" fill="white"/>
+<path d="M219.442 63.138H218.792V63.788H219.442V63.138ZM219.778 58.602L219.164 58.3894L219.161 58.3966L219.159 58.4039L219.778 58.602ZM220.954 56.544L220.455 56.1279L220.453 56.13L220.954 56.544ZM223.096 54.318L222.659 53.837L222.652 53.8433L223.096 54.318ZM224.734 52.722L225.207 53.1683H225.207L224.734 52.722ZM225.826 51.126L225.239 50.8465L225.233 50.8593L225.826 51.126ZM224.944 45.918L224.484 46.3777L224.492 46.3851L224.944 45.918ZM218.77 45.288L218.436 44.7306L218.436 44.7306L218.77 45.288ZM216.124 48.816L215.871 49.4146L216.51 49.6851L216.738 49.0295L216.124 48.816ZM212.848 47.43L212.235 47.2126L212.031 47.7899L212.595 48.0286L212.848 47.43ZM214.36 44.7L214.884 45.0851V45.0851L214.36 44.7ZM217.132 42.264L217.46 42.825L217.46 42.825L217.132 42.264ZM225.784 42.306L225.468 42.8742L225.476 42.8783L225.483 42.8823L225.784 42.306ZM228.766 45.12L228.204 45.4467L228.209 45.4545L228.213 45.4621L228.766 45.12ZM229.102 52.302L228.531 51.9907L228.528 51.9975L228.524 52.0043L229.102 52.302ZM227.422 54.696L227.882 55.1557L227.891 55.1457L227.422 54.696ZM225.742 56.334L226.178 56.8161L226.187 56.8073L225.742 56.334ZM224.272 57.888L223.759 57.4889L224.272 57.888ZM223.39 59.484L224.004 59.6987L223.39 59.484ZM223.096 63.138V63.788H223.746V63.138H223.096ZM219.358 71.496L218.886 71.943L218.898 71.9558L218.911 71.9679L219.358 71.496ZM219.358 67.716L219.818 68.1756L219.358 67.716ZM223.138 67.716L222.666 68.163L222.678 68.1758L222.691 68.1879L223.138 67.716ZM223.138 71.496L222.678 71.0364L223.138 71.496ZM220.092 63.138V61.122H218.792V63.138H220.092ZM220.092 61.122C220.092 60.1883 220.199 59.4188 220.397 58.8001L219.159 58.4039C218.909 59.1852 218.792 60.0957 218.792 61.122H220.092ZM220.392 58.8146C220.617 58.1659 220.968 57.5472 221.455 56.958L220.453 56.13C219.876 56.8288 219.443 57.5821 219.164 58.3894L220.392 58.8146ZM221.453 56.9601C221.991 56.3146 222.685 55.5923 223.54 54.7927L222.652 53.8433C221.771 54.6677 221.037 55.4294 220.455 56.1279L221.453 56.9601ZM223.533 54.799C224.159 54.23 224.717 53.6864 225.207 53.1683L224.261 52.2757C223.799 52.7656 223.265 53.286 222.659 53.837L223.533 54.799ZM225.207 53.1683C225.726 52.6183 226.133 52.0268 226.419 51.3927L225.233 50.8593C225.015 51.3452 224.694 51.8177 224.261 52.2757L225.207 53.1683ZM226.413 51.4055C226.739 50.7204 226.896 49.9652 226.896 49.152H225.596C225.596 49.7948 225.473 50.3556 225.239 50.8465L226.413 51.4055ZM226.896 49.152C226.896 47.6774 226.403 46.425 225.396 45.4509L224.492 46.3851C225.221 47.091 225.596 47.9946 225.596 49.152H226.896ZM225.404 45.4584C224.406 44.4613 223.015 44.008 221.332 44.008V45.308C222.785 45.308 223.802 45.6947 224.484 46.3776L225.404 45.4584ZM221.332 44.008C220.234 44.008 219.258 44.2373 218.436 44.7306L219.104 45.8454C219.682 45.4987 220.414 45.308 221.332 45.308V44.008ZM218.436 44.7306C217.656 45.1981 217.023 45.7974 216.546 46.5289L217.634 47.2391C217.997 46.6826 218.484 46.2179 219.104 45.8454L218.436 44.7306ZM216.546 46.5289C216.1 47.2116 215.753 47.9028 215.51 48.6025L216.738 49.0295C216.943 48.4412 217.24 47.8444 217.634 47.2391L216.546 46.5289ZM216.377 48.2174L213.101 46.8314L212.595 48.0286L215.871 49.4146L216.377 48.2174ZM213.461 47.6474C213.742 46.8535 214.211 45.9995 214.884 45.0851L213.836 44.3149C213.109 45.3045 212.57 46.2705 212.235 47.2126L213.461 47.6474ZM214.884 45.0851C215.525 44.2128 216.379 43.4579 217.46 42.825L216.804 41.703C215.589 42.4141 214.595 43.2832 213.836 44.3149L214.884 45.0851ZM217.46 42.825C218.487 42.2238 219.768 41.906 221.332 41.906V40.606C219.592 40.606 218.073 40.9602 216.804 41.703L217.46 42.825ZM221.332 41.906C222.95 41.906 224.321 42.237 225.468 42.8742L226.1 41.7378C224.727 40.975 223.13 40.606 221.332 40.606V41.906ZM225.483 42.8823C226.667 43.5 227.569 44.3536 228.204 45.4467L229.328 44.7933C228.563 43.4784 227.477 42.456 226.085 41.7297L225.483 42.8823ZM228.213 45.4621C228.872 46.5259 229.208 47.7492 229.208 49.152H230.508C230.508 47.5308 230.116 46.0661 229.319 44.7779L228.213 45.4621ZM229.208 49.152C229.208 50.2322 228.977 51.173 228.531 51.9907L229.673 52.6133C230.235 51.583 230.508 50.4238 230.508 49.152H229.208ZM228.524 52.0043C228.074 52.8791 227.549 53.6244 226.953 54.2463L227.891 55.1457C228.583 54.4236 229.178 53.5729 229.68 52.5997L228.524 52.0043ZM226.962 54.2364C226.321 54.8774 225.766 55.4185 225.297 55.8607L226.187 56.8073C226.67 56.3535 227.235 55.8026 227.882 55.1556L226.962 54.2364ZM225.306 55.852C224.696 56.4036 224.179 56.949 223.759 57.4889L224.785 58.2871C225.149 57.819 225.612 57.3284 226.178 56.816L225.306 55.852ZM223.759 57.4889C223.327 58.0443 222.997 58.6379 222.776 59.2693L224.004 59.6987C224.175 59.2101 224.433 58.7397 224.785 58.2871L223.759 57.4889ZM222.776 59.2693C222.552 59.9094 222.446 60.6137 222.446 61.374H223.746C223.746 60.7343 223.836 60.1786 224.004 59.6987L222.776 59.2693ZM222.446 61.374V63.138H223.746V61.374H222.446ZM223.096 62.488H219.442V63.788H223.096V62.488ZM221.29 71.602C220.694 71.602 220.212 71.4098 219.805 71.0241L218.911 71.9679C219.568 72.5902 220.374 72.902 221.29 72.902V71.602ZM219.83 71.049C219.444 70.6419 219.252 70.1595 219.252 69.564H217.952C217.952 70.4805 218.264 71.2861 218.886 71.943L219.83 71.049ZM219.252 69.564C219.252 69.0043 219.438 68.5548 219.818 68.1756L218.898 67.2564C218.27 67.8852 217.952 68.6677 217.952 69.564H219.252ZM219.818 68.1756C220.227 67.7662 220.705 67.568 221.29 67.568V66.268C220.363 66.268 219.553 66.6018 218.898 67.2564L219.818 68.1756ZM221.29 67.568C221.838 67.568 222.284 67.7596 222.666 68.163L223.61 67.269C222.984 66.6084 222.198 66.268 221.29 66.268V67.568ZM222.691 68.1879C223.094 68.57 223.286 69.0158 223.286 69.564H224.586C224.586 68.6562 224.246 67.87 223.585 67.2441L222.691 68.1879ZM223.286 69.564C223.286 70.1485 223.088 70.6269 222.678 71.0364L223.598 71.9556C224.252 71.3011 224.586 70.4915 224.586 69.564H223.286ZM222.678 71.0364C222.299 71.4156 221.85 71.602 221.29 71.602V72.902C222.186 72.902 222.969 72.5844 223.598 71.9556L222.678 71.0364Z" fill="#4285F4" mask="url(#path-17-inside-1_2084_59325)"/>
+</svg>

From 48ec4717f8a97009665f5bafd8f11c04e0a18db7 Mon Sep 17 00:00:00 2001
From: Jacob Boddey <boddey@google.com>
Date: Thu, 14 Dec 2023 11:28:16 +0000
Subject: [PATCH 2/2] Update heading, remove pass

---
 README.md                               | 2 +-
 modules/test/tls/python/src/tls_util.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d8db6054e..1d0bfa418 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ When manual testing or configuration changes are required, Testrun will provide
  - Internet connection
 ### Software
 - Docker - installation guide: [https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository](https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository)
-### Device
+### Device under test (DUT)
  - DHCP client - The device must be able to obtain an IP address via DHCP
 
 ## Get started ▶️
diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py
index 86eedb604..ff7a79c44 100644
--- a/modules/test/tls/python/src/tls_util.py
+++ b/modules/test/tls/python/src/tls_util.py
@@ -382,7 +382,6 @@ def validate_tls_client(self, client_ip, tls_version, capture_file):
     else:
       LOGGER.info('No client hello packets detected')
       tls_client_details = 'No client hello packets detected'
-      return True, tls_client_details
     return tls_client_valid, tls_client_details
 
   def is_ecdh_and_ecdsa(self, ciphers):