diff --git a/openvidu-insecure-angular/src/app/app.component.html b/openvidu-insecure-angular/src/app/app.component.html
index a75ca08a..21461de9 100644
--- a/openvidu-insecure-angular/src/app/app.component.html
+++ b/openvidu-insecure-angular/src/app/app.component.html
@@ -3,7 +3,7 @@
 	<form (submit)="joinSession()" accept-charset="UTF-8">
 		<p>
 			<label>Participant:</label>
-			<input type="text" name="token" id="token" [(ngModel)]="token" required>
+			<input type="text" name="token" id="participantId" [(ngModel)]="token" required>
 		</p>
 		<p>
 			<label>Session:</label>
@@ -16,8 +16,8 @@
 </div>
 
 <div *ngIf="session">
-	<h2>{{sessionId}}</h2>
-	<input type="button" (click)="leaveSession()" value="Leave session">
+	<h2 id="session-header">{{sessionId}}</h2>
+	<input id="buttonLeaveSession" type="button" (click)="leaveSession()" value="Leave session">
 	<div id="publisher">
 		<div *ngIf="this.localStream">
 			<stream-component [stream]="this.localStream"></stream-component>
diff --git a/openvidu-insecure-angular/src/app/stream.component.ts b/openvidu-insecure-angular/src/app/stream.component.ts
index b4c681fb..099c8b62 100644
--- a/openvidu-insecure-angular/src/app/stream.component.ts
+++ b/openvidu-insecure-angular/src/app/stream.component.ts
@@ -12,8 +12,8 @@ import { Stream } from 'openvidu-browser';
         }`],
     template: `
         <div>
-          <video autoplay="true" [src]="videoSrc"></video>
-          <p>{{this.getNicknameTag()}}</p>
+          <video autoplay="true" [src]="videoSrc" [id]="'native-video-' + this.stream.connection.connectionId + '_webcam'"></video>
+          <p [id]="'data-' + this.stream.connection.connectionId">{{this.getNicknameTag()}}</p>
         </div>`
 })
 export class StreamComponent implements DoCheck {