diff --git a/frontend/tests/log.spec.ts b/frontend/tests/log.spec.ts
index 626a597..e8d8f97 100644
--- a/frontend/tests/log.spec.ts
+++ b/frontend/tests/log.spec.ts
@@ -18,16 +18,20 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
     await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
-  await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
+  await page.getByRole('button', { name: 'Remove item:' }).click(); // remove pre-filled cox2
   await page.getByPlaceholder("Ruderer auswählen").click();
   await page.getByRole("option", { name: "rower2" }).click();
   await page.getByRole("option", { name: "cox2" }).click();
-  await expect(page.getByRole("listbox")).toContainText(
+  await expect(page.locator("#form")).toContainText(
     "Nur 2 Ruderer können hinzugefügt werden",
   );
+
   await expect(page.locator("#shipmaster-newrowerjs")).toContainText("cox");
   await expect(page.locator("#steering_person-newrowerjs")).toContainText(
-    "rower2 cox",
+    "rower2",
+  );
+  await expect(page.locator("#steering_person-newrowerjs")).toContainText(
+    "cox2",
   );
   await page.getByRole("button", { name: "Ausfahrt eintragen" }).click();
   await expect(page.locator("body")).toContainText(
@@ -60,11 +64,11 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
     await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
-  await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
+  await page.getByRole('button', { name: 'Remove item:' }).click(); // remove pre-filled cox2
   await page.getByPlaceholder("Ruderer auswählen").click();
   await page.getByRole("option", { name: "rower2" }).click();
   await page.getByRole("option", { name: "cox2" }).click();
-  await expect(page.getByRole("listbox")).toContainText(
+  await expect(page.locator("#form")).toContainText(
     "Nur 2 Ruderer können hinzugefügt werden",
   );
 
@@ -79,8 +83,12 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
 
   await expect(page.locator("#shipmaster-newrowerjs")).toContainText("cox");
   await expect(page.locator("#steering_person-newrowerjs")).toContainText(
-    "rower2 cox",
+    "rower2",
   );
+  await expect(page.locator("#steering_person-newrowerjs")).toContainText(
+    "cox",
+  );
+
   await page.getByRole("button", { name: "Ausfahrt eintragen" }).click();
   await expect(page.locator("body")).toContainText(
     "Ausfahrt erfolgreich hinzugefügt",