diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
index 3497e43d5..e6786cc36 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
@@ -439,6 +439,7 @@ export default function ParameterComponent({
               enabled={data.node?.template[name].value ?? false}
               setEnabled={handleOnNewValue}
               size="large"
+              editNode={false}
             />
           </div>
         ) : left === true && type === "float" ? (
diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index 8017c5458..edde2a6c9 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -91,6 +91,7 @@ export default function InputComponent({
             handleKeyDown(e, value, "");
             if (blurOnEnter && e.key === "Enter") refInput.current?.blur();
           }}
+          data-testid={editNode ? id + "-edit" : id}
         />
       )}
       {password && (
diff --git a/src/frontend/src/components/intComponent/index.tsx b/src/frontend/src/components/intComponent/index.tsx
index da4839ae1..d2f7b5fbc 100644
--- a/src/frontend/src/components/intComponent/index.tsx
+++ b/src/frontend/src/components/intComponent/index.tsx
@@ -45,6 +45,7 @@ export default function IntComponent({
         onChange={(event) => {
           onChange(event.target.value);
         }}
+        data-testid={id}
       />
     </div>
   );
diff --git a/src/frontend/src/components/toggleShadComponent/index.tsx b/src/frontend/src/components/toggleShadComponent/index.tsx
index 328b1f911..ef1dc0d33 100644
--- a/src/frontend/src/components/toggleShadComponent/index.tsx
+++ b/src/frontend/src/components/toggleShadComponent/index.tsx
@@ -7,6 +7,7 @@ export default function ToggleShadComponent({
   disabled,
   size,
   id = "",
+  editNode = false,
 }: ToggleComponentType): JSX.Element {
   let scaleX, scaleY;
   switch (size) {
@@ -31,6 +32,7 @@ export default function ToggleShadComponent({
     <div className={disabled ? "pointer-events-none cursor-not-allowed " : ""}>
       <Switch
         id={id}
+        data-testid={id}
         style={{
           transform: `scaleX(${scaleX}) scaleY(${scaleY})`,
         }}
diff --git a/src/frontend/src/modals/ConfirmationModal/index.tsx b/src/frontend/src/modals/ConfirmationModal/index.tsx
index 3530a45ac..11e6e6edf 100644
--- a/src/frontend/src/modals/ConfirmationModal/index.tsx
+++ b/src/frontend/src/modals/ConfirmationModal/index.tsx
@@ -89,6 +89,7 @@ function ConfirmationModal({
             setModalOpen(false);
             onConfirm(index, data);
           }}
+          data-testid="replace-button"
         >
           {confirmationText}
         </Button>
diff --git a/src/frontend/src/modals/EditNodeModal/index.tsx b/src/frontend/src/modals/EditNodeModal/index.tsx
index 6785eea31..93a81724c 100644
--- a/src/frontend/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/src/modals/EditNodeModal/index.tsx
@@ -358,6 +358,7 @@ const EditNodeModal = forwardRef(
                                         );
                                       }}
                                       size="small"
+                                      editNode={true}
                                     />
                                   </div>
                                 ) : myData.node?.template[templateParam]
@@ -535,6 +536,7 @@ const EditNodeModal = forwardRef(
                                     }}
                                     disabled={disabled}
                                     size="small"
+                                    editNode={true}
                                   />
                                 </div>
                               </TableCell>
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index e205a4616..863be4f45 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -1,5 +1,6 @@
 import { cloneDeep } from "lodash";
 import { useEffect, useState } from "react";
+import { useUpdateNodeInternals } from "reactflow";
 import ShadTooltip from "../../../../components/ShadTooltipComponent";
 import CodeAreaComponent from "../../../../components/codeAreaComponent";
 import IconComponent from "../../../../components/genericIconComponent";
@@ -26,7 +27,6 @@ import {
   updateFlowPosition,
 } from "../../../../utils/reactflowUtils";
 import { classNames, cn } from "../../../../utils/utils";
-import { useUpdateNodeInternals } from "reactflow";
 
 export default function NodeToolbarComponent({
   data,
@@ -89,7 +89,6 @@ export default function NodeToolbarComponent({
   }, [showModalAdvanced]);
   const updateNodeInternals = useUpdateNodeInternals();
 
-
   useEffect(() => {
     setFlowComponent(createFlowComponent(cloneDeep(data), version));
   }, [
@@ -366,7 +365,7 @@ export default function NodeToolbarComponent({
                   value={"Share"}
                   disabled={!hasApiKey || !validApiKey}
                 >
-                  <div className="flex" data-testid="save-button-modal">
+                  <div className="flex" data-testid="share-button-modal">
                     <IconComponent
                       name="Share3"
                       className="relative top-0.5 -m-1 mr-1 h-6 w-6"
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index e7767eabb..9f7677671 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -27,6 +27,7 @@ export type ToggleComponentType = {
   disabled: boolean | undefined;
   size: "small" | "medium" | "large";
   id?: string;
+  editNode?: boolean;
 };
 export type DropDownComponentType = {
   value: string;
diff --git a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
index f2f9e4f06..13c07a36b 100644
--- a/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
+++ b/src/frontend/tests/end-to-end/promptModalComponent.spec.ts
@@ -8,12 +8,12 @@ test("PromptTemplateComponent", async ({ page }) => {
   await page.waitForTimeout(2000);
 
   await page.getByPlaceholder("Search").click();
-  await page.getByPlaceholder("Search").fill("promptTemplate");
+  await page.getByPlaceholder("Search").fill("prompt");
 
   await page.waitForTimeout(2000);
 
   await page
-    .locator('//*[@id="promptsPromptTemplate"]')
+    .locator('//*[@id="promptsPrompt"]')
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
@@ -47,35 +47,39 @@ test("PromptTemplateComponent", async ({ page }) => {
   await page.getByTestId("genericModalBtnSave").click();
 
   await page.getByTestId("div-textarea-prompt").click();
-  await page.getByTestId("text-area-modal").fill("prompt_value_!@#!@#");
+  await page.getByTestId("textarea-prompt").fill("prompt_value_!@#!@#");
 
-  value = await page.getByTestId("text-area-modal").inputValue();
+  value = await page.getByTestId("textarea-prompt").inputValue();
 
   if (value != "prompt_value_!@#!@#") {
     expect(false).toBeTruthy();
   }
 
-  await page.getByTestId("genericModalBtnSave").click();
+  await page.getByTestId("more-options-modal").click();
+  await page.getByTestId("save-button-modal").click();
+
+  const replace = await page.getByTestId("replace-button");
+  if (replace) {
+    await page.getByTestId("replace-button").click();
+  }
 
   await page.getByTestId("div-textarea-prompt1").click();
   await page
-    .getByTestId("text-area-modal")
+    .getByTestId("textarea-prompt1")
     .fill("prompt_name_test_123123!@#!@#");
 
-  value = await page.getByTestId("text-area-modal").inputValue();
+  value = await page.getByTestId("textarea-prompt1").inputValue();
 
   if (value != "prompt_name_test_123123!@#!@#") {
     expect(false).toBeTruthy();
   }
 
-  value = await page.getByTestId("text-area-modal").inputValue();
+  value = await page.getByTestId("textarea-prompt1").inputValue();
 
   if (value != "prompt_name_test_123123!@#!@#") {
     expect(false).toBeTruthy();
   }
 
-  await page.getByTestId("genericModalBtnSave").click();
-
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
diff --git a/src/frontend/tests/onlyFront/dropdownComponent.spec.ts b/src/frontend/tests/onlyFront/dropdownComponent.spec.ts
index 8724db6a6..a92cf0389 100644
--- a/src/frontend/tests/onlyFront/dropdownComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/dropdownComponent.spec.ts
@@ -24,7 +24,7 @@ test("dropDownComponent", async ({ page }) => {
   await page.waitForTimeout(2000);
 
   await page
-    .getByTestId("llmsAmazon Bedrock")
+    .getByTestId("model_specsAmazon Bedrock")
     .first()
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
diff --git a/src/frontend/tests/onlyFront/floatComponent.spec.ts b/src/frontend/tests/onlyFront/floatComponent.spec.ts
index 23a7b1cf8..6441987b2 100644
--- a/src/frontend/tests/onlyFront/floatComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/floatComponent.spec.ts
@@ -23,7 +23,7 @@ test("FloatComponent", async ({ page }) => {
   await page.waitForTimeout(2000);
 
   await page
-    .locator('//*[@id="llmsLlamaCpp"]')
+    .locator('//*[@id="model_specsLlamaCpp"]')
     .dragTo(page.locator('//*[@id="react-flow-id"]'));
   await page.mouse.up();
   await page.mouse.down();
@@ -102,18 +102,6 @@ test("FloatComponent", async ({ page }) => {
     await page.locator('//*[@id="showmax_tokens"]').isChecked()
   ).toBeTruthy();
 
-  // showmetadata
-  await page.locator('//*[@id="showmetadata"]').click();
-  expect(
-    await page.locator('//*[@id="showmetadata"]').isChecked()
-  ).toBeTruthy();
-
-  // showmodel_kwargs
-  await page.locator('//*[@id="showmodel_kwargs"]').click();
-  expect(
-    await page.locator('//*[@id="showmodel_kwargs"]').isChecked()
-  ).toBeTruthy();
-
   // showmodel_path
   await page.locator('//*[@id="showmodel_path"]').click();
   expect(
@@ -271,16 +259,6 @@ test("FloatComponent", async ({ page }) => {
     await page.locator('//*[@id="showmax_tokens"]').isChecked()
   ).toBeFalsy();
 
-  // showmetadata
-  await page.locator('//*[@id="showmetadata"]').click();
-  expect(await page.locator('//*[@id="showmetadata"]').isChecked()).toBeFalsy();
-
-  // showmodel_kwargs
-  await page.locator('//*[@id="showmodel_kwargs"]').click();
-  expect(
-    await page.locator('//*[@id="showmodel_kwargs"]').isChecked()
-  ).toBeFalsy();
-
   // showmodel_path
   await page.locator('//*[@id="showmodel_path"]').click();
   expect(
diff --git a/src/frontend/tests/onlyFront/group.spec.ts b/src/frontend/tests/onlyFront/group.spec.ts
index d5999e8ea..dcd557279 100644
--- a/src/frontend/tests/onlyFront/group.spec.ts
+++ b/src/frontend/tests/onlyFront/group.spec.ts
@@ -4,16 +4,16 @@ import { readFileSync } from "fs";
 test.describe("group node test", () => {
   /// <reference lib="dom"/>
   test("group and ungroup updating values", async ({ page }) => {
-    // await page.routeFromHAR("harFiles/langflow.har", {
-    //   url: "**/api/v1/**",
-    //   update: false,
-    // });
-    // await page.route("**/api/v1/flows/", async (route) => {
-    //   const json = {
-    //     id: "e9ac1bdc-429b-475d-ac03-d26f9a2a3210",
-    //   };
-    //   await route.fulfill({ json, status: 201 });
-    // });
+    await page.routeFromHAR("harFiles/langflow.har", {
+      url: "**/api/v1/**",
+      update: false,
+    });
+    await page.route("**/api/v1/flows/", async (route) => {
+      const json = {
+        id: "e9ac1bdc-429b-475d-ac03-d26f9a2a3210",
+      };
+      await route.fulfill({ json, status: 201 });
+    });
     await page.goto("http:localhost:3000/");
     await page.locator("span").filter({ hasText: "My Collection" }).isVisible();
     // Read your file into a buffer.
diff --git a/src/frontend/tests/onlyFront/inputComponent.spec.ts b/src/frontend/tests/onlyFront/inputComponent.spec.ts
index 05b1ef8d8..e9622c038 100644
--- a/src/frontend/tests/onlyFront/inputComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/inputComponent.spec.ts
@@ -28,12 +28,12 @@ test("InputComponent", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.locator("#input-8").click();
+  await page.getByTestId("input-collection_name").click();
   await page
-    .locator("#input-8")
+    .getByTestId("input-collection_name")
     .fill("collection_name_test_123123123!@#$&*(&%$@");
 
-  let value = await page.locator("#input-8").inputValue();
+  let value = await page.getByTestId("input-collection_name").inputValue();
 
   if (value != "collection_name_test_123123123!@#$&*(&%$@") {
     expect(false).toBeTruthy();
@@ -61,9 +61,9 @@ test("InputComponent", async ({ page }) => {
     await page.locator('//*[@id="showchroma_server_host"]').isChecked()
   ).toBeTruthy();
 
-  await page.locator('//*[@id="showchroma_server_http_port"]').click();
+  await page.locator('//*[@id="showchroma_server_port"]').click();
   expect(
-    await page.locator('//*[@id="showchroma_server_http_port"]').isChecked()
+    await page.locator('//*[@id="showchroma_server_port"]').isChecked()
   ).toBeTruthy();
 
   await page.locator('//*[@id="showchroma_server_ssl_enabled"]').click();
@@ -76,19 +76,11 @@ test("InputComponent", async ({ page }) => {
     await page.locator('//*[@id="showcollection_name"]').isChecked()
   ).toBeFalsy();
 
-  await page.locator('//*[@id="showpersist"]').click();
-  expect(await page.locator('//*[@id="showpersist"]').isChecked()).toBeFalsy();
-
-  await page.locator('//*[@id="showpersist_directory"]').click();
+  await page.locator('//*[@id="showindex_directory"]').click();
   expect(
-    await page.locator('//*[@id="showpersist_directory"]').isChecked()
+    await page.locator('//*[@id="showindex_directory"]').isChecked()
   ).toBeFalsy();
 
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeTruthy();
-
   await page.locator('//*[@id="showchroma_server_cors_allow_origins"]').click();
   expect(
     await page
@@ -106,9 +98,9 @@ test("InputComponent", async ({ page }) => {
     await page.locator('//*[@id="showchroma_server_host"]').isChecked()
   ).toBeFalsy();
 
-  await page.locator('//*[@id="showchroma_server_http_port"]').click();
+  await page.locator('//*[@id="showchroma_server_port"]').click();
   expect(
-    await page.locator('//*[@id="showchroma_server_http_port"]').isChecked()
+    await page.locator('//*[@id="showchroma_server_port"]').isChecked()
   ).toBeFalsy();
 
   await page.locator('//*[@id="showchroma_server_ssl_enabled"]').click();
@@ -116,33 +108,27 @@ test("InputComponent", async ({ page }) => {
     await page.locator('//*[@id="showchroma_server_ssl_enabled"]').isChecked()
   ).toBeFalsy();
 
-  await page.locator('//*[@id="showpersist"]').click();
-  expect(await page.locator('//*[@id="showpersist"]').isChecked()).toBeTruthy();
-
-  await page.locator('//*[@id="showpersist_directory"]').click();
+  await page.locator('//*[@id="showindex_directory"]').click();
   expect(
-    await page.locator('//*[@id="showpersist_directory"]').isChecked()
+    await page.locator('//*[@id="showindex_directory"]').isChecked()
   ).toBeTruthy();
 
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeFalsy();
-
-  let valueEditNode = await page.locator('//*[@id="input-5"]').inputValue();
+  let valueEditNode = await page
+    .getByTestId("input-collection_name-edit")
+    .inputValue();
 
   if (valueEditNode != "collection_name_test_123123123!@#$&*(&%$@") {
     expect(false).toBeTruthy();
   }
 
-  await page.locator('//*[@id="input-5"]').click();
+  await page.getByTestId("input-collection_name-edit").click();
   await page
-    .locator('//*[@id="input-5"]')
+    .getByTestId("input-collection_name-edit")
     .fill("NEW_collection_name_test_123123123!@#$&*(&%$@");
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  const plusButtonLocator = page.locator("#input-8");
+  const plusButtonLocator = page.getByTestId("input-collection_name");
   const elementCount = await plusButtonLocator.count();
   if (elementCount === 0) {
     expect(true).toBeTruthy();
@@ -159,7 +145,7 @@ test("InputComponent", async ({ page }) => {
 
     await page.locator('//*[@id="saveChangesBtn"]').click();
 
-    let value = await page.locator("#input-8").inputValue();
+    let value = await page.getByTestId("input-collection_name").inputValue();
 
     if (value != "NEW_collection_name_test_123123123!@#$&*(&%$@") {
       expect(false).toBeTruthy();
diff --git a/src/frontend/tests/onlyFront/intComponent.spec.ts b/src/frontend/tests/onlyFront/intComponent.spec.ts
index 3012dc008..be119a240 100644
--- a/src/frontend/tests/onlyFront/intComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/intComponent.spec.ts
@@ -30,21 +30,21 @@ test("IntComponent", async ({ page }) => {
   await page.mouse.up();
   await page.mouse.down();
 
-  await page.locator('//*[@id="int-input-2"]').click();
+  await page.getByTestId("int-input-timeout").click();
   await page
-    .locator('//*[@id="int-input-2"]')
+    .getByTestId("int-input-timeout")
     .fill("123456789123456789123456789");
 
-  let value = await page.locator('//*[@id="int-input-2"]').inputValue();
+  let value = await page.getByTestId("int-input-timeout").inputValue();
 
   if (value != "123456789123456789123456789") {
     expect(false).toBeTruthy();
   }
 
-  await page.locator('//*[@id="int-input-2"]').click();
-  await page.locator('//*[@id="int-input-2"]').fill("0");
+  await page.getByTestId("int-input-timeout").click();
+  await page.getByTestId("int-input-timeout").fill("0");
 
-  value = await page.locator('//*[@id="int-input-2"]').inputValue();
+  value = await page.getByTestId("int-input-timeout").inputValue();
 
   if (value != "0") {
     expect(false).toBeTruthy();
@@ -53,15 +53,15 @@ test("IntComponent", async ({ page }) => {
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
-  value = await page.locator('//*[@id="edit-int-input-2"]').inputValue();
+  value = await page.getByTestId("edit-int-input-timeout").inputValue();
 
   if (value != "0") {
     expect(false).toBeTruthy();
   }
 
-  await page.locator('//*[@id="edit-int-input-2"]').click();
+  await page.getByTestId("edit-int-input-timeout").click();
   await page
-    .locator('//*[@id="edit-int-input-2"]')
+    .getByTestId("edit-int-input-timeout")
     .fill("123456789123456789123456789");
 
   await page.locator('//*[@id="showheaders"]').click();
@@ -81,7 +81,7 @@ test("IntComponent", async ({ page }) => {
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  const plusButtonLocator = page.locator('//*[@id="int-input-2"]');
+  const plusButtonLocator = page.getByTestId("int-input-timeout");
   const elementCount = await plusButtonLocator.count();
   if (elementCount === 0) {
     expect(true).toBeTruthy();
@@ -95,7 +95,7 @@ test("IntComponent", async ({ page }) => {
     ).toBeTruthy();
 
     const valueEditNode = await page
-      .locator('//*[@id="edit-int-input-2"]')
+      .getByTestId("edit-int-input-timeout")
       .inputValue();
 
     if (valueEditNode != "123456789123456789123456789") {
@@ -103,19 +103,19 @@ test("IntComponent", async ({ page }) => {
     }
 
     await page.locator('//*[@id="saveChangesBtn"]').click();
-    await page.locator('//*[@id="int-input-2"]').click();
-    await page.locator('//*[@id="int-input-2"]').fill("3");
+    await page.getByTestId("int-input-timeout").click();
+    await page.getByTestId("int-input-timeout").fill("3");
 
-    let value = await page.locator('//*[@id="int-input-2"]').inputValue();
+    let value = await page.getByTestId("int-input-timeout").inputValue();
 
     if (value != "3") {
       expect(false).toBeTruthy();
     }
 
-    await page.locator('//*[@id="int-input-2"]').click();
-    await page.locator('//*[@id="int-input-2"]').fill("-3");
+    await page.getByTestId("int-input-timeout").click();
+    await page.getByTestId("int-input-timeout").fill("-3");
 
-    value = await page.locator('//*[@id="int-input-2"]').inputValue();
+    value = await page.getByTestId("int-input-timeout").inputValue();
 
     if (value != "0") {
       expect(false).toBeTruthy();
diff --git a/src/frontend/tests/onlyFront/nestedComponent.spec.ts b/src/frontend/tests/onlyFront/nestedComponent.spec.ts
index 0185d2139..ad1cbed30 100644
--- a/src/frontend/tests/onlyFront/nestedComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/nestedComponent.spec.ts
@@ -31,75 +31,17 @@ test("NestedComponent", async ({ page }) => {
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
-  // showindex_name
-  await page.locator('//*[@id="showindex_name"]').click();
+  //showpool_threads
+  await page.locator('//*[@id="showpool_threads"]').click();
 
   expect(
-    await page.locator('//*[@id="showindex_name"]').isChecked()
-  ).toBeFalsy();
-
-  // shownamespace
-  await page.locator('//*[@id="shownamespace"]').click();
-
-  expect(
-    await page.locator('//*[@id="shownamespace"]').isChecked()
-  ).toBeFalsy();
-
-  // showpinecone_api_key
-  await page.locator('//*[@id="showpinecone_api_key"]').click();
-
-  expect(
-    await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
+    await page.locator('//*[@id="showpool_threads"]').isChecked()
   ).toBeTruthy();
 
-  // showpinecone_env
-  await page.locator('//*[@id="showpinecone_env"]').click();
+  //showtext_key
+  await page.locator('//*[@id="showtext_key"]').click();
 
-  expect(
-    await page.locator('//*[@id="showpinecone_env"]').isChecked()
-  ).toBeTruthy();
-
-  // showsearch_kwargs
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeTruthy();
-
-  // showindex_name
-  await page.locator('//*[@id="showindex_name"]').click();
-
-  expect(
-    await page.locator('//*[@id="showindex_name"]').isChecked()
-  ).toBeTruthy();
-
-  // shownamespace
-  await page.locator('//*[@id="shownamespace"]').click();
-
-  expect(
-    await page.locator('//*[@id="shownamespace"]').isChecked()
-  ).toBeTruthy();
-
-  // showpinecone_api_key
-  await page.locator('//*[@id="showpinecone_api_key"]').click();
-
-  expect(
-    await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
-  ).toBeFalsy();
-
-  // showpinecone_env
-  await page.locator('//*[@id="showpinecone_env"]').click();
-
-  expect(
-    await page.locator('//*[@id="showpinecone_env"]').isChecked()
-  ).toBeFalsy();
-
-  // showsearch_kwargs
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeFalsy();
+  expect(await page.locator('//*[@id="showtext_key"]').isChecked()).toBeFalsy();
 
   // showindex_name
   await page.locator('//*[@id="showindex_name"]').click();
@@ -120,21 +62,14 @@ test("NestedComponent", async ({ page }) => {
 
   expect(
     await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
-  ).toBeTruthy();
+  ).toBeFalsy();
 
   // showpinecone_env
   await page.locator('//*[@id="showpinecone_env"]').click();
 
   expect(
     await page.locator('//*[@id="showpinecone_env"]').isChecked()
-  ).toBeTruthy();
-
-  // showsearch_kwargs
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeTruthy();
+  ).toBeFalsy();
 
   // showindex_name
   await page.locator('//*[@id="showindex_name"]').click();
@@ -155,21 +90,14 @@ test("NestedComponent", async ({ page }) => {
 
   expect(
     await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
-  ).toBeFalsy();
+  ).toBeTruthy();
 
   // showpinecone_env
   await page.locator('//*[@id="showpinecone_env"]').click();
 
   expect(
     await page.locator('//*[@id="showpinecone_env"]').isChecked()
-  ).toBeFalsy();
-
-  // showsearch_kwargs
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeFalsy();
+  ).toBeTruthy();
 
   // showindex_name
   await page.locator('//*[@id="showindex_name"]').click();
@@ -190,21 +118,14 @@ test("NestedComponent", async ({ page }) => {
 
   expect(
     await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
-  ).toBeTruthy();
+  ).toBeFalsy();
 
   // showpinecone_env
   await page.locator('//*[@id="showpinecone_env"]').click();
 
   expect(
     await page.locator('//*[@id="showpinecone_env"]').isChecked()
-  ).toBeTruthy();
-
-  // showsearch_kwargs
-  await page.locator('//*[@id="showsearch_kwargs"]').click();
-
-  expect(
-    await page.locator('//*[@id="showsearch_kwargs"]').isChecked()
-  ).toBeTruthy();
+  ).toBeFalsy();
 
   // showindex_name
   await page.locator('//*[@id="showindex_name"]').click();
@@ -223,6 +144,34 @@ test("NestedComponent", async ({ page }) => {
   // showpinecone_api_key
   await page.locator('//*[@id="showpinecone_api_key"]').click();
 
+  expect(
+    await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
+  ).toBeTruthy();
+
+  // showpinecone_env
+  await page.locator('//*[@id="showpinecone_env"]').click();
+
+  expect(
+    await page.locator('//*[@id="showpinecone_env"]').isChecked()
+  ).toBeTruthy();
+
+  // showindex_name
+  await page.locator('//*[@id="showindex_name"]').click();
+
+  expect(
+    await page.locator('//*[@id="showindex_name"]').isChecked()
+  ).toBeFalsy();
+
+  // shownamespace
+  await page.locator('//*[@id="shownamespace"]').click();
+
+  expect(
+    await page.locator('//*[@id="shownamespace"]').isChecked()
+  ).toBeFalsy();
+
+  // showpinecone_api_key
+  await page.locator('//*[@id="showpinecone_api_key"]').click();
+
   expect(
     await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
   ).toBeFalsy();
@@ -234,7 +183,47 @@ test("NestedComponent", async ({ page }) => {
     await page.locator('//*[@id="showpinecone_env"]').isChecked()
   ).toBeFalsy();
 
+  // showindex_name
+  await page.locator('//*[@id="showindex_name"]').click();
+
+  expect(
+    await page.locator('//*[@id="showindex_name"]').isChecked()
+  ).toBeTruthy();
+
+  // shownamespace
+  await page.locator('//*[@id="shownamespace"]').click();
+
+  expect(
+    await page.locator('//*[@id="shownamespace"]').isChecked()
+  ).toBeTruthy();
+
+  // showpinecone_api_key
+  await page.locator('//*[@id="showpinecone_api_key"]').click();
+
+  expect(
+    await page.locator('//*[@id="showpinecone_api_key"]').isChecked()
+  ).toBeTruthy();
+
+  // showpinecone_env
+  await page.locator('//*[@id="showpinecone_env"]').click();
+
+  expect(
+    await page.locator('//*[@id="showpinecone_env"]').isChecked()
+  ).toBeTruthy();
+
+  //showpool_threads
+  await page.locator('//*[@id="showpool_threads"]').click();
+
+  expect(
+    await page.locator('//*[@id="showpool_threads"]').isChecked()
+  ).toBeFalsy();
+
+  //showtext_key
+  await page.locator('//*[@id="showtext_key"]').click();
+
+  expect(
+    await page.locator('//*[@id="showtext_key"]').isChecked()
+  ).toBeTruthy();
+
   await page.locator('//*[@id="saveChangesBtn"]').click();
-
-  await page.getByTestId("div-dict-input").click();
 });
diff --git a/src/frontend/tests/onlyFront/toggleComponent.spec.ts b/src/frontend/tests/onlyFront/toggleComponent.spec.ts
index cf83ec5e2..25ca747c4 100644
--- a/src/frontend/tests/onlyFront/toggleComponent.spec.ts
+++ b/src/frontend/tests/onlyFront/toggleComponent.spec.ts
@@ -38,29 +38,27 @@ test("ToggleComponent", async ({ page }) => {
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  await page.locator('//*[@id="toggle-1"]').click();
-  expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeFalsy();
+  await page.getByTestId("toggle-load_hidden").click();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeFalsy();
 
-  await page.locator('//*[@id="toggle-1"]').click();
-  expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeTruthy();
+  await page.getByTestId("toggle-load_hidden").click();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeTruthy();
 
-  await page.locator('//*[@id="toggle-1"]').click();
-  expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeFalsy();
+  await page.getByTestId("toggle-load_hidden").click();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeFalsy();
 
-  await page.locator('//*[@id="toggle-1"]').click();
-  expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeTruthy();
+  await page.getByTestId("toggle-load_hidden").click();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeTruthy();
 
-  await page.locator('//*[@id="toggle-1"]').click();
-  expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeFalsy();
+  await page.getByTestId("toggle-load_hidden").click();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeFalsy();
 
   await page.getByTestId("div-generic-node").click();
 
   await page.getByTestId("more-options-modal").click();
   await page.getByTestId("edit-button-modal").click();
 
-  expect(
-    await page.locator('//*[@id="toggle-edit-1"]').isChecked()
-  ).toBeFalsy();
+  expect(await page.getByTestId("toggle-load_hidden").isChecked()).toBeFalsy();
 
   await page.locator('//*[@id="showglob"]').click();
   expect(await page.locator('//*[@id="showglob"]').isChecked()).toBeFalsy();
@@ -129,7 +127,7 @@ test("ToggleComponent", async ({ page }) => {
 
   await page.locator('//*[@id="saveChangesBtn"]').click();
 
-  const plusButtonLocator = page.locator('//*[@id="toggle-1"]');
+  const plusButtonLocator = page.getByTestId("toggle-load_hidden");
   const elementCount = await plusButtonLocator.count();
   if (elementCount === 0) {
     expect(true).toBeTruthy();
@@ -145,24 +143,34 @@ test("ToggleComponent", async ({ page }) => {
     ).toBeTruthy();
 
     expect(
-      await page.locator('//*[@id="toggle-edit-1"]').isChecked()
+      await page.getByTestId("toggle-edit-load_hidden").isChecked()
     ).toBeFalsy();
 
     await page.locator('//*[@id="saveChangesBtn"]').click();
 
-    await page.locator('//*[@id="toggle-1"]').click();
-    expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeTruthy();
+    await page.getByTestId("toggle-load_hidden").click();
+    expect(
+      await page.getByTestId("toggle-load_hidden").isChecked()
+    ).toBeTruthy();
 
-    await page.locator('//*[@id="toggle-1"]').click();
-    expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeFalsy();
+    await page.getByTestId("toggle-load_hidden").click();
+    expect(
+      await page.getByTestId("toggle-load_hidden").isChecked()
+    ).toBeFalsy();
 
-    await page.locator('//*[@id="toggle-1"]').click();
-    expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeTruthy();
+    await page.getByTestId("toggle-load_hidden").click();
+    expect(
+      await page.getByTestId("toggle-load_hidden").isChecked()
+    ).toBeTruthy();
 
-    await page.locator('//*[@id="toggle-1"]').click();
-    expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeFalsy();
+    await page.getByTestId("toggle-load_hidden").click();
+    expect(
+      await page.getByTestId("toggle-load_hidden").isChecked()
+    ).toBeFalsy();
 
-    await page.locator('//*[@id="toggle-1"]').click();
-    expect(await page.locator('//*[@id="toggle-1"]').isChecked()).toBeTruthy();
+    await page.getByTestId("toggle-load_hidden").click();
+    expect(
+      await page.getByTestId("toggle-load_hidden").isChecked()
+    ).toBeTruthy();
   }
 });