diff --git a/.github/workflows/deploy-docker-to-tst.yml b/.github/workflows/deploy-docker-to-tst.yml
index 8651236..9f06598 100644
--- a/.github/workflows/deploy-docker-to-tst.yml
+++ b/.github/workflows/deploy-docker-to-tst.yml
@@ -25,15 +25,21 @@ jobs:
           name: version
           path: version.txt
       - name: Notify Mattermost via Bot
+        env:
+          VERSION: ${{ VERSION }}
+          REPO: ${{ gitea.repository }}
+          BRANCH: ${{ gitea.ref }}
+          MATTERMOST_BOT_TOKEN: ${{ secrets.MATTERMOST_BOT_TOKEN }}
         run: |
-          curl --fail -X POST -H "Authorization: Bearer tspcwdn5rbdk8kkmnex6h1nfha" \
+          curl --fail -X POST -H "Authorization: Bearer $MATTERMOST_BOT_TOKEN" \
           -H 'Content-Type: application/json' \
           -d '{
                 "channel_id": "9a8obynkd7rctk6qf8rfe6oppy",
-                "message": "@all \n🚀 *Build gestart!* Een nieuwe build [${{VERSION}}-SNAPSHOT] is begonnen voor de repository *${{ gitea.repository }}* op branch *${{ gitea.ref }}*."
+                "message": "@all 🚀 *Build gestart!* Een nieuwe build ['"$VERSION"'-SNAPSHOT] is begonnen voor de repository *'"$REPO"'* op branch *'"$BRANCH"'*."
               }' \
           https://mattermost.melvanveen.nl/api/v4/posts
 
+
       # Stap 3: Inloggen bij Docker Hub
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -94,11 +100,13 @@ jobs:
             docker image prune -f
 
       - name: Notify Mattermost via Bot
+        env:
+          VERSION: ${{ VERSION }}
         run: |
           curl --fail -X POST -H "Authorization: Bearer tspcwdn5rbdk8kkmnex6h1nfha" \
           -H 'Content-Type: application/json' \
           -d '{
                 "channel_id": "9a8obynkd7rctk6qf8rfe6oppy",
-                "message": "@all \n✅ *Build is geslaagd!* Er staat een nieuwe versie klaar op https://test-paypoint.melvanveen.nl"
+                "message": "@all ✅ *Build is geslaagd!* Versie '"$VERSION"'-SNAPSHOT staat klaar op https://test-paypoint.melvanveen.nl"
               }' \
           https://mattermost.melvanveen.nl/api/v4/posts
diff --git a/src/app/components/details/details.component.html b/src/app/components/details/details.component.html
index 9e1380a..fc0edc0 100644
--- a/src/app/components/details/details.component.html
+++ b/src/app/components/details/details.component.html
@@ -32,6 +32,7 @@
     tuiButton
     iconStart="@tui.pencil"
     size="s"
+    id="bewerkAfspraak"
     (click)="showEditModal = true"
     type="button">
     Bewerken
@@ -41,6 +42,7 @@
     tuiButton
     iconStart="@tui.trash-2"
     size="s"
+    id="verwijderAfspraak"
     (click)="showDeleteModal = true"
     type="button">
     Verwijderen
@@ -59,6 +61,7 @@
       appearance="outline"
       tuiButton
       size="s"
+      id="bevestigAfspraakVerwijderen"
       (click)="deleteAppointment()"
       type="button">
       Ja, afspraak verwijderen
@@ -67,6 +70,7 @@
       appearance="outline"
       tuiButton
       size="s"
+      id="annuleerAfspraakVerwijderen"
       (click)="showDeleteModal = false"
       type="button">
       Nee, ga terug
diff --git a/src/app/components/edit-item/edit-item.component.html b/src/app/components/edit-item/edit-item.component.html
index 1737078..b289940 100644
--- a/src/app/components/edit-item/edit-item.component.html
+++ b/src/app/components/edit-item/edit-item.component.html
@@ -5,6 +5,7 @@
       tuiTextfieldLegacy
       formControlName="title"
       type="text"
+      id="titelBewerken"
     />
   </tui-input>
   <div
@@ -17,6 +18,7 @@
       appearance="outline"
       tuiButton
       size="s"
+      [id]="action + '-bewerken'"
       (click)="addAction(action)"
       type="button">{{ action }}
     </button>
