diff --git a/testcafe/testUtils.ts b/testcafe/elements/muiButton.ts
similarity index 58%
rename from testcafe/testUtils.ts
rename to testcafe/elements/muiButton.ts
index ecdd8bf9..9b3cb43e 100644
--- a/testcafe/testUtils.ts
+++ b/testcafe/elements/muiButton.ts
@@ -1,10 +1,5 @@
 import { Selector } from "testcafe";
 
-// This should work with text inside a Material-UI <Typography>
-export function textExists(titleForIntro1: string) {
-  return Selector("p").withText(titleForIntro1).exists;
-}
-
 // This should work with the label of a Material-UI <Button>
 export function buttonWithText(nextButtonText: string) {
   return Selector("a").withAttribute("role", "button").child().withText(nextButtonText);
diff --git a/testcafe/elements/muiTypography.ts b/testcafe/elements/muiTypography.ts
new file mode 100644
index 00000000..20b31273
--- /dev/null
+++ b/testcafe/elements/muiTypography.ts
@@ -0,0 +1,10 @@
+import { Selector } from "testcafe";
+
+const anythingSelector = Selector(() => {
+  return document.querySelectorAll("*");
+});
+
+// This should work with text inside a Material-UI <Typography>
+export function textExists(titleForIntro1: string) {
+  return Selector(anythingSelector).withText(titleForIntro1).exists;
+}
diff --git a/testcafe/introScreens.spec.ts b/testcafe/introScreens.spec.ts
index 546d998b..f2ccf3b2 100644
--- a/testcafe/introScreens.spec.ts
+++ b/testcafe/introScreens.spec.ts
@@ -1,33 +1,8 @@
 import { Config } from "./testcafe.config";
-import { buttonWithText, textExists } from "./testUtils";
+import { finishIntroScreens } from "./pages/Intro";
 
 fixture`Intro screens test`.page`${Config.baseUrl}`;
 
-test("Finish intro screens", async (t) => {
-  const nextButton = buttonWithText("Weiter");
-
-  const titleForIntro1 = "Willkommen bei der CovMap";
-  const titleForIntro2 = "Was ist die CovMap?";
-  const titleForIntro3 = "Was zeigt mir die CovMap an?";
-  const titleTextForPostalCode = "Für Dein regionales Risiko brauchen wir noch die Postleitzahl Deines Wohnortes";
-
-  await t.takeScreenshot();
-
-  await t.expect(textExists(titleForIntro1)).ok();
-  await t.click(nextButton);
-
-  await t.takeScreenshot();
-  await t.expect(textExists(titleForIntro2)).ok();
-  await t.click(nextButton);
-
-  await t.takeScreenshot();
-  await t.expect(textExists(titleForIntro3)).ok();
-  await t.click(nextButton);
-
-  await t.takeScreenshot();
-  await t.expect(textExists(titleTextForPostalCode)).ok();
-  await t.pressKey("1 2 3 4 5 tab space tab tab enter");
-
-  await t.takeScreenshot();
-  await t.expect(textExists(titleTextForPostalCode)).notOk();
+test("Finish intro screens", async () => {
+  await finishIntroScreens();
 });
diff --git a/testcafe/pages/Intro.ts b/testcafe/pages/Intro.ts
new file mode 100644
index 00000000..e84bbec3
--- /dev/null
+++ b/testcafe/pages/Intro.ts
@@ -0,0 +1,33 @@
+import { t } from "testcafe";
+
+import { textExists } from "../elements/muiTypography";
+import { buttonWithText } from "../elements/muiButton";
+
+export async function finishIntroScreens() {
+  const nextButton = buttonWithText("Weiter");
+
+  const titleForIntro1 = "Willkommen bei der CovMap";
+  const titleForIntro2 = "Was ist die CovMap?";
+  const titleForIntro3 = "Was zeigt mir die CovMap an?";
+  const titleTextForPostalCode = "Für Dein regionales Risiko brauchen wir noch die Postleitzahl Deines Wohnortes";
+
+  await t.takeScreenshot();
+
+  await t.expect(textExists(titleForIntro1)).ok();
+  await t.click(nextButton);
+
+  await t.takeScreenshot();
+  await t.expect(textExists(titleForIntro2)).ok();
+  await t.click(nextButton);
+
+  await t.takeScreenshot();
+  await t.expect(textExists(titleForIntro3)).ok();
+  await t.click(nextButton);
+
+  await t.takeScreenshot();
+  await t.expect(textExists(titleTextForPostalCode)).ok();
+  await t.pressKey("1 2 3 4 5 tab space tab tab enter");
+
+  await t.takeScreenshot();
+  await t.expect(textExists(titleTextForPostalCode)).notOk();
+}
diff --git a/testcafe/pages/MainMap.ts b/testcafe/pages/MainMap.ts
new file mode 100644
index 00000000..4be76ea0
--- /dev/null
+++ b/testcafe/pages/MainMap.ts
@@ -0,0 +1,17 @@
+import { Selector } from "testcafe";
+
+export const searchField = Selector("#autocomplete").withAttribute("placeholder", "PLZ oder Landkreis");
+
+export const expandInfoBoxIcon = Selector("button")
+  .withAttribute("aria-label", "show more")
+  .withAttribute("aria-expanded", "false");
+export const shrinkInfoBoxIcon = Selector("button")
+  .withAttribute("aria-label", "show more")
+  .withAttribute("aria-expanded", "true");
+
+export const openHamburgerMenu = Selector("button")
+  .withAttribute("aria-label", "Main Menu")
+  .withAttribute("aria-controls", "menu-appbar");
+export const closeHamburgerMenu = Selector("button")
+  .withAttribute("aria-label", "Close Main Menu")
+  .withAttribute("aria-controls", "menu-appbar");
diff --git a/testcafe/searchField.spec.ts b/testcafe/searchField.spec.ts
index 73b10faf..eaa14bf4 100644
--- a/testcafe/searchField.spec.ts
+++ b/testcafe/searchField.spec.ts
@@ -1,79 +1,55 @@
-import { Console } from "console";
-import { Selector } from "testcafe";
 import { Config } from "./testcafe.config";
+import { finishIntroScreens } from "./pages/Intro";
+import {
+  closeHamburgerMenu,
+  expandInfoBoxIcon,
+  openHamburgerMenu,
+  searchField,
+  shrinkInfoBoxIcon,
+} from "./pages/MainMap";
+import { textExists } from "./elements/muiTypography";
 
 fixture`Search field test`.page`${Config.baseUrl}`
-    .beforeEach( async t => {
-        const nextButton = Selector("a").withAttribute("role", "button").child().withText("Weiter");
-        const websiteText = Selector("html").textContent;
-        const titleForIntro1 = "Willkommen bei der CovMap";
-        const titleForIntro2 = "Was ist die CovMap?";
-        const titleForIntro3 = "Was zeigt mir die CovMap an?";
-        const titleTextForPostalCode = "Für Dein regionales Risiko brauchen wir noch die Postleitzahl Deines Wohnortes";
-        
-        await t.expect(websiteText).contains(titleForIntro1)
-               .click(nextButton);
-        await t.expect(websiteText).contains(titleForIntro2)
-               .click(nextButton);
-        await t.expect(websiteText).contains(titleForIntro3)
-               .click(nextButton);
-        await t.expect(websiteText).contains(titleTextForPostalCode)
-               .pressKey("1 0 1 1 5 tab space tab tab enter");
-        await t.expect(websiteText).notContains(titleTextForPostalCode);
-    })
-    .afterEach( async t => {
-        // place holder
-    });
+  .beforeEach(async () => {
+    await finishIntroScreens();
+  })
+  .afterEach(async () => {
+    // place holder
+  });
 
 test("find search field", async (t) => {
-    var searchField = Selector('#autocomplete').withAttribute("placeholder", "PLZ oder Landkreis")
-    await t.click(searchField)
-           .typeText(searchField, "Stuttgart").pressKey("enter");
-    // wait until the map has scrolled.
-    await t.wait(1000);
+  await t.click(searchField).typeText(searchField, "Stuttgart").pressKey("enter");
 
-    // open panel for risk description
-    var riskButton = Selector('button').withAttribute("aria-label", "show more").withAttribute("aria-expanded","false")
-    const websiteText = Selector("html").textContent;
-    await t.takeScreenshot()
-           .click(riskButton)
-           .expect(websiteText).contains("Kontaktverhalten der Bevölkerung");
+  // wait until the map has scrolled.
+  await t.wait(1000);
+  await t.takeScreenshot();
 
-    // close panel for risk description
-    var closeRiskButton = Selector('button').withAttribute("aria-label", "show more").withAttribute("aria-expanded","true")
-    // console.log("close button"+(await closeRiskButton.textContent) + " " + closeRiskButton.count);
-    await t.expect(closeRiskButton.nth(1).exists).ok("can not find closing button for risk panel");
-    // need to access the second element for closing.
-    await t.click(closeRiskButton.nth(1))
-           .expect(websiteText).notContains("Kontaktverhalten der Bevölkerung")
-           .takeScreenshot();
+  // open panel for risk description
+  await t.click(expandInfoBoxIcon).expect(textExists("Kontaktverhalten der Bevölkerung")).ok();
+
+  // close panel for risk description
+  await t.click(shrinkInfoBoxIcon).expect(textExists("Kontaktverhalten der Bevölkerung")).notOk();
+  await t.takeScreenshot();
 });
 
 test("Hamburger menu", async (t) => {
+  // open panel and check if close button is visible, hamburger menu should be invisible
+  await t
+    .expect(closeHamburgerMenu.visible)
+    .notOk()
+    .takeScreenshot()
+    .click(openHamburgerMenu)
+    .expect(textExists("Über die CovMap"))
+    .ok();
+  // the hamburger menu will not be made invisible when the panel is visible, so the assertion do not works.
+  // .expect(openHamburgerMenu.visible).notOk();
 
-    const websiteText = Selector("html").textContent;
-    // open menu panel
-    var openHamburgerMenu = Selector('button').withAttribute("aria-label", "Main Menu").withAttribute("aria-controls","menu-appbar")
-    var closeHamburgerMenu = Selector('button').withAttribute("aria-label", "Close Main Menu").withAttribute("aria-controls","menu-appbar")
-
-    // console.log("websiteText "+ (await closeHamburgerMenu.textContent)+" "+(await closeHamburgerMenu.visible));
-    
-    // open panel and check if close button is visible, hamburger menu should be invisible
-    await t.expect(closeHamburgerMenu.visible).notOk()
-           .takeScreenshot()
-           .click(openHamburgerMenu)
-           .expect(websiteText).contains("Über die CovMap");
-           // the hamburger menu will not be made invisible when the panel is visible, so the assertion do not works.
-           // .expect(openHamburgerMenu.visible).notOk();
-
-    await t.takeScreenshot();
+  await t.takeScreenshot();
 
-    // console.log("websiteText "+ (await closeHamburgerMenu.textContent)+" "+(await closeHamburgerMenu.visible));
+  // console.log("websiteText "+ (await closeHamburgerMenu.textContent)+" "+(await closeHamburgerMenu.visible));
 
-    // close menu panel and check if hamburger menu is visible
-    await t.click(closeHamburgerMenu)
-           .expect(closeHamburgerMenu.visible).notOk()
-           .expect(openHamburgerMenu.visible).ok();
+  // close menu panel and check if hamburger menu is visible
+  await t.click(closeHamburgerMenu).expect(closeHamburgerMenu.visible).notOk().expect(openHamburgerMenu.visible).ok();
 
-    await t.takeScreenshot();
+  await t.takeScreenshot();
 });