diff --git a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
index bdd8a75245..24812a6b32 100644
--- a/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
+++ b/agenta-web/cypress/e2e/exact-match-evaluation.cy.ts
@@ -49,6 +49,9 @@ describe("Exact Match Evaluation workflow", () => {
                     // Check if the text contains either "correct" or "wrong"
                     expect(text.includes("correct") || text.includes("wrong")).to.be.true
                 })
+
+            cy.get(".ant-statistic-content-value").first().should("contain", "3 out of 3")
+            cy.get(".ant-message-notice-content").should("exist")
         })
 
         it("Should display Exact Match Evaluation result", () => {
diff --git a/agenta-web/cypress/support/commands/evaluations.ts b/agenta-web/cypress/support/commands/evaluations.ts
index c96c984e84..71c47a5e99 100644
--- a/agenta-web/cypress/support/commands/evaluations.ts
+++ b/agenta-web/cypress/support/commands/evaluations.ts
@@ -33,7 +33,7 @@ Cypress.Commands.add("createVariant", () => {
         })
     })
 
-    cy.get('[data-cy="create-app-button"]').first().click()
+    cy.get('[data-cy^="create-app-button"]').eq(1).click()
     const appName = randString(5)
 
     cy.get('[data-cy="enter-app-name-modal"]')
@@ -64,7 +64,7 @@ Cypress.Commands.add("createVariantsAndTestsets", () => {
     cy.get('[data-cy="testset-name-input"]').type(testsetName)
     cy.wrap(testsetName).as("testsetName")
 
-    cy.get(".ag-row").should("be.visible").should("have.length", 3)
+    cy.get(".ag-row").should("have.length", 3)
     countries.forEach((country, index) => {
         cy.get(`.ag-center-cols-container .ag-row[row-index="${index}"]`).within(() => {
             cy.get(".ag-cell").eq(1).type(country.country)