@@ -27,6 +29,7 @@
     <tui-combo-box
       [formControl]="control"
       [stringify]="stringify"
+      id="klantBewerken"
       tuiTextfieldSize="m">
       Klant
       <tui-data-list-wrapper
@@ -38,6 +41,7 @@
     <button
       size="m"
       tuiButton
+      id="nieuweKlantBewerken"
       (click)="toggleCustomerModal()"
       iconStart="@tui.plus"
       type="button">
@@ -53,6 +57,7 @@
         formControlName="date"
         tuiTextfieldSize="m"
         class="tui-space_vertical-4"
+        id="datumBewerken"
         [tuiTextfieldLabelOutside]="false"
       >
         Datum
@@ -63,6 +68,7 @@
         formControlName="startTime"
         tuiTextfieldSize="m"
         class="tui-space_top-2"
+        id="vanBewerken"
         [tuiTextfieldLabelOutside]="false">
         Van
       </tui-input-time>
@@ -72,6 +78,7 @@
         formControlName="endTime"
         tuiTextfieldSize="m"
         class="tui-space_top-2"
+        id="totBewerken"
         [tuiTextfieldLabelOutside]="false"
       >
         Tot
@@ -79,12 +86,13 @@
     </div>
   </div>
   <br>
-  <tui-textarea formControlName="notes">Notities</tui-textarea>
+  <tui-textarea formControlName="notes" id="notitiesBewerken">Notities</tui-textarea>
 </form>
 <br>
 <button
   size="m"
   tuiButton
+  id="afspraakBewerken"
   type="button" (click)="updateAppointment()"
   [tuiAppearanceState]="formIsValid()">
   Afspraak bewerken
@@ -95,54 +103,51 @@
     <tui-input
       formControlName="firstName"
       tuiTextfieldSize="m"
-      [tuiTextfieldCleaner]="true"
-    >
+      id="voornaam-nieuwe-klant"
+      [tuiTextfieldCleaner]="true">
       Voornaam
       <input
         tuiTextfieldLegacy
         type="text"
-        formControlName="firstName"
-      />
+        formControlName="firstName"/>
     </tui-input>
     <br>
-
     <tui-input
       formControlName="lastName"
       tuiTextfieldSize="m"
-      [tuiTextfieldCleaner]="true"
-    >
+      id="achternaam-nieuwe-klant"
+      [tuiTextfieldCleaner]="true">
       Achternaam
       <input
         tuiTextfieldLegacy
         type="text"
-        formControlName="lastName"
-      />
+        formControlName="lastName"/>
     </tui-input>
     <br>
     <tui-input
       formControlName="email"
       tuiTextfieldSize="m"
-      [tuiTextfieldCleaner]="true"
-    >
+      id="email-nieuwe-klant"
+      [tuiTextfieldCleaner]="true">
       Email
       <input
         tuiTextfieldLegacy
         autocomplete="email"
         type="email"
-        formControlName="email"
-      />
+        formControlName="email"/>
     </tui-input>
     <br>
     <button
       appearance="secondary"
       size="m"
       tuiButton
+      id="klant-toevoegen"
+      [loading]=waiting
       (click)="saveCustomer()"
       type="button">
       <tui-icon
         icon="@tui.plus"
-        [style.height.rem]="1"
-      />
+        [style.height.rem]="1"/>
       Klant toevoegen
     </button>
   </form>
diff --git a/src/app/components/edit-item/edit-item.component.ts b/src/app/components/edit-item/edit-item.component.ts
index f33a41d..84ef2a9 100644
--- a/src/app/components/edit-item/edit-item.component.ts
+++ b/src/app/components/edit-item/edit-item.component.ts
@@ -13,7 +13,12 @@ import {
 import {Appointment} from '../../models/appointment';
 import {TuiDay, TuiTime} from '@taiga-ui/cdk';
 import {AppointmentService} from '../../services/appointment.service';
-import {TuiDataListWrapperComponent, TuiFilterByInputPipe, TuiStringifyContentPipe} from '@taiga-ui/kit';
+import {
+  TuiButtonLoading,
+  TuiDataListWrapperComponent,
+  TuiFilterByInputPipe,
+  TuiStringifyContentPipe
+} from '@taiga-ui/kit';
 import {Customer} from '../../models/customer';
 import {CustomerService} from '../../services/customer.service';
 import {ModalComponent} from '../modal/modal.component';
@@ -36,7 +41,8 @@ import {ModalComponent} from '../modal/modal.component';
     TuiStringifyContentPipe,
     TuiFilterByInputPipe,
     ModalComponent,
-    TuiIcon
+    TuiIcon,
+    TuiButtonLoading
   ],
   templateUrl: './edit-item.component.html',
   styleUrl: './edit-item.component.scss'
diff --git a/src/app/components/modal/modal.component.html b/src/app/components/modal/modal.component.html
index 93e0209..72ad70e 100644
--- a/src/app/components/modal/modal.component.html
+++ b/src/app/components/modal/modal.component.html
@@ -8,6 +8,7 @@
       size="xs"
       tuiIconButton
       type="button"
+      id="sluitModal"
       [style.border-radius.%]="100"
       (click)="closeModal()"
     >
diff --git a/src/app/pages/agenda/agenda.component.html b/src/app/pages/agenda/agenda.component.html
index d94ae96..b992259 100644
--- a/src/app/pages/agenda/agenda.component.html
+++ b/src/app/pages/agenda/agenda.component.html
@@ -5,21 +5,24 @@
       iconStart="@tui.chevron-left"
       size="m"
       tuiIconButton
+      id="vorigeDag"
       (click)="previousDay()"
       type="button">
     </button>
-    <h1 class="date" (click)="toggleCalendar()">{{ getDate() }}</h1>
+    <h1 class="date" id="geselecteerdeDatum" (click)="toggleCalendar()">{{ getDate() }}</h1>
     <button
       appearance="primary"
       iconStart="@tui.chevron-right"
       size="m"
       tuiIconButton
+      id="volgendeDag"
       (click)="nextDay()"
       type="button">
     </button>
   </div>
   <div class="calendar" *ngIf="showCalendar">
     <tui-calendar
+      id="calenderDatum"
       [value]="value"
       (dayClick)="onDayClick($event)"
     />
@@ -30,6 +33,7 @@
       appearance="secondary"
       size="m"
       tuiButton
+      id="vandaag"
       (click)="setToday()"
       type="button">
       Vandaag
@@ -38,6 +42,7 @@
       appearance="secondary"
       size="m"
       tuiButton
+      id="afspraakMaken"
       (click)="isModalOpen = true"
       type="button">
       <tui-icon
@@ -54,6 +59,7 @@
 
         <div *ngFor="let appointment of getAppointmentsForHour(hour)"
              class="appointment"
+             [attr.id]="'afspraak-'+appointment.id"
              (click)="selectAppointment(appointment)"
              [ngClass]="{ 'large': (getAppointmentHeight(appointment) > 50) }"
              [ngStyle]="getInlineStyles(appointment)">
diff --git a/src/app/pages/klanten/klanten.component.html b/src/app/pages/klanten/klanten.component.html
index 5186ace..41ec7ce 100644
--- a/src/app/pages/klanten/klanten.component.html
+++ b/src/app/pages/klanten/klanten.component.html
@@ -8,6 +8,7 @@
         size="m"
         tuiButton
         appearance="secondary"
+        id="klantToevoegen"
         type="button"
         (click)="toggleCustomerModal()"
       >
@@ -26,7 +27,7 @@
       </tr>
       </thead>
       <tbody>
-      <tr *ngFor="let customer of customers" (click)="selectCustomer(customer)">
+      <tr *ngFor="let customer of customers" (click)="selectCustomer(customer)" [id]="customer.id">
         <td>{{ customer.firstName }} {{ customer.lastName }}</td>
         <td>{{ customer.email }}</td>
       </tr>
@@ -47,6 +48,7 @@
       <input
         tuiTextfieldLegacy
         type="text"
+        id="input-voornaam"
         formControlName="firstName"
       />
     </tui-input>
@@ -61,6 +63,7 @@
       <input
         tuiTextfieldLegacy
         type="text"
+        id="input-achternaam"
         formControlName="lastName"
       />
     </tui-input>
@@ -74,6 +77,7 @@
       <input
         tuiTextfieldLegacy
         autocomplete="email"
+        id="input-email"
         type="email"
         formControlName="email"
       />
@@ -83,6 +87,7 @@
       appearance="secondary"
       size="m"
       tuiButton
+      id="opslaanKlant"
       (click)="saveCustomer()"
       [disabled]="customerForm.invalid"
       type="button">