diff --git a/src/frontend/src/components/dropdownComponent/index.tsx b/src/frontend/src/components/dropdownComponent/index.tsx
index 983ee4cf0..4afdc351e 100644
--- a/src/frontend/src/components/dropdownComponent/index.tsx
+++ b/src/frontend/src/components/dropdownComponent/index.tsx
@@ -43,7 +43,7 @@ export default function Dropdown({
                 role="combobox"
                 ref={refButton}
                 aria-expanded={open}
-                data-test={`${id ?? ""}`}
+                data-testid={`${id ?? ""}`}
                 className={cn(
                   editNode
                     ? "dropdown-component-outline"
@@ -52,9 +52,11 @@ export default function Dropdown({
                   editNode ? "input-edit-node" : "py-2"
                 )}
               >
-                {value
-                  ? options.find((option) => option === value)
-                  : "Choose an option..."}
+                <span data-testid={`value-${id ?? ""}`}>
+                  {value
+                    ? options.find((option) => option === value)
+                    : "Choose an option..."}
+                </span>
                 <ForwardedIconComponent
                   name="ChevronsUpDown"
                   className="ml-2 h-4 w-4 shrink-0 opacity-50"
diff --git a/src/frontend/tests/end-to-end/chat_io.spec.ts b/src/frontend/tests/end-to-end/chat_io.spec.ts
index b37ebfede..2e85bc11d 100644
--- a/src/frontend/tests/end-to-end/chat_io.spec.ts
+++ b/src/frontend/tests/end-to-end/chat_io.spec.ts
@@ -13,6 +13,12 @@ test("chat_io_teste", async ({ page }) => {
     "utf-8"
   );
 
+  await page.locator('//*[@id="new-project-btn"]').click();
+  await page.waitForTimeout(2000);
+
+  await page.getByTestId("blank-flow").click();
+  await page.waitForTimeout(2000);
+
   // Create the DataTransfer and File
   const dataTransfer = await page.evaluateHandle((data) => {
     const dt = new DataTransfer();
@@ -24,12 +30,6 @@ test("chat_io_teste", async ({ page }) => {
     return dt;
   }, jsonContent);
 
-  await page.locator('//*[@id="new-project-btn"]').click();
-  await page.waitForTimeout(2000);
-
-  await page.getByTestId("blank-flow").click();
-  await page.waitForTimeout(2000);
-
   // Now dispatch
   await page.dispatchEvent(
     '//*[@id="react-flow-id"]/div[1]/div[1]/div',
diff --git a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
index 466af8aaa..08f46e11c 100644
--- a/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/codeAreaModalComponent.spec.ts
@@ -20,7 +20,17 @@ test("CodeAreaModalComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("div-generic-node").click();
   await page.getByTestId("code-button-modal").click();
 
@@ -47,6 +57,8 @@ test("CodeAreaModalComponent", async ({ page }) => {
   await page.locator("textarea").fill(wCode);
   await page.locator("textarea").fill(code);
   await page.locator('//*[@id="checkAndSaveBtn"]').click();
+  await page.waitForTimeout(1000);
+
   expect(await page.getByText("Code is ready to run").isVisible()).toBeTruthy();
   await page.getByTestId("code-button-modal").click();
   expect(await page.locator('//*[@id="codeValue"]').inputValue()).toBe(
diff --git a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
index 7d0f52d36..e009a5179 100644
--- a/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/dropdownComponent.spec.ts
@@ -16,33 +16,49 @@ test("dropDownComponent", async ({ page }) => {
   await page.waitForTimeout(1000);
 
   await page
-    .getByTestId("model_specsAmazon Bedrock")
+    .getByTestId("modelsAmazon Bedrock")
     .first()
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
-  await page.getByTestId("dropdown-model_id-display").click();
-  await page.getByTestId("ai21.j2-grande-instruct-0-option").click();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
-  let value = await page.getByTestId("dropdown-model_id-display").innerText();
-  if (value !== "ai21.j2-grande-instruct") {
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+  await page.getByTestId("title-Amazon Bedrock").click();
+
+  await page.getByTestId("dropdown-model_id").click();
+
+  await page.getByTestId("ai21.j2-mid-v1-10-option").click();
+
+  let value = await page
+    .getByTestId("value-dropdown-model_id")
+    .first()
+    .innerText();
+  if (value !== "ai21.j2-mid-v1") {
     expect(false).toBeTruthy();
   }
 
-  await page.getByTestId("dropdown-model_id-display").click();
-  await page.getByTestId("ai21.j2-jumbo-instruct-1-option").click();
+  await page.getByTestId("dropdown-model_id").click();
+  await page.getByTestId("anthropic.claude-v2:1-6-option").click();
 
-  value = await page.getByTestId("dropdown-model_id-display").innerText();
-  if (value !== "ai21.j2-jumbo-instruct") {
+  value = await page.getByTestId("dropdown-model_id").innerText();
+  if (value !== "anthropic.claude-v2:1") {
     expect(false).toBeTruthy();
   }
 
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
-  value = await page.getByTestId("dropdown-edit-model_id-display").innerText();
-  if (value !== "ai21.j2-jumbo-instruct") {
+  value = await page.getByTestId("dropdown-edit-model_id").innerText();
+  if (value !== "anthropic.claude-v2:1") {
     expect(false).toBeTruthy();
   }
 
@@ -92,16 +108,6 @@ test("dropDownComponent", async ({ page }) => {
     await page.locator('//*[@id="showregion_name"]').isChecked()
   ).toBeTruthy();
 
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeFalsy();
-
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeTruthy();
-
   // showmodel_id
   await page.locator('//*[@id="showmodel_id"]').click();
   expect(await page.locator('//*[@id="showmodel_id"]').isChecked()).toBeFalsy();
@@ -158,15 +164,11 @@ test("dropDownComponent", async ({ page }) => {
     await page.locator('//*[@id="showregion_name"]').isChecked()
   ).toBeTruthy();
 
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeFalsy();
+  await page.locator('//*[@id="showstream"]').click();
+  expect(await page.locator('//*[@id="showstream"]').isChecked()).toBeFalsy();
 
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeTruthy();
+  await page.locator('//*[@id="showstream"]').click();
+  expect(await page.locator('//*[@id="showstream"]').isChecked()).toBeTruthy();
 
   // showmodel_id
   await page.locator('//*[@id="showmodel_id"]').click();
@@ -178,18 +180,18 @@ test("dropDownComponent", async ({ page }) => {
     await page.locator('//*[@id="showmodel_id"]').isChecked()
   ).toBeTruthy();
 
-  await page.getByTestId("dropdown-edit-model_id-display").click();
-  await page.getByTestId("ai21.j2-ultra-v1-5-option").click();
+  await page.getByTestId("dropdown-edit-model_id").click();
+  await page.getByTestId("ai21.j2-mid-v1-10-option").click();
 
-  value = await page.getByTestId("dropdown-edit-model_id-display").innerText();
-  if (value !== "ai21.j2-ultra-v1") {
+  value = await page.getByTestId("dropdown-edit-model_id").innerText();
+  if (value !== "ai21.j2-mid-v1") {
     expect(false).toBeTruthy();
   }
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  value = await page.getByTestId("dropdown-model_id-display").innerText();
-  if (value !== "ai21.j2-ultra-v1") {
+  value = await page.getByTestId("dropdown-model_id").innerText();
+  if (value !== "ai21.j2-mid-v1") {
     expect(false).toBeTruthy();
   }
   await page.getByTestId("code-button-modal").click();
diff --git a/src/frontend/tests/end-to-end/filterEdge.spec.ts b/src/frontend/tests/end-to-end/filterEdge.spec.ts
index 0d18c7781..bcd3df2df 100644
--- a/src/frontend/tests/end-to-end/filterEdge.spec.ts
+++ b/src/frontend/tests/end-to-end/filterEdge.spec.ts
@@ -19,7 +19,17 @@ test("LLMChain - Tooltip", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTitle("fit view").click();
 
   await page
@@ -104,7 +114,17 @@ test("LLMChain - Filter", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTitle("fit view").click();
 
   await page.waitForTimeout(500);
@@ -125,7 +145,7 @@ test("LLMChain - Filter", async ({ page }) => {
   await expect(page.getByTestId("disclosure-models")).toBeVisible();
   await expect(page.getByTestId("disclosure-model specs")).toBeVisible();
 
-  await expect(page.getByTestId("modelsAzureOpenAI")).toBeVisible();
+  await expect(page.getByTestId("modelsAzure OpenAI")).toBeVisible();
   await expect(page.getByTestId("model_specsAmazon Bedrock")).toBeVisible();
   await expect(page.getByTestId("model_specsAnthropic")).toBeVisible();
   await expect(page.getByTestId("model_specsAnthropicLLM")).toBeVisible();
@@ -136,14 +156,12 @@ test("LLMChain - Filter", async ({ page }) => {
   await expect(page.getByTestId("model_specsChatOpenAI")).toBeVisible();
   await expect(page.getByTestId("model_specsChatVertexAI")).toBeVisible();
   await expect(page.getByTestId("model_specsCohere")).toBeVisible();
-  await expect(page.getByTestId("model_specsCTransformers")).toBeVisible();
   await expect(
     page.getByTestId("model_specsGoogle Generative AI")
   ).toBeVisible();
   await expect(
     page.getByTestId("model_specsHugging Face Inference API")
   ).toBeVisible();
-  await expect(page.getByTestId("model_specsLlamaCpp")).toBeVisible();
   await expect(page.getByTestId("model_specsOllama")).toBeVisible();
   await expect(
     page.getByTestId("model_specsQianfanChatEndpoint")
@@ -156,7 +174,7 @@ test("LLMChain - Filter", async ({ page }) => {
   await expect(page.getByTestId("model_specsVertexAI")).not.toBeVisible();
   await expect(page.getByTestId("model_specsCTransformers")).not.toBeVisible();
   await expect(page.getByTestId("model_specsAmazon Bedrock")).not.toBeVisible();
-  await expect(page.getByTestId("modelsAzureOpenAI")).not.toBeVisible();
+  await expect(page.getByTestId("modelsAzure OpenAI")).not.toBeVisible();
   await expect(page.getByTestId("model_specsAnthropic")).not.toBeVisible();
   await expect(page.getByTestId("model_specsAnthropicLLM")).not.toBeVisible();
   await expect(
@@ -204,23 +222,19 @@ test("LLMChain - Filter", async ({ page }) => {
 
   await expect(
     page.getByTestId("memoriesConversationBufferMemory")
-  ).not.toBeVisible();
+  ).toBeVisible();
   await expect(
     page.getByTestId("memoriesConversationBufferWindowMemory")
-  ).not.toBeVisible();
+  ).toBeVisible();
   await expect(
     page.getByTestId("memoriesConversationEntityMemory")
-  ).not.toBeVisible();
-  await expect(
-    page.getByTestId("memoriesConversationKGMemory")
-  ).not.toBeVisible();
-  await expect(
-    page.getByTestId("memoriesConversationKGMemory")
-  ).not.toBeVisible();
+  ).toBeVisible();
+  await expect(page.getByTestId("memoriesConversationKGMemory")).toBeVisible();
+  await expect(page.getByTestId("memoriesConversationKGMemory")).toBeVisible();
   await expect(
     page.getByTestId("memoriesConversationSummaryMemory")
-  ).not.toBeVisible();
+  ).toBeVisible();
   await expect(
     page.getByTestId("memoriesVectorStoreRetrieverMemory")
-  ).not.toBeVisible();
+  ).toBeVisible();
 });
diff --git a/src/frontend/tests/end-to-end/floatComponent.spec.ts b/src/frontend/tests/end-to-end/floatComponent.spec.ts
index 95e3478e8..d754e0576 100644
--- a/src/frontend/tests/end-to-end/floatComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/floatComponent.spec.ts
@@ -11,15 +11,37 @@ test("FloatComponent", async ({ page }) => {
   await page.waitForTimeout(1000);
 
   await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("llamacpp");
+  await page.getByPlaceholder("Search").fill("ollama");
 
   await page.waitForTimeout(1000);
 
   await page
-    .locator('//*[@id="model_specsLlamaCpp"]')
+    .getByTestId("modelsOllama")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
   await page.locator('//*[@id="float-input"]').click();
   await page.locator('//*[@id="float-input"]').fill("3");
@@ -45,309 +67,79 @@ test("FloatComponent", async ({ page }) => {
   await page.locator('//*[@id="showcache"]').click();
   expect(await page.locator('//*[@id="showcache"]').isChecked()).toBeTruthy();
 
-  // showecho
-  await page.locator('//*[@id="showecho"]').click();
-  expect(await page.locator('//*[@id="showecho"]').isChecked()).toBeTruthy();
-
-  // showf16_kv
-  await page.locator('//*[@id="showf16_kv"]').click();
-  expect(await page.locator('//*[@id="showf16_kv"]').isChecked()).toBeTruthy();
-
-  // showgrammar_path
-  await page.locator('//*[@id="showgrammar_path"]').click();
-  expect(
-    await page.locator('//*[@id="showgrammar_path"]').isChecked()
-  ).toBeTruthy();
-
-  // showlast_n_tokens_size
-  await page.locator('//*[@id="showlast_n_tokens_size"]').click();
-  expect(
-    await page.locator('//*[@id="showlast_n_tokens_size"]').isChecked()
-  ).toBeTruthy();
-
-  // showlogits_all
-  await page.locator('//*[@id="showlogits_all"]').click();
-  expect(
-    await page.locator('//*[@id="showlogits_all"]').isChecked()
-  ).toBeTruthy();
-
-  // showlogprobs
-  await page.locator('//*[@id="showlogprobs"]').click();
-  expect(
-    await page.locator('//*[@id="showlogprobs"]').isChecked()
-  ).toBeTruthy();
-
-  // showlora_base
-  await page.locator('//*[@id="showlora_base"]').click();
-  expect(
-    await page.locator('//*[@id="showlora_base"]').isChecked()
-  ).toBeTruthy();
-
-  // showlora_path
-  await page.locator('//*[@id="showlora_path"]').click();
-  expect(
-    await page.locator('//*[@id="showlora_path"]').isChecked()
-  ).toBeTruthy();
-
-  // showmax_tokens
-  await page.locator('//*[@id="showmax_tokens"]').click();
-  expect(
-    await page.locator('//*[@id="showmax_tokens"]').isChecked()
-  ).toBeTruthy();
-
-  // showmodel_path
-  await page.locator('//*[@id="showmodel_path"]').click();
-  expect(
-    await page.locator('//*[@id="showmodel_path"]').isChecked()
-  ).toBeFalsy();
-
-  // shown_batch
-  await page.locator('//*[@id="shown_batch"]').click();
-  expect(await page.locator('//*[@id="shown_batch"]').isChecked()).toBeTruthy();
-
-  // shown_ctx
-  await page.locator('//*[@id="shown_ctx"]').click();
-  expect(await page.locator('//*[@id="shown_ctx"]').isChecked()).toBeTruthy();
-
-  // shown_gpu_layers
-  await page.locator('//*[@id="shown_gpu_layers"]').click();
-  expect(
-    await page.locator('//*[@id="shown_gpu_layers"]').isChecked()
-  ).toBeTruthy();
-
-  // shown_parts
-  await page.locator('//*[@id="shown_parts"]').click();
-  expect(await page.locator('//*[@id="shown_parts"]').isChecked()).toBeTruthy();
-
-  // shown_threads
-  await page.locator('//*[@id="shown_threads"]').click();
-  expect(
-    await page.locator('//*[@id="shown_threads"]').isChecked()
-  ).toBeTruthy();
-
-  // showrepeat_penalty
-  await page.locator('//*[@id="showrepeat_penalty"]').click();
-  expect(
-    await page.locator('//*[@id="showrepeat_penalty"]').isChecked()
-  ).toBeTruthy();
-
-  // showrope_freq_base
-  await page.locator('//*[@id="showrope_freq_base"]').click();
-  expect(
-    await page.locator('//*[@id="showrope_freq_base"]').isChecked()
-  ).toBeTruthy();
-
-  // showrope_freq_scale
-  await page.locator('//*[@id="showrope_freq_scale"]').click();
-  expect(
-    await page.locator('//*[@id="showrope_freq_scale"]').isChecked()
-  ).toBeTruthy();
-
-  // showseed
-  await page.locator('//*[@id="showseed"]').click();
-  expect(await page.locator('//*[@id="showseed"]').isChecked()).toBeTruthy();
-
-  // showstop
-  await page.locator('//*[@id="showstop"]').click();
-  expect(await page.locator('//*[@id="showstop"]').isChecked()).toBeTruthy();
-
-  // showstreaming
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeTruthy();
-
-  // showsuffix
-  await page.locator('//*[@id="showsuffix"]').click();
-  expect(await page.locator('//*[@id="showsuffix"]').isChecked()).toBeTruthy();
-
-  // showtags
-  await page.locator('//*[@id="showtags"]').click();
-  expect(await page.locator('//*[@id="showtags"]').isChecked()).toBeTruthy();
-
-  // showtemperature
-  await page.locator('//*[@id="showtemperature"]').click();
-  expect(
-    await page.locator('//*[@id="showtemperature"]').isChecked()
-  ).toBeFalsy();
-
-  // showtop_k
-  await page.locator('//*[@id="showtop_k"]').click();
-  expect(await page.locator('//*[@id="showtop_k"]').isChecked()).toBeTruthy();
-
-  // showtop_p
-  await page.locator('//*[@id="showtop_p"]').click();
-  expect(await page.locator('//*[@id="showtop_p"]').isChecked()).toBeTruthy();
-
-  // showuse_mlock
-  await page.locator('//*[@id="showuse_mlock"]').click();
-  expect(
-    await page.locator('//*[@id="showuse_mlock"]').isChecked()
-  ).toBeTruthy();
-
-  // showuse_mmap
-  await page.locator('//*[@id="showuse_mmap"]').click();
-  expect(
-    await page.locator('//*[@id="showuse_mmap"]').isChecked()
-  ).toBeTruthy();
-
-  // showverbose
-  await page.locator('//*[@id="showverbose"]').click();
-  expect(await page.locator('//*[@id="showverbose"]').isChecked()).toBeTruthy();
-
-  // showvocab_only
-  await page.locator('//*[@id="showvocab_only"]').click();
-  expect(
-    await page.locator('//*[@id="showvocab_only"]').isChecked()
-  ).toBeTruthy();
-
   await page.locator('//*[@id="showcache"]').click();
   expect(await page.locator('//*[@id="showcache"]').isChecked()).toBeFalsy();
 
-  // showecho
-  await page.locator('//*[@id="showecho"]').click();
-  expect(await page.locator('//*[@id="showecho"]').isChecked()).toBeFalsy();
+  await page.getByTestId("showformat").click();
+  expect(await page.locator('//*[@id="showformat"]').isChecked()).toBeTruthy();
 
-  // showf16_kv
-  await page.locator('//*[@id="showf16_kv"]').click();
-  expect(await page.locator('//*[@id="showf16_kv"]').isChecked()).toBeFalsy();
+  await page.getByTestId("showformat").click();
+  expect(await page.locator('//*[@id="showformat"]').isChecked()).toBeFalsy();
 
-  // showgrammar_path
-  await page.locator('//*[@id="showgrammar_path"]').click();
+  await page.getByTestId("showmirostat").click();
   expect(
-    await page.locator('//*[@id="showgrammar_path"]').isChecked()
-  ).toBeFalsy();
-
-  // showlast_n_tokens_size
-  await page.locator('//*[@id="showlast_n_tokens_size"]').click();
-  expect(
-    await page.locator('//*[@id="showlast_n_tokens_size"]').isChecked()
-  ).toBeFalsy();
-
-  // showlogits_all
-  await page.locator('//*[@id="showlogits_all"]').click();
-  expect(
-    await page.locator('//*[@id="showlogits_all"]').isChecked()
-  ).toBeFalsy();
-
-  // showlogprobs
-  await page.locator('//*[@id="showlogprobs"]').click();
-  expect(await page.locator('//*[@id="showlogprobs"]').isChecked()).toBeFalsy();
-
-  // showlora_base
-  await page.locator('//*[@id="showlora_base"]').click();
-  expect(
-    await page.locator('//*[@id="showlora_base"]').isChecked()
-  ).toBeFalsy();
-
-  // showlora_path
-  await page.locator('//*[@id="showlora_path"]').click();
-  expect(
-    await page.locator('//*[@id="showlora_path"]').isChecked()
-  ).toBeFalsy();
-
-  // showmax_tokens
-  await page.locator('//*[@id="showmax_tokens"]').click();
-  expect(
-    await page.locator('//*[@id="showmax_tokens"]').isChecked()
-  ).toBeFalsy();
-
-  // showmodel_path
-  await page.locator('//*[@id="showmodel_path"]').click();
-  expect(
-    await page.locator('//*[@id="showmodel_path"]').isChecked()
+    await page.locator('//*[@id="showmirostat"]').isChecked()
   ).toBeTruthy();
 
-  // shown_batch
-  await page.locator('//*[@id="shown_batch"]').click();
-  expect(await page.locator('//*[@id="shown_batch"]').isChecked()).toBeFalsy();
+  await page.getByTestId("showmirostat").click();
+  expect(await page.locator('//*[@id="showmirostat"]').isChecked()).toBeFalsy();
 
-  // shown_ctx
-  await page.locator('//*[@id="shown_ctx"]').click();
-  expect(await page.locator('//*[@id="shown_ctx"]').isChecked()).toBeFalsy();
-
-  // shown_gpu_layers
-  await page.locator('//*[@id="shown_gpu_layers"]').click();
+  await page.getByTestId("showmirostat_eta").click();
   expect(
-    await page.locator('//*[@id="shown_gpu_layers"]').isChecked()
+    await page.locator('//*[@id="showmirostat_eta"]').isChecked()
+  ).toBeTruthy();
+
+  await page.getByTestId("showmirostat_eta").click();
+  expect(
+    await page.locator('//*[@id="showmirostat_eta"]').isChecked()
   ).toBeFalsy();
 
-  // shown_parts
-  await page.locator('//*[@id="shown_parts"]').click();
-  expect(await page.locator('//*[@id="shown_parts"]').isChecked()).toBeFalsy();
-
-  // shown_threads
-  await page.locator('//*[@id="shown_threads"]').click();
+  await page.getByTestId("showmirostat_tau").click();
   expect(
-    await page.locator('//*[@id="shown_threads"]').isChecked()
+    await page.locator('//*[@id="showmirostat_tau"]').isChecked()
+  ).toBeTruthy();
+
+  await page.getByTestId("showmirostat_tau").click();
+  expect(
+    await page.locator('//*[@id="showmirostat_tau"]').isChecked()
   ).toBeFalsy();
 
-  // showrepeat_penalty
-  await page.locator('//*[@id="showrepeat_penalty"]').click();
+  await page.getByTestId("showmodel").click();
+  expect(await page.locator('//*[@id="showmodel"]').isChecked()).toBeFalsy();
+
+  await page.getByTestId("showmodel").click();
+  expect(await page.locator('//*[@id="showmodel"]').isChecked()).toBeTruthy();
+
+  await page.getByTestId("shownum_ctx").click();
+  expect(await page.locator('//*[@id="shownum_ctx"]').isChecked()).toBeTruthy();
+
+  await page.getByTestId("shownum_ctx").click();
+  expect(await page.locator('//*[@id="shownum_ctx"]').isChecked()).toBeFalsy();
+
+  await page.getByTestId("shownum_gpu").click();
+  expect(await page.locator('//*[@id="shownum_gpu"]').isChecked()).toBeTruthy();
+
+  await page.getByTestId("shownum_gpu").click();
+  expect(await page.locator('//*[@id="shownum_gpu"]').isChecked()).toBeFalsy();
+
+  await page.getByTestId("shownum_thread").click();
   expect(
-    await page.locator('//*[@id="showrepeat_penalty"]').isChecked()
+    await page.locator('//*[@id="shownum_thread"]').isChecked()
+  ).toBeTruthy();
+
+  await page.getByTestId("shownum_thread").click();
+  expect(
+    await page.locator('//*[@id="shownum_thread"]').isChecked()
   ).toBeFalsy();
 
-  // showrope_freq_base
-  await page.locator('//*[@id="showrope_freq_base"]').click();
+  await page.getByTestId("showrepeat_last_n").click();
   expect(
-    await page.locator('//*[@id="showrope_freq_base"]').isChecked()
-  ).toBeFalsy();
+    await page.locator('//*[@id="showrepeat_last_n"]').isChecked()
+  ).toBeTruthy();
 
-  // showrope_freq_scale
-  await page.locator('//*[@id="showrope_freq_scale"]').click();
+  await page.getByTestId("showrepeat_last_n").click();
   expect(
-    await page.locator('//*[@id="showrope_freq_scale"]').isChecked()
-  ).toBeFalsy();
-
-  // showseed
-  await page.locator('//*[@id="showseed"]').click();
-  expect(await page.locator('//*[@id="showseed"]').isChecked()).toBeFalsy();
-
-  // showstop
-  await page.locator('//*[@id="showstop"]').click();
-  expect(await page.locator('//*[@id="showstop"]').isChecked()).toBeFalsy();
-
-  // showstreaming
-  await page.locator('//*[@id="showstreaming"]').click();
-  expect(
-    await page.locator('//*[@id="showstreaming"]').isChecked()
-  ).toBeFalsy();
-
-  // showsuffix
-  await page.locator('//*[@id="showsuffix"]').click();
-  expect(await page.locator('//*[@id="showsuffix"]').isChecked()).toBeFalsy();
-
-  // showtags
-  await page.locator('//*[@id="showtags"]').click();
-  expect(await page.locator('//*[@id="showtags"]').isChecked()).toBeFalsy();
-
-  // showtop_k
-  await page.locator('//*[@id="showtop_k"]').click();
-  expect(await page.locator('//*[@id="showtop_k"]').isChecked()).toBeFalsy();
-
-  // showtop_p
-  await page.locator('//*[@id="showtop_p"]').click();
-  expect(await page.locator('//*[@id="showtop_p"]').isChecked()).toBeFalsy();
-
-  // showuse_mlock
-  await page.locator('//*[@id="showuse_mlock"]').click();
-  expect(
-    await page.locator('//*[@id="showuse_mlock"]').isChecked()
-  ).toBeFalsy();
-
-  // showuse_mmap
-  await page.locator('//*[@id="showuse_mmap"]').click();
-  expect(await page.locator('//*[@id="showuse_mmap"]').isChecked()).toBeFalsy();
-
-  // showverbose
-  await page.locator('//*[@id="showverbose"]').click();
-  expect(await page.locator('//*[@id="showverbose"]').isChecked()).toBeFalsy();
-
-  // showvocab_only
-  await page.locator('//*[@id="showvocab_only"]').click();
-  expect(
-    await page.locator('//*[@id="showvocab_only"]').isChecked()
+    await page.locator('//*[@id="showrepeat_last_n"]').isChecked()
   ).toBeFalsy();
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
diff --git a/src/frontend/tests/end-to-end/flowPage.spec.ts b/src/frontend/tests/end-to-end/flowPage.spec.ts
index ca0bc076a..6718ecc9a 100644
--- a/src/frontend/tests/end-to-end/flowPage.spec.ts
+++ b/src/frontend/tests/end-to-end/flowPage.spec.ts
@@ -26,7 +26,17 @@ test.describe("Flow Page tests", () => {
       .dragTo(page.locator('//*[@id="react-flow-id"]'));
     await page.mouse.up();
     await page.mouse.down();
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
 
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
+
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
     // await page.getByTestId("icon-ExternalLink").click();
     // await page.locator('//*[@id="checkAndSaveBtn"]').click();
   });
diff --git a/src/frontend/tests/end-to-end/inputComponent.spec.ts b/src/frontend/tests/end-to-end/inputComponent.spec.ts
index 8756c1914..3efecc7d4 100644
--- a/src/frontend/tests/end-to-end/inputComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/inputComponent.spec.ts
@@ -20,7 +20,17 @@ test("InputComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("input-collection_name").click();
   await page
     .getByTestId("input-collection_name")
diff --git a/src/frontend/tests/end-to-end/inputListComponent.spec.ts b/src/frontend/tests/end-to-end/inputListComponent.spec.ts
index 8adb592b5..954478b8b 100644
--- a/src/frontend/tests/end-to-end/inputListComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/inputListComponent.spec.ts
@@ -15,11 +15,21 @@ test("InputListComponent", async ({ page }) => {
 
   await page.waitForTimeout(1000);
   await page
-    .getByTestId("vectorstoresAstraDB Search")
+    .getByTestId("vectorsearchAstraDB Search")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("div-generic-node").click();
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
diff --git a/src/frontend/tests/end-to-end/intComponent.spec.ts b/src/frontend/tests/end-to-end/intComponent.spec.ts
index bf2c1ea5e..4bbb0b873 100644
--- a/src/frontend/tests/end-to-end/intComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/intComponent.spec.ts
@@ -21,7 +21,17 @@ test("IntComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("int-input-max_tokens").click();
   await page
     .getByTestId("int-input-max_tokens")
@@ -42,6 +52,19 @@ test("IntComponent", async ({ page }) => {
     expect(false).toBeTruthy();
   }
 
+  await page.getByTestId("title-OpenAI").click();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
diff --git a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
index 88b9a2e25..457983d51 100644
--- a/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/keyPairListComponent.spec.ts
@@ -20,7 +20,17 @@ test("KeypairListComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.locator('//*[@id="keypair0"]').click();
   await page.locator('//*[@id="keypair0"]').fill("testtesttesttest");
   await page.locator('//*[@id="keypair100"]').click();
diff --git a/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts b/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
index 173ec850e..a6dc6180b 100644
--- a/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
+++ b/src/frontend/tests/end-to-end/langflowShortcuts.spec.ts
@@ -20,24 +20,34 @@ test("LangflowShortcuts", async ({ page }) => {
   await page.waitForTimeout(1000);
 
   await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("llamacpp");
+  await page.getByPlaceholder("Search").fill("ollama");
 
   await page.waitForTimeout(1000);
 
   await page
-    .locator('//*[@id="model_specsLlamaCpp"]')
+    .getByTestId("modelsOllama")
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
-  await page.getByTestId("title-LlamaCpp").click();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+  await page.getByTestId("title-Ollama").click();
   await page.keyboard.press(`${control}+e`);
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  await page.getByTestId("title-LlamaCpp").click();
+  await page.getByTestId("title-Ollama").click();
   await page.keyboard.press(`${control}+d`);
 
-  let numberOfNodes = await page.getByTestId("title-LlamaCpp").count();
+  let numberOfNodes = await page.getByTestId("title-Ollama").count();
   if (numberOfNodes != 2) {
     expect(false).toBeTruthy();
   }
@@ -49,18 +59,18 @@ test("LangflowShortcuts", async ({ page }) => {
     .click();
   await page.keyboard.press("Backspace");
 
-  numberOfNodes = await page.getByTestId("title-LlamaCpp").count();
+  numberOfNodes = await page.getByTestId("title-Ollama").count();
   if (numberOfNodes != 1) {
     expect(false).toBeTruthy();
   }
 
-  await page.getByTestId("title-LlamaCpp").click();
+  await page.getByTestId("title-Ollama").click();
   await page.keyboard.press(`${control}+c`);
 
-  await page.getByTestId("title-LlamaCpp").click();
+  await page.getByTestId("title-Ollama").click();
   await page.keyboard.press(`${control}+v`);
 
-  numberOfNodes = await page.getByTestId("title-LlamaCpp").count();
+  numberOfNodes = await page.getByTestId("title-Ollama").count();
   if (numberOfNodes != 2) {
     expect(false).toBeTruthy();
   }
@@ -72,15 +82,15 @@ test("LangflowShortcuts", async ({ page }) => {
     .click();
   await page.keyboard.press("Backspace");
 
-  await page.getByTestId("title-LlamaCpp").click();
+  await page.getByTestId("title-Ollama").click();
   await page.keyboard.press(`${control}+x`);
 
-  numberOfNodes = await page.getByTestId("title-LlamaCpp").count();
+  numberOfNodes = await page.getByTestId("title-Ollama").count();
   if (numberOfNodes != 0) {
     expect(false).toBeTruthy();
   }
   await page.keyboard.press(`${control}+v`);
-  numberOfNodes = await page.getByTestId("title-LlamaCpp").count();
+  numberOfNodes = await page.getByTestId("title-Ollama").count();
   if (numberOfNodes != 1) {
     expect(false).toBeTruthy();
   }
diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
index e90deef46..82a8ad465 100644
--- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
@@ -20,7 +20,17 @@ test("PromptTemplateComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("prompt-input-template").click();
 
   // await page.getByTestId("edit-prompt-sanitized").click();
diff --git a/src/frontend/tests/end-to-end/saveComponents.spec.ts b/src/frontend/tests/end-to-end/saveComponents.spec.ts
index 13d8e20f5..aabba97f8 100644
--- a/src/frontend/tests/end-to-end/saveComponents.spec.ts
+++ b/src/frontend/tests/end-to-end/saveComponents.spec.ts
@@ -98,7 +98,17 @@ test.describe("save component tests", () => {
       .dragTo(page.locator('//*[@id="react-flow-id"]'));
     await page.mouse.up();
     await page.mouse.down();
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
 
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
+
+    await page
+      .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+      .click();
     textArea = page.getByTestId("div-textarea-description");
     elementCountText = await textArea.count();
     if (elementCountText > 0) {
diff --git a/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts b/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
index ce5da30bc..d0e2f633e 100644
--- a/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/textAreaModalComponent.spec.ts
@@ -20,7 +20,17 @@ test("TextAreaModalComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
 
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
   await page.getByTestId("prompt-input-template").click();
 
   await page.getByTestId("modal-prompt-input-template").fill("{text}");
diff --git a/src/frontend/tests/end-to-end/toggleComponent.spec.ts b/src/frontend/tests/end-to-end/toggleComponent.spec.ts
index aa28dbc45..041392d8d 100644
--- a/src/frontend/tests/end-to-end/toggleComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/toggleComponent.spec.ts
@@ -19,6 +19,19 @@ test("ToggleComponent", async ({ page }) => {
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
+  await page
+    .locator('//*[@id="react-flow-id"]/div[1]/div[2]/button[2]')
+    .click();
+
   await page.getByTestId("div-generic-node").click();
 
   await page.getByTestId("more-options-modal").click();