diff --git a/frontend/packages/manager/src/components/groups/AddDeviceModal.jsx b/frontend/packages/manager/src/components/groups/AddDeviceModal.jsx
index 0ed79e0..605786b 100644
--- a/frontend/packages/manager/src/components/groups/AddDeviceModal.jsx
+++ b/frontend/packages/manager/src/components/groups/AddDeviceModal.jsx
@@ -3,12 +3,12 @@ import Button from '@splunk/react-ui/Button';
 import Modal from '@splunk/react-ui/Modal';
 import Select from '@splunk/react-ui/Select';
 import Text from '@splunk/react-ui/Text';
-import GroupContext from "../../store/group-contxt";
 import axios from "axios";
-import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
-import InventoryDevicesValidationContxt from "../../store/inventory-devices-validation-contxt";
 import { createDOMID } from '@splunk/ui-utils/id';
 import P from '@splunk/react-ui/Paragraph';
+import GroupContext from "../../store/group-contxt";
+import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
+import InventoryDevicesValidationContxt from "../../store/inventory-devices-validation-contxt";
 import { validationMessage } from "../../styles/ValidationStyles";
 import { backendHost } from "../../host";
 import { StyledControlGroup, StyledModalBody, StyledModalHeader } from "../../styles/inventory/InventoryStyle";
@@ -124,14 +124,14 @@ function AddDeviceModal(){
                 <StyledModalBody>
                     <StyledControlGroup labelWidth={140} label="IP address">
                         <ValidationGroup>
-                            <Text data-test='sc4snmp:form:ip-input' value={GrCtx.address} onChange={handleChangeAddress} error={((ValCtx.addressErrors) ? true : false)}/>
-                            {((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el, i) => <P data-test={`sc4snmp:ip-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test='sc4snmp:form:ip-input' value={GrCtx.address} onChange={handleChangeAddress} error={(!!(ValCtx.addressErrors))}/>
+                            {((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el) => <P data-test="sc4snmp:ip-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
                     <StyledControlGroup labelWidth={140} label="Port" >
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:port-input" value={GrCtx.port} onChange={handleChangePort} error={((ValCtx.portErrors) ? true : false)}/>
-                            {((ValCtx.portErrors) ? ValCtx.portErrors.map((el, i) => <P data-test={`sc4snmp:port-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:port-input" value={GrCtx.port} onChange={handleChangePort} error={(!!(ValCtx.portErrors))}/>
+                            {((ValCtx.portErrors) ? ValCtx.portErrors.map((el) => <P data-test="sc4snmp:port-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
@@ -150,22 +150,22 @@ function AddDeviceModal(){
 
                     <StyledControlGroup labelWidth={140} label="Community">
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:community-input" value={GrCtx.community} onChange={handleChangeCommunity} error={((ValCtx.communityErrors) ? true : false)}/>
-                            {((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el, i) => <P data-test={`sc4snmp:community-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:community-input" value={GrCtx.community} onChange={handleChangeCommunity} error={(!!(ValCtx.communityErrors))}/>
+                            {((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el) => <P data-test="sc4snmp:community-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup labelWidth={140} label="Secret">
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:secret-input" value={GrCtx.secret} onChange={handleChangeSecret} error={((ValCtx.secretErrors) ? true : false)}/>
-                            {((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el, i) => <P data-test={`sc4snmp:secret-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:secret-input" value={GrCtx.secret} onChange={handleChangeSecret} error={(!!(ValCtx.secretErrors))}/>
+                            {((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el) => <P data-test="sc4snmp:secret-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup labelWidth={140} label="Security Engine">
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:security-engine-input" value={GrCtx.securityEngine} onChange={handleChangeSecurityEngine} error={((ValCtx.securityEngineErrors) ? true : false)}/>
-                            {((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el, i) => <P data-test={`sc4snmp:security-engine-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:security-engine-input" value={GrCtx.securityEngine} onChange={handleChangeSecurityEngine} error={(!!(ValCtx.securityEngineErrors))}/>
+                            {((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el) => <P data-test="sc4snmp:security-engine-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
diff --git a/frontend/packages/manager/src/components/groups/AddGroupModal.jsx b/frontend/packages/manager/src/components/groups/AddGroupModal.jsx
index 193fd73..0b99a84 100644
--- a/frontend/packages/manager/src/components/groups/AddGroupModal.jsx
+++ b/frontend/packages/manager/src/components/groups/AddGroupModal.jsx
@@ -95,7 +95,7 @@ function AddGroupModal() {
                     <ControlGroup label="Group Name">
                         <ValidationGroup>
                             <Text data-test="sc4snmp:form:group-name-input" value={GrCtx.groupName} onChange={handleGroupNameChange} error={(!!(ValCtx.groupNameErrors))}/>
-                            {((ValCtx.groupNameErrors) ? ValCtx.groupNameErrors.map((el, i) => <P data-test={`sc4snmp:group-name-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            {((ValCtx.groupNameErrors) ? ValCtx.groupNameErrors.map((el) => <P data-test="sc4snmp:group-name-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </ControlGroup>
                 </Modal.Body>
diff --git a/frontend/packages/manager/src/components/groups/GroupsList.jsx b/frontend/packages/manager/src/components/groups/GroupsList.jsx
index 56d4013..224e855 100644
--- a/frontend/packages/manager/src/components/groups/GroupsList.jsx
+++ b/frontend/packages/manager/src/components/groups/GroupsList.jsx
@@ -224,15 +224,15 @@ function GroupsList() {
         }
     };
 
-    const groupsList = groups.map((group, i) => (
-        <SingleGroup data-test={`sc4snmp:group-${i}`} onClick={(event) => (clickGroupHandler(event, group._id, group.groupName, 1))} style={{ backgroundColor: (selectedGroup[group._id]) ? "#E1E6EB" : "#FFFFF" }} key={createDOMID()}>
+    const groupsList = groups.map((group) => (
+        <SingleGroup data-test="sc4snmp:group" onClick={(event) => (clickGroupHandler(event, group._id, group.groupName, 1))} style={{ backgroundColor: (selectedGroup[group._id]) ? "#E1E6EB" : "#FFFFF" }} key={createDOMID()}>
             <P>
                 {group.groupName}
             </P>
             <div>
-                <Button data-test={`sc4snmp:group-${i}:new-device-button`} style={{ margin: "0" }} onClick={() => (newDevicenHandler(group._id, group.groupName))} appearance="pill" icon={<Plus />} />
-                <Button data-test={`sc4snmp:group-${i}:edit-group-button`} style={{ margin: "0" }} onClick={() => (editGroupHandler(group._id, group.groupName))} appearance="pill" icon={<Pencil />} />
-                <Button data-test={`sc4snmp:group-${i}:delete-group-button`} style={{ margin: "0" }} onClick={() => (groupDeleteHandler(group._id, group.groupName, group.groupInInventory))} appearance="pill" icon={<Trash />} />
+                <Button data-test="sc4snmp:group:new-device-button" style={{ margin: "0" }} onClick={() => (newDevicenHandler(group._id, group.groupName))} appearance="pill" icon={<Plus />} />
+                <Button data-test="sc4snmp:group:edit-group-button" style={{ margin: "0" }} onClick={() => (editGroupHandler(group._id, group.groupName))} appearance="pill" icon={<Pencil />} />
+                <Button data-test="sc4snmp:group:delete-group-button" style={{ margin: "0" }} onClick={() => (groupDeleteHandler(group._id, group.groupName, group.groupInInventory))} appearance="pill" icon={<Trash />} />
             </div>
         </SingleGroup>
     ));
@@ -255,10 +255,10 @@ function GroupsList() {
                         <Select data-test="sc4snmp:group-pagination" appearance="pill" suffixLabel="group items per page"
                                 value={devicesPerPage} onChange={devicesPerPageHandler}
                                 defaultValue="20">
-                            <Select.Option data-test="sc4snmp:group-pagination-10" label="10" value="10" />
-                            <Select.Option data-test="sc4snmp:group-pagination-20" label="20" value="20" />
-                            <Select.Option data-test="sc4snmp:group-pagination-50" label="50" value="50" />
-                            <Select.Option data-test="sc4snmp:group-pagination-100" label="100" value="100" />
+                            <Select.Option data-test="sc4snmp:group-pagination-option" label="10" value="10" />
+                            <Select.Option data-test="sc4snmp:group-pagination-option" label="20" value="20" />
+                            <Select.Option data-test="sc4snmp:group-pagination-option" label="50" value="50" />
+                            <Select.Option data-test="sc4snmp:group-pagination-option" label="100" value="100" />
                         </Select>
                         <Paginator
                             onChange={(event, { page }) => (paginationHandler(page, openedGroupId))}
@@ -267,7 +267,7 @@ function GroupsList() {
                             totalPages={totalPages}
                         />
                     </Pagination>
-                    <Table stripeRows resizableFillLayout>
+                    <Table data-test="sc4snmp:group-table" stripeRows resizableFillLayout>
                         <Table.Head>
                             {columns.map((headData) => (
                                 <Table.HeadCell key={createDOMID()} width={headData.label === "Actions" ? 100 : "auto"}>
@@ -277,17 +277,17 @@ function GroupsList() {
                         </Table.Head>
                         <Table.Body>
                             {GrCtx.devices
-                                .map((row, i) => (
-                                    <Table.Row data-test={`sc4snmp:group-row-${i}`} key={createDOMID()} >
-                                        <Table.Cell>{row.address}</Table.Cell>
-                                        <Table.Cell>{(row.port === '') ? GrCtx.inventoryConfig.port : row.port}</Table.Cell>
-                                        <Table.Cell>{(row.version === '') ? GrCtx.inventoryConfig.version  : row.version}</Table.Cell>
-                                        <Table.Cell>{(row.community === '') ? GrCtx.inventoryConfig.community  : row.community}</Table.Cell>
-                                        <Table.Cell>{(row.secret === '') ? GrCtx.inventoryConfig.secret  : row.secret}</Table.Cell>
-                                        <Table.Cell>{(row.securityEngine === '') ? GrCtx.inventoryConfig.securityEngine  : row.securityEngine}</Table.Cell>
-                                        <Table.Cell>
-                                            <Button data-test={`sc4snmp:group-row-edit-${i}`} onClick={() => deviceEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
-                                            <Button data-test={`sc4snmp:group-row-delete-${i}`} onClick={() => deviceDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
+                                .map((row) => (
+                                    <Table.Row data-test="sc4snmp:group-row" key={createDOMID()} >
+                                        <Table.Cell data-test="sc4snmp:host-address" >{row.address}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-port" >{(row.port === '') ? GrCtx.inventoryConfig.port : row.port}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-version" >{(row.version === '') ? GrCtx.inventoryConfig.version  : row.version}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-community" >{(row.community === '') ? GrCtx.inventoryConfig.community  : row.community}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-secret" >{(row.secret === '') ? GrCtx.inventoryConfig.secret  : row.secret}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-security-engine" >{(row.securityEngine === '') ? GrCtx.inventoryConfig.securityEngine  : row.securityEngine}</Table.Cell>
+                                        <Table.Cell data-test="sc4snmp:host-actions" >
+                                            <Button data-test="sc4snmp:group-row-edit" onClick={() => deviceEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
+                                            <Button data-test="sc4snmp:group-row-delete" onClick={() => deviceDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
                                         </Table.Cell>
                                     </Table.Row>
                                 ))}
diff --git a/frontend/packages/manager/src/components/inventory/AddInventoryModal.jsx b/frontend/packages/manager/src/components/inventory/AddInventoryModal.jsx
index 13ef02d..95feea3 100644
--- a/frontend/packages/manager/src/components/inventory/AddInventoryModal.jsx
+++ b/frontend/packages/manager/src/components/inventory/AddInventoryModal.jsx
@@ -1,17 +1,17 @@
 import React, {useRef, useState, Component, useCallback, useEffect, useContext} from 'react';
-import { StyledControlGroup, StyledModalBody, StyledModalHeader } from "../../styles/inventory/InventoryStyle";
 import Modal from '@splunk/react-ui/Modal';
 import Number from '@splunk/react-ui/Number';
 import Select from '@splunk/react-ui/Select';
 import Multiselect from '@splunk/react-ui/Multiselect';
 import Text from '@splunk/react-ui/Text';
 import RadioBar from '@splunk/react-ui/RadioBar';
-import {useInventoryContext} from "../../store/inventory-contxt";
 import axios from "axios";
 import Button from '@splunk/react-ui/Button';
-import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
 import P from '@splunk/react-ui/Paragraph';
 import { createDOMID } from '@splunk/ui-utils/id';
+import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
+import {useInventoryContext} from "../../store/inventory-contxt";
+import { StyledControlGroup, StyledModalBody, StyledModalHeader } from "../../styles/inventory/InventoryStyle";
 import {useInventoryDevicesValidationContxt} from "../../store/inventory-devices-validation-contxt";
 import { validationMessage } from "../../styles/ValidationStyles";
 import ValidationGroup from "../validation/ValidationGroup";
@@ -131,7 +131,7 @@ function AddInventoryModal() {
                 walkInterval: InvCtx.walkInterval,
                 profiles: InvCtx.profiles,
                 smartProfiles: InvCtx.smartProfiles,
-                initProfiles: initProfiles
+                initProfiles
             }
         const validation = validateInventoryAndGroup(inventoryObj)
         delete inventoryObj.initProfiles;
@@ -182,13 +182,13 @@ function AddInventoryModal() {
                     <StyledControlGroup labelWidth={140} label={((InvCtx.inventoryType === "Host") ? "Host" : "Group")}>
                         <ValidationGroup>
                             <Text data-test="sc4snmp:form:group-ip-input" value={InvCtx.address} onChange={handleChangeAddress} error={(!!(ValCtx.addressErrors))}/>
-                            {((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el, i) => <P data-test={`sc4snmp:ip-group-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            {((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el) => <P data-test="sc4snmp:ip-group-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
                     <StyledControlGroup labelWidth={140} label="Port">
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:port-input" value={InvCtx.port} onChange={handleChangePort} error={((ValCtx.portErrors) ? true : false)}/>
-                            {((ValCtx.portErrors) ? ValCtx.portErrors.map((el, i) => <P data-test={`sc4snmp:port-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:port-input" value={InvCtx.port} onChange={handleChangePort} error={(!!(ValCtx.portErrors))}/>
+                            {((ValCtx.portErrors) ? ValCtx.portErrors.map((el) => <P data-test="sc4snmp:port-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
@@ -206,44 +206,44 @@ function AddInventoryModal() {
 
                     <StyledControlGroup label="Community" labelWidth={140}>
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:community-input" value={InvCtx.community} onChange={handleChangeCommunity} error={((ValCtx.communityErrors) ? true : false)}/>
-                            {((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el, i) => <P data-test={`sc4snmp:community-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:community-input" value={InvCtx.community} onChange={handleChangeCommunity} error={(!!(ValCtx.communityErrors))}/>
+                            {((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el) => <P data-test="sc4snmp:community-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup label="Secret" labelWidth={140}>
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:secret-input" value={InvCtx.secret} onChange={handleChangeSecret} error={((ValCtx.secretErrors) ? true : false)}/>
-                            {((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el, i) => <P data-test={`sc4snmp:secret-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:secret-input" value={InvCtx.secret} onChange={handleChangeSecret} error={(!!(ValCtx.secretErrors))}/>
+                            {((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el) => <P data-test="sc4snmp:secret-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup label="Security Engine" labelWidth={140}>
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:security-engine-input" value={InvCtx.securityEngine} onChange={handleChangeSecurityEngine} error={((ValCtx.securityEngineErrors) ? true : false)}/>
-                            {((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el, i) => <P data-test={`sc4snmp:security-engine-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:security-engine-input" value={InvCtx.securityEngine} onChange={handleChangeSecurityEngine} error={(!!(ValCtx.securityEngineErrors))}/>
+                            {((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el) => <P data-test="sc4snmp:security-engine-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup label="Walk Interval (s)" labelWidth={140}>
                         <ValidationGroup>
-                            <Number data-test="sc4snmp:form:walk-interval-input" value={InvCtx.walkInterval} onChange={handleChangeWalkInterval} error={((ValCtx.walkIntervalErrors) ? true : false)}/>
-                            {((ValCtx.walkIntervalErrors) ? ValCtx.walkIntervalErrors.map((el, i) => <P data-test={`sc4snmp:walk-interval-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Number data-test="sc4snmp:form:walk-interval-input" value={InvCtx.walkInterval} onChange={handleChangeWalkInterval} error={(!!(ValCtx.walkIntervalErrors))}/>
+                            {((ValCtx.walkIntervalErrors) ? ValCtx.walkIntervalErrors.map((el) => <P data-test="sc4snmp:walk-interval-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup label="Profiles" labelWidth={140}>
                         <ValidationGroup>
-                            <Multiselect data-test="sc4snmp:form:profiles-multiselect" onChange={handleChange} defaultValues={InvCtx.profiles} error={((ValCtx.profilesErrors) ? true : false)}>
-                                {initProfiles.map((v, i) => (<Multiselect.Option data-test={`sc4snmp:form:profile-${i}`} key={createDOMID()} label={v} value={v} />))}
+                            <Multiselect data-test="sc4snmp:form:profiles-multiselect" onChange={handleChange} defaultValues={InvCtx.profiles} error={(!!(ValCtx.profilesErrors))}>
+                                {initProfiles.map((v) => (<Multiselect.Option data-test="sc4snmp:form:profile" key={createDOMID()} label={v} value={v} />))}
                             </Multiselect>
-                            {((ValCtx.profilesErrors) ? ValCtx.profilesErrors.map((el, i) => <P data-test={`sc4snmp:profiles-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            {((ValCtx.profilesErrors) ? ValCtx.profilesErrors.map((el) => <P data-test="sc4snmp:profiles-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     <StyledControlGroup label="Smart Profiles enabled" labelWidth={140}>
                         <RadioBar data-test="sc4snmp:form:smart-profiles" value={InvCtx.smartProfiles} onChange={handleChangeSmartProfiles}>
-                            <RadioBar.Option data-test="sc4snmp:form:smart-profile-true" value={true} label="true"/>
+                            <RadioBar.Option data-test="sc4snmp:form:smart-profile-true" value label="true"/>
                             <RadioBar.Option data-test="sc4snmp:form:smart-profile-false" value={false} label="false"/>
                         </RadioBar>
                     </StyledControlGroup>
diff --git a/frontend/packages/manager/src/components/inventory/InventoryList.jsx b/frontend/packages/manager/src/components/inventory/InventoryList.jsx
index fa2548e..50a39ca 100644
--- a/frontend/packages/manager/src/components/inventory/InventoryList.jsx
+++ b/frontend/packages/manager/src/components/inventory/InventoryList.jsx
@@ -124,10 +124,10 @@ function InventoryList() {
                 <Select data-test="sc4snmp:inventory-pagination" appearance="pill" suffixLabel="inventory items per page"
                         value={devicesPerPage} onChange={handleDevicesPerPage}
                         defaultValue="20">
-                    <Select.Option data-test="sc4snmp:inventory-pagination-10" label="10" value="10" />
-                    <Select.Option data-test="sc4snmp:inventory-pagination-20" label="20" value="20" />
-                    <Select.Option data-test="sc4snmp:inventory-pagination-50" label="50" value="50" />
-                    <Select.Option data-test="sc4snmp:inventory-pagination-100" label="100" value="100" />
+                    <Select.Option data-test="sc4snmp:inventory-pagination-option" label="10" value="10" />
+                    <Select.Option data-test="sc4snmp:inventory-pagination-option" label="20" value="20" />
+                    <Select.Option data-test="sc4snmp:inventory-pagination-option" label="50" value="50" />
+                    <Select.Option data-test="sc4snmp:inventory-pagination-option" label="100" value="100" />
                 </Select>
                 <Paginator
                     onChange={handlePagination}
@@ -136,7 +136,7 @@ function InventoryList() {
                     totalPages={totalPages}
                 />
             </Pagination>
-            <Table stripeRows resizableFillLayout>
+            <Table data-test="sc4snmp:inventory-table" stripeRows resizableFillLayout>
                 <Table.Head>
                     {columns.map((headData) => (
                         <Table.HeadCell key={createDOMID()} width={headData.label === "Actions" ? 100 : "auto"}>
@@ -146,20 +146,20 @@ function InventoryList() {
                 </Table.Head>
                 <Table.Body>
                     {allInventoryRecords
-                        .map((row, i) => (
-                            <Table.Row data-test={`sc4snmp:inventory-row-${i}`} key={createDOMID()} elementRef={InvCtx.rowToggle}>
-                                <Table.Cell>{row.address}</Table.Cell>
-                                <Table.Cell>{row.port}</Table.Cell>
-                                <Table.Cell>{row.version}</Table.Cell>
-                                <Table.Cell>{row.community}</Table.Cell>
-                                <Table.Cell>{row.secret}</Table.Cell>
-                                <Table.Cell>{row.securityEngine}</Table.Cell>
-                                <Table.Cell>{row.walkInterval}</Table.Cell>
-                                <Table.Cell>{row.profiles.toString()}</Table.Cell>
-                                <Table.Cell>{row.smartProfiles.toString()}</Table.Cell>
-                                <Table.Cell>
-                                    <Button data-test={`sc4snmp:inventory-row-edit-${i}`} onClick={() => handleEdit(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
-                                    <Button data-test={`sc4snmp:inventory-row-delete-${i}`} onClick={() => handleDelete(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
+                        .map((row) => (
+                            <Table.Row data-test="sc4snmp:inventory-row" key={createDOMID()} elementRef={InvCtx.rowToggle}>
+                                <Table.Cell data-test="sc4snmp:inventory-address" >{row.address}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-port" >{row.port}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-version" >{row.version}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-community" >{row.community}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-secret" >{row.secret}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-security-engine" >{row.securityEngine}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-walk-interval" >{row.walkInterval}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-profiles" >{row.profiles.toString()}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-smart-profiles" >{row.smartProfiles.toString()}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:inventory-actions" >
+                                    <Button data-test="sc4snmp:inventory-row-edit" onClick={() => handleEdit(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
+                                    <Button data-test="sc4snmp:inventory-row-delete" onClick={() => handleDelete(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
                                 </Table.Cell>
                             </Table.Row>
                         ))}
diff --git a/frontend/packages/manager/src/components/profiles/AddProfileModal.jsx b/frontend/packages/manager/src/components/profiles/AddProfileModal.jsx
index ed89a46..7a02496 100644
--- a/frontend/packages/manager/src/components/profiles/AddProfileModal.jsx
+++ b/frontend/packages/manager/src/components/profiles/AddProfileModal.jsx
@@ -129,16 +129,16 @@ function AddProfileModal(props) {
                 <StyledModalBody>
                     <StyledControlGroup label="Profile name">
                         <ValidationGroup>
-                            <Text data-test="sc4snmp:form:profile-name-input" value={ProfCtx.profileName} onChange={handleProfileName} error={((ValCtx.profileNameErrors) ? true : false)}/>
-                            {((ValCtx.profileNameErrors) ? ValCtx.profileNameErrors.map((el, i) => <P data-test={`sc4snmp:profile-name-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Text data-test="sc4snmp:form:profile-name-input" value={ProfCtx.profileName} onChange={handleProfileName} error={(!!(ValCtx.profileNameErrors))}/>
+                            {((ValCtx.profileNameErrors) ? ValCtx.profileNameErrors.map((el) => <P data-test="sc4snmp:profile-name-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup>
 
                     {(ProfCtx.condition !== "walk") ?
                     <StyledControlGroup label="Frequency of polling (s)" >
                         <ValidationGroup>
-                            <Number data-test="sc4snmp:form:frequency-input" value={ProfCtx.frequency} onChange={handleFrequency} error={((ValCtx.frequencyErrors) ? true : false)}/>
-                            {((ValCtx.frequencyErrors) ? ValCtx.frequencyErrors.map((el, i) => <P data-test={`sc4snmp:frequency-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            <Number data-test="sc4snmp:form:frequency-input" value={ProfCtx.frequency} onChange={handleFrequency} error={(!!(ValCtx.frequencyErrors))}/>
+                            {((ValCtx.frequencyErrors) ? ValCtx.frequencyErrors.map((el) => <P data-test="sc4snmp:frequency-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                         </ValidationGroup>
                     </StyledControlGroup> : null}
 
diff --git a/frontend/packages/manager/src/components/profiles/Conditional.jsx b/frontend/packages/manager/src/components/profiles/Conditional.jsx
index cedc1f6..4b501ad 100644
--- a/frontend/packages/manager/src/components/profiles/Conditional.jsx
+++ b/frontend/packages/manager/src/components/profiles/Conditional.jsx
@@ -3,11 +3,11 @@ import {createDOMID} from '@splunk/ui-utils/id';
 import Text from "@splunk/react-ui/Text";
 import P from "@splunk/react-ui/Paragraph";
 import FormRows from "@splunk/react-ui/FormRows";
+import Select from "@splunk/react-ui/Select";
+import Card from '@splunk/react-ui/Card';
 import {useProfileContext} from "../../store/profile-contxt";
 import {validationGroup, validationMessage} from "../../styles/ValidationStyles";
 import {useProfilesValidationContxt} from "../../store/profiles-validation-contxt";
-import Select from "@splunk/react-ui/Select";
-import Card from '@splunk/react-ui/Card';
 import ConditionalIn from "./ConditionalIn";
 
 function Conditional(props){
@@ -109,43 +109,43 @@ function Conditional(props){
             const keyID = createDOMID();
             newIndices[`${keyID}`] = indexCopy;
             return (
-                <FormRows.Row data-test={`sc4snmp:form:conditional-row-${indexCopy}`} index={indexCopy} key={keyID} onRequestRemove={handleRequestRemove}>
+                <FormRows.Row data-test="sc4snmp:form:conditional-row" index={indexCopy} key={keyID} onRequestRemove={handleRequestRemove}>
                     <Card style={{width: "100%"}}>
                         <Card.Body>
                             <div style={validationGroup}>
-                                <Text data-test={`sc4snmp:form:conditional-field-${indexCopy}`} placeholder="Field" defaultValue={condition.field} onChange={e => handleField(newIndices[`${keyID}`], e)}
+                                <Text data-test="sc4snmp:form:conditional-field" placeholder="Field" defaultValue={condition.field} onChange={e => handleField(newIndices[`${keyID}`], e)}
                                       error={((ValCtx.conditionalFieldErrors && newIndices[`${keyID}`] in ValCtx.conditionalFieldErrors))}/>
                                 {((ValCtx.conditionalFieldErrors && newIndices[`${keyID}`] in ValCtx.conditionalFieldErrors) ?
-                                    ValCtx.conditionalFieldErrors[newIndices[`${keyID}`]].map((el, i) =>
-                                        <P data-test={`sc4snmp:conditional-field-error-${indexCopy}-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                                    ValCtx.conditionalFieldErrors[newIndices[`${keyID}`]].map((el) =>
+                                        <P data-test="sc4snmp:conditional-field-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                             </div>
                             <div style={validationGroup}>
-                                <Select data-test={`sc4snmp:form:conditional-select-operation-${indexCopy}`} value={condition.operation} onChange={(e, { value }) =>
+                                <Select data-test="sc4snmp:form:conditional-select-operation" value={condition.operation} onChange={(e, { value }) =>
                                     handleOperation(newIndices[`${keyID}`], value)} filter>
-                                    <Select.Option data-test={`sc4snmp:form:conditional-equals-${indexCopy}`} label="equals" value="equals"/>
-                                    <Select.Option data-test={`sc4snmp:form:conditional-lt-${indexCopy}`} label="less than" value="less than"/>
-                                    <Select.Option data-test={`sc4snmp:form:conditional-gt-${indexCopy}`} label="greater than" value="greater than"/>
-                                    <Select.Option  data-test={`sc4snmp:form:conditional-in-${indexCopy}`}label="in" value="in"/>
+                                    <Select.Option data-test="sc4snmp:form:conditional-equals" label="equals" value="equals"/>
+                                    <Select.Option data-test="sc4snmp:form:conditional-lt" label="less than" value="less than"/>
+                                    <Select.Option data-test="sc4snmp:form:conditional-gt" label="greater than" value="greater than"/>
+                                    <Select.Option  data-test="sc4snmp:form:conditional-in" label="in" value="in"/>
                                 </Select>
                                 <P/>
                             </div>
                             {
                                 ProfCtx.conditional[newIndices[`${keyID}`]].operation === 'in' ? (
                                         <div style={validationGroup}>
-                                            <ConditionalIn data-test={`sc4snmp:form:conditional-condition-${indexCopy}`} newSubmit={props.newSubmit} conditionIndex={newIndices[`${keyID}`]}/>
+                                            <ConditionalIn data-test="sc4snmp:form:conditional-condition" newSubmit={props.newSubmit} conditionIndex={newIndices[`${keyID}`]}/>
                                             {((ValCtx.conditionalValuesExistErrors && newIndices[`${keyID}`] in ValCtx.conditionalValuesExistErrors) ?
-                                                <P data-test={`sc4snmp:conditional-in-error-${indexCopy}`} key={createDOMID()} style={validationMessage}>{ValCtx.conditionalValuesExistErrors[newIndices[`${keyID}`]]}</P>
+                                                <P data-test="sc4snmp:conditional-in-error" key={createDOMID()} style={validationMessage}>{ValCtx.conditionalValuesExistErrors[newIndices[`${keyID}`]]}</P>
                                                 : null)}
                                         </div>
                                     ) : (
                                     <div style={validationGroup}>
-                                        <Text data-test={`sc4snmp:form:conditional-condition-${indexCopy}`} placeholder="Value" defaultValue={condition.value[0]} onChange={e => handleValue(newIndices[`${keyID}`], e)}
+                                        <Text data-test="sc4snmp:form:conditional-condition" placeholder="Value" defaultValue={condition.value[0]} onChange={e => handleValue(newIndices[`${keyID}`], e)}
                                               error={((ValCtx.conditionalValuesErrors && newIndices[`${keyID}`] in ValCtx.conditionalValuesErrors
                                                   && 0 in ValCtx.conditionalValuesErrors[newIndices[`${keyID}`]]))}/>
                                         {((ValCtx.conditionalValuesErrors && newIndices[`${keyID}`] in ValCtx.conditionalValuesErrors
                                                   && 0 in ValCtx.conditionalValuesErrors[newIndices[`${keyID}`]]) ?
-                                            ValCtx.conditionalValuesErrors[newIndices[`${keyID}`]][0].map((el, i) =>
-                                                <P data-test={`sc4snmp:conditional-condition-error-${indexCopy}-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                                            ValCtx.conditionalValuesErrors[newIndices[`${keyID}`]][0].map((el) =>
+                                                <P data-test="sc4snmp:conditional-condition-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                                     </div>
                                 )
                             }
diff --git a/frontend/packages/manager/src/components/profiles/ConditionalIn.jsx b/frontend/packages/manager/src/components/profiles/ConditionalIn.jsx
index 3b6a2b8..9b4a385 100644
--- a/frontend/packages/manager/src/components/profiles/ConditionalIn.jsx
+++ b/frontend/packages/manager/src/components/profiles/ConditionalIn.jsx
@@ -81,13 +81,13 @@ function ConditionalIn(props){
             return (
                 <FormRows.Row index={indexCopy} key={keyID} onRequestRemove={handleRequestRemove}>
                     <div style={validationGroup}>
-                        <Text data-test={`${props["data-test"]}-${indexCopy}`} defaultValue={value} placeholder={"Value"} onChange={e => handleItemValue(newIndices[`${keyID}`], e)}
+                        <Text data-test={`${props["data-test"]}`} defaultValue={value} placeholder={"Value"} onChange={e => handleItemValue(newIndices[`${keyID}`], e)}
                               error={((ValCtx.conditionalValuesErrors && props.conditionIndex in ValCtx.conditionalValuesErrors)) &&
                         newIndices[`${keyID}`] in ValCtx.conditionalValuesErrors[props.conditionIndex]}/>
                         {((ValCtx.conditionalValuesErrors && props.conditionIndex in ValCtx.conditionalValuesErrors
                          && newIndices[`${keyID}`] in ValCtx.conditionalValuesErrors[props.conditionIndex]) ?
-                                    ValCtx.conditionalValuesErrors[props.conditionIndex][newIndices[`${keyID}`]].map((el, i) =>
-                                        <P data-test={`sc4snmp:conditional-condition-error-${props["conditionIndex"]}-${indexCopy}-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                                    ValCtx.conditionalValuesErrors[props.conditionIndex][newIndices[`${keyID}`]].map((el) =>
+                                        <P data-test="sc4snmp:conditional-condition-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                     </div>
                 </FormRows.Row>
             );
diff --git a/frontend/packages/manager/src/components/profiles/FieldPatterns.jsx b/frontend/packages/manager/src/components/profiles/FieldPatterns.jsx
index 015823d..f05a210 100644
--- a/frontend/packages/manager/src/components/profiles/FieldPatterns.jsx
+++ b/frontend/packages/manager/src/components/profiles/FieldPatterns.jsx
@@ -78,13 +78,13 @@ function FieldPatterns(props){
             const keyID = createDOMID();
             newIndices[`${keyID}`] = indexCopy;
             return (
-                <FormRows.Row data-test={`sc4snmp:form:field-pattern-row-${indexCopy}`} index={indexCopy} key={keyID} onRequestRemove={handleRequestRemove}>
+                <FormRows.Row data-test="sc4snmp:form:field-pattern-row" index={indexCopy} key={keyID} onRequestRemove={handleRequestRemove}>
                     <ValidationGroup>
-                        <Text data-test={`sc4snmp:form:field-pattern-${indexCopy}`} defaultValue={value.pattern} onChange={e => handleItemValue(newIndices[`${keyID}`], e)}
+                        <Text data-test="sc4snmp:form:field-pattern" defaultValue={value.pattern} onChange={e => handleItemValue(newIndices[`${keyID}`], e)}
                               error={((ValCtx.conditionPatternsErrors && newIndices[`${keyID}`] in ValCtx.conditionPatternsErrors))}/>
                         {((ValCtx.conditionPatternsErrors && newIndices[`${keyID}`] in ValCtx.conditionPatternsErrors) ?
-                            ValCtx.conditionPatternsErrors[newIndices[`${keyID}`]].map((el, i) =>
-                                <P data-test={`sc4snmp:field-pattern-error-${indexCopy}-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
+                            ValCtx.conditionPatternsErrors[newIndices[`${keyID}`]].map((el) =>
+                                <P data-test="sc4snmp:field-pattern-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
                     </ValidationGroup>
                 </FormRows.Row>
             );
diff --git a/frontend/packages/manager/src/components/profiles/ProfilesList.jsx b/frontend/packages/manager/src/components/profiles/ProfilesList.jsx
index b69cc0d..897b5ba 100644
--- a/frontend/packages/manager/src/components/profiles/ProfilesList.jsx
+++ b/frontend/packages/manager/src/components/profiles/ProfilesList.jsx
@@ -17,29 +17,29 @@ import P from "@splunk/react-ui/Paragraph";
 
 function getExpansionRow(row) {
     return (
-        <Table.Row key={`${row._id}-expansion`}>
-            <Table.Cell>{/* Empty cell */}</Table.Cell>
-            <Table.Cell>{/* Empty cell */}</Table.Cell>
-            <Table.Cell>{/* Empty cell */}</Table.Cell>
-            <Table.Cell>
+        <Table.Row data-test="sc4snmp:profile-row-expanded" key={`${row._id}-expansion`}>
+            <Table.Cell data-test="sc4snmp:profile-name-expanded" >{/* Empty cell */}</Table.Cell>
+            <Table.Cell data-test="sc4snmp:profile-frequency-expanded" >{/* Empty cell */}</Table.Cell>
+            <Table.Cell data-test="sc4snmp:profile-type-expanded" >{/* Empty cell */}</Table.Cell>
+            <Table.Cell data-test="sc4snmp:profile-mib-component-expanded" >
                 {row.varBinds.map((value) => (
                     <P style={{height: "20px", overflow: "hidden", whiteSpace: "nowrap", textOverflow: "ellipsis"}} key={createDOMID()}>{value.component}</P>
                 ))}
             </Table.Cell>
 
-            <Table.Cell>
+            <Table.Cell data-test="sc4snmp:profile-mib-object_expanded" >
                 {row.varBinds.map((value) => (
                     <P style={{height: "20px", overflow: "hidden", whiteSpace: "nowrap", textOverflow: "ellipsis"}} key={createDOMID()}>{value.object}</P>
                 ))}
             </Table.Cell>
 
-            <Table.Cell>
+            <Table.Cell data-test="sc4snmp:profile-mib-index-expanded" >
                 {row.varBinds.map((value) => (
                     <P style={{height: "20px", overflow: "hidden", whiteSpace: "nowrap", textOverflow: "ellipsis"}} key={createDOMID()}>{value.index}</P>
                 ))}
             </Table.Cell>
 
-            <Table.Cell />
+            <Table.Cell data-test="sc4snmp:profile-actions-expanded" />
         </Table.Row>
     );
 }
@@ -155,10 +155,10 @@ function ProfilesList() {
                 <Select data-test="sc4snmp:profiles-pagination" appearance="pill" suffixLabel="profiles per page"
                         value={profilesPerPage} onChange={profilesPerPageHandler}
                         defaultValue="20">
-                    <Select.Option data-test="sc4snmp:profiles-pagination-10" label="10" value="10" />
-                    <Select.Option data-test="sc4snmp:profiles-pagination-20" label="20" value="20" />
-                    <Select.Option data-test="sc4snmp:profiles-pagination-50" label="50" value="50" />
-                    <Select.Option data-test="sc4snmp:profiles-pagination-100" label="100" value="100" />
+                    <Select.Option data-test="sc4snmp:profiles-pagination-option" label="10" value="10" />
+                    <Select.Option data-test="sc4snmp:profiles-pagination-option" label="20" value="20" />
+                    <Select.Option data-test="sc4snmp:profiles-pagination-option" label="50" value="50" />
+                    <Select.Option data-test="sc4snmp:profiles-pagination-option" label="100" value="100" />
                 </Select>
                 <Paginator
                     onChange={(event, { page }) => (paginationHandler(page))}
@@ -167,7 +167,7 @@ function ProfilesList() {
                     totalPages={totalPages}
                 />
             </Pagination>
-            <Table stripeRows resizableFillLayout rowExpansion="single">
+            <Table data-test="sc4snmp:profiles-table" stripeRows resizableFillLayout rowExpansion="single">
                 <Table.Head>
                     {columns.map((headData) => (
                         <Table.HeadCell key={createDOMID()} width={headData.label === "Actions" ? 100 : "auto"}>
@@ -177,24 +177,24 @@ function ProfilesList() {
                 </Table.Head>
                 <Table.Body>
                     {profilesRecords
-                        .map((row, i) => (
+                        .map((row) => (
                             <Table.Row
-                                data-test={`sc4snmp:profile-row-${i}`}
+                                data-test="sc4snmp:profile-row"
                                 key={row._id}
                                 expansionRow={getExpansionRow(row)}
                                 onExpansion={() => handleRowExpansion(row._id)}
                                 expanded={row._id === expandedRowId}
                             >
-                                <Table.Cell>{row.profileName}</Table.Cell>
-                                <Table.Cell>{(row.conditions.condition !=="walk" ? row.frequency : <P>N/A</P>)}</Table.Cell>
-                                <Table.Cell>{row.conditions.condition}</Table.Cell>
-                                <Table.Cell>{(row.varBinds.length === 1) ? `1 MIB family` :
-                                    `${row.varBinds.length} MIB families`}</Table.Cell>
-                                <Table.Cell>{/* MIB category is empty in this view */}</Table.Cell>
-                                <Table.Cell>{/* MIB index is empty in this view */}</Table.Cell>
-                                <Table.Cell>
-                                    <Button data-test={`sc4snmp:profile-row-edit-${i}`} onClick={() => profileEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
-                                    <Button data-test={`sc4snmp:profile-row-delete-${i}`}  onClick={() => profileDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
+                                <Table.Cell data-test="sc4snmp:profile-name" >{row.profileName}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-frequency" >{(row.conditions.condition !=="walk" ? row.frequency : <P>N/A</P>)}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-type" >{row.conditions.condition}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-mib-component" >{(row.varBinds.length === 1) ? `1 MIB component` :
+                                    `${row.varBinds.length} MIB components`}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-mib-object" >{/* MIB object is empty in this view */}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-mib-index" >{/* MIB index is empty in this view */}</Table.Cell>
+                                <Table.Cell data-test="sc4snmp:profile-actions" >
+                                    <Button data-test="sc4snmp:profile-row-edit" onClick={() => profileEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
+                                    <Button data-test="sc4snmp:profile-row-delete"  onClick={() => profileDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
                                 </Table.Cell>
                             </Table.Row>
                         ))}
diff --git a/frontend/packages/manager/src/components/profiles/VarBinds.jsx b/frontend/packages/manager/src/components/profiles/VarBinds.jsx
index 41e2a7c..d348257 100644
--- a/frontend/packages/manager/src/components/profiles/VarBinds.jsx
+++ b/frontend/packages/manager/src/components/profiles/VarBinds.jsx
@@ -90,21 +90,21 @@ function VarBinds(props){
             const keyID = createDOMID();
             newIndices[`${keyID}`] = indexCopy;
             return (
-                <FormRows.Row data-test={`sc4snmp:form:varbind-row-${indexCopy}`} index={indexCopy} key={createDOMID()} onRequestRemove={handleRequestRemove}>
+                <FormRows.Row data-test="sc4snmp:form:varbind-row" index={indexCopy} key={createDOMID()} onRequestRemove={handleRequestRemove}>
                     <ValidationGroup>
                          <div style={{display: 'flex'}}>
-                            <Text data-test={`sc4snmp:form:varbind-mib-component-input-${indexCopy}`} defaultValue={value.component} placeholder="MIB component"
+                            <Text data-test="sc4snmp:form:varbind-mib-component-input" defaultValue={value.component} placeholder="MIB component"
                                   onChange={e => handleItemValueComponent(newIndices[`${keyID}`], e)}
                                   error={((ValCtx.varBindsErrors && newIndices[`${keyID}`] in ValCtx.varBindsErrors))}/>
-                            <Text data-test={`sc4snmp:form:varbind-mib-object-input-${indexCopy}`} defaultValue={value.object} placeholder="MIB object"
+                            <Text data-test="sc4snmp:form:varbind-mib-object-input" defaultValue={value.object} placeholder="MIB object"
                                   onChange={e => handleItemValueObject(newIndices[`${keyID}`], e)}
                                   error={((ValCtx.varBindsErrors && newIndices[`${keyID}`] in ValCtx.varBindsErrors))}/>
-                            <Text data-test={`sc4snmp:form:varbind-mib-index-input-${indexCopy}`} defaultValue={value.index} placeholder="MIB index"
+                            <Text data-test="sc4snmp:form:varbind-mib-index-input" defaultValue={value.index} placeholder="MIB index"
                                   onChange={e => handleItemValueIndex(newIndices[`${keyID}`], e)}
                                   error={((ValCtx.varBindsErrors && newIndices[`${keyID}`] in ValCtx.varBindsErrors))}/>
                         </div>
                         {((ValCtx.varBindsErrors && newIndices[`${keyID}`] in ValCtx.varBindsErrors) ?
-                            ValCtx.varBindsErrors[newIndices[`${keyID}`]].map((el,i) => <P data-test={`sc4snmp:varbind-error-${indexCopy}-${i}`} key={createDOMID()}
+                            ValCtx.varBindsErrors[newIndices[`${keyID}`]].map((el,i) => <P data-test="sc4snmp:varbind-error" key={createDOMID()}
                                                                                          style={validationMessage}>{el}</P>) :
                             <P/>)}
                     </ValidationGroup>
diff --git a/frontend/packages/manager/src/tests/AddProfileModal.test.jsx b/frontend/packages/manager/src/tests/AddProfileModal.test.jsx
index bd15c65..4ddcb26 100644
--- a/frontend/packages/manager/src/tests/AddProfileModal.test.jsx
+++ b/frontend/packages/manager/src/tests/AddProfileModal.test.jsx
@@ -61,11 +61,11 @@ describe("AddProfileModal", () => {
         fireEvent.click(addVarBindButton);
         fireEvent.change(frequencyInput, {target: {value: 2}})
         let mibFamilyInput0 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-component-input-0").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-component-input")[0].querySelector("input")
         const mibCategoryInput1 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-object-input-1").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-object-input")[1].querySelector("input")
         const mibIndexInput2 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-index-input-2").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-index-input")[2].querySelector("input")
 
         fireEvent.change(mibFamilyInput0, {target: {value: "mi b"}})
         fireEvent.change(mibCategoryInput1, {target: {value: "aa?"}})
@@ -73,9 +73,9 @@ describe("AddProfileModal", () => {
         fireEvent.click(submitButton);
         await sleep(5)
 
-        let firstRow = screen.getByDataTest("sc4snmp:form:varbind-row-0")
-        const secondRow = screen.getByDataTest("sc4snmp:form:varbind-row-1")
-        const thirdRow = screen.getByDataTest("sc4snmp:form:varbind-row-2")
+        let firstRow = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0]
+        const secondRow = screen.getAllByDataTest("sc4snmp:form:varbind-row")[1]
+        const thirdRow = screen.getAllByDataTest("sc4snmp:form:varbind-row")[2]
 
         expect(within(firstRow).queryByText("MIB component can consist only of upper and lower english letters, " +
             "numbers and three special characters: '.', '-' and '_'. No spaces are allowed. MIB component can't be a number.")).toBeInTheDocument()
@@ -90,31 +90,31 @@ describe("AddProfileModal", () => {
 
         // Delete first two rows
         await sleep(10)
-        let deleteRowButton0 = screen.getByDataTest("sc4snmp:form:varbind-row-0").querySelector(`[data-test="remove"]`)
+        let deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:varbind-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
 
-        firstRow = screen.getByDataTest("sc4snmp:form:varbind-row-0")
+        firstRow = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0]
         expect(within(firstRow).queryByText("MIB-Component is required")).toBeInTheDocument()
         expect(within(firstRow).queryByText("MIB object is required when MIB index is specified")).toBeInTheDocument()
         expect(within(firstRow).queryByText("Index can't include white spaces")).toBeInTheDocument()
 
         // Delete remaining row and add the new one
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:varbind-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
         fireEvent.click(addVarBindButton);
         await sleep(10);
 
         mibFamilyInput0 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-component-input-0").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-component-input")[0].querySelector("input")
 
         fireEvent.change(mibFamilyInput0, {target: {value: "mib"}})
-        firstRow = screen.getByDataTest("sc4snmp:form:varbind-row-0")
+        firstRow = screen.getAllByDataTest("sc4snmp:form:varbind-row")[0]
         expect(within(firstRow).queryByText("MIB-Component is required")).not.toBeInTheDocument()
     })
 
@@ -139,13 +139,13 @@ describe("AddProfileModal", () => {
         fireEvent.click(addPatternButton);
         fireEvent.change(fieldInput, {target: {value: "t est"}});
 
-        let patternInput0 = screen.getByDataTest("sc4snmp:form:field-pattern-0").querySelector("input")
+        let patternInput0 = screen.getAllByDataTest("sc4snmp:form:field-pattern")[0].querySelector("input")
         fireEvent.change(patternInput0, {target: {value: "test"}})
         fireEvent.click(submitButton);
         await sleep(10)
 
-        let firstRow = screen.getByDataTest("sc4snmp:form:field-pattern-row-0")
-        const secondRow = screen.getByDataTest("sc4snmp:form:field-pattern-row-1")
+        let firstRow = screen.getAllByDataTest("sc4snmp:form:field-pattern-row")[0]
+        const secondRow = screen.getAllByDataTest("sc4snmp:form:field-pattern-row")[1]
 
         expect(screen.queryByText("Field can consist only of upper and lower english letters, " +
             "numbers and three special characters: '.' '-' and '_'. No spaces are allowed.")).toBeInTheDocument();
@@ -154,21 +154,21 @@ describe("AddProfileModal", () => {
 
         // Delete first row
         await sleep(10)
-        let deleteRowButton0 = screen.getByDataTest("sc4snmp:form:field-pattern-row-0").querySelector(`[data-test="remove"]`)
+        let deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:field-pattern-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
 
-        firstRow = screen.getByDataTest("sc4snmp:form:field-pattern-row-0")
+        firstRow = screen.getAllByDataTest("sc4snmp:form:field-pattern-row")[0]
         expect(within(firstRow).queryByText("Pattern is required")).toBeInTheDocument();
 
         // Delete remaining row and add the new one
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:field-pattern-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:field-pattern-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
         fireEvent.click(addPatternButton);
         await sleep(10)
-        patternInput0 = screen.getByDataTest("sc4snmp:form:field-pattern-0").querySelector("input")
+        patternInput0 = screen.getAllByDataTest("sc4snmp:form:field-pattern")[0].querySelector("input")
         fireEvent.change(patternInput0, {target: {value: "test"}})
         fireEvent.click(submitButton);
         await sleep(10)
@@ -195,19 +195,19 @@ describe("AddProfileModal", () => {
 
         await sleep(5);
 
-        const optionsButton1 = screen.getByDataTest("sc4snmp:form:conditional-select-operation-1")
+        const optionsButton1 = screen.getAllByDataTest("sc4snmp:form:conditional-select-operation")[1]
         fireEvent.click(optionsButton1)
         await sleep(5)
-        const inOptionButton1 = screen.getByDataTest("sc4snmp:form:conditional-in-1")
+        const inOptionButton1 = screen.getByDataTest("sc4snmp:form:conditional-in")
         fireEvent.click(inOptionButton1)
         await sleep(5)
 
         const fieldInput0 =
-            screen.getByDataTest("sc4snmp:form:conditional-field-0").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-field")[0].querySelector('[data-test="textbox"]')
         const fieldInput2 =
-            screen.getByDataTest("sc4snmp:form:conditional-field-2").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-field")[2].querySelector('[data-test="textbox"]')
         const valueInput2 =
-            screen.getByDataTest("sc4snmp:form:conditional-condition-2").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-condition")[2].querySelector('[data-test="textbox"]')
 
         fireEvent.change(fieldInput0, {target: {value: "te st"}})
         fireEvent.change(fieldInput2, {target: {value: "test"}})
@@ -220,9 +220,9 @@ describe("AddProfileModal", () => {
 
         await sleep(10);
 
-        let firstRow = screen.getByDataTest("sc4snmp:form:conditional-row-0")
-        const secondRow = screen.getByDataTest("sc4snmp:form:conditional-row-1")
-        const thirdRow = screen.getByDataTest("sc4snmp:form:conditional-row-2")
+        let firstRow = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0]
+        const secondRow = screen.getAllByDataTest("sc4snmp:form:conditional-row")[1]
+        const thirdRow = screen.getAllByDataTest("sc4snmp:form:conditional-row")[2]
 
         expect(within(firstRow).queryByText("Field can consist only of upper and lower english letters, " +
             "numbers and three special characters: '.' '-' and '_'. No spaces are allowed.")).toBeInTheDocument();
@@ -238,17 +238,17 @@ describe("AddProfileModal", () => {
 
         // Delete first and second row
         await sleep(10)
-        let deleteRowButton0 = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="remove"]`)
+        let deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
 
-        firstRow = screen.getByDataTest("sc4snmp:form:conditional-row-0")
+        firstRow = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0]
         expect(within(firstRow).queryByText("Field can consist only of upper and lower english letters, " +
             "numbers and three special characters: '.' '-' and '_'. No spaces are allowed.")).not.toBeInTheDocument();
         expect(within(firstRow).queryByText("Field is required")).not.toBeInTheDocument()
@@ -256,20 +256,20 @@ describe("AddProfileModal", () => {
 
         // Delete remaining row and add the new one
         await sleep(10)
-        deleteRowButton0 = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="remove"]`)
+        deleteRowButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0].querySelector(`[data-test="remove"]`)
         fireEvent.click(deleteRowButton0)
         await sleep(10)
         fireEvent.click(addConditionalButton);
         await sleep(10);
 
         const valueInput0 =
-            screen.getByDataTest("sc4snmp:form:conditional-condition-0").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-condition")[0].querySelector('[data-test="textbox"]')
         fireEvent.change(valueInput0, {target: {value: "2"}})
 
         fireEvent.click(submitButton)
         await sleep(5)
 
-        firstRow = screen.getByDataTest("sc4snmp:form:conditional-row-0")
+        firstRow = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0]
 
         expect(within(firstRow).queryByText("Field is required")).toBeInTheDocument()
         expect(within(firstRow).queryByText("Value is required")).not.toBeInTheDocument()
@@ -285,23 +285,23 @@ describe("AddProfileModal", () => {
         fireEvent.click(addVarBindButton);
         await sleep(20);
         const mibFamilyInput0 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-component-input-0").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-component-input")[0].querySelector("input")
         const mibCategoryInput0 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-object-input-0").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-object-input")[0].querySelector("input")
         const mibIndexInput0 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-index-input-0").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-index-input")[0].querySelector("input")
 
         const mibFamilyInput1 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-component-input-1").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-component-input")[1].querySelector("input")
         const mibCategoryInput1 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-object-input-1").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-object-input")[1].querySelector("input")
 
         const mibFamilyInput2 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-component-input-2").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-component-input")[2].querySelector("input")
         const mibCategoryInput2 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-object-input-2").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-object-input")[2].querySelector("input")
         const mibIndexInput2 =
-            screen.getByDataTest("sc4snmp:form:varbind-mib-index-input-2").querySelector("input")
+            screen.getAllByDataTest("sc4snmp:form:varbind-mib-index-input")[2].querySelector("input")
 
         fireEvent.change(mibFamilyInput0, {target: {value: "SNMPv2-MIB"}})
         fireEvent.change(mibCategoryInput0, {target: {value: "sysUpTime"}})
@@ -317,7 +317,7 @@ describe("AddProfileModal", () => {
         fireEvent.click(submitButton);
         await sleep(5)
 
-        const varBindError = screen.getByDataTest("sc4snmp:varbind-error-2-0")
+        const varBindError = screen.getByDataTest("sc4snmp:varbind-error")
         expect(varBindError.textContent).toBe("The same varBind has been already configured for this profile")
     })
 
@@ -331,9 +331,9 @@ describe("AddProfileModal", () => {
         fireEvent.click(addPatternButton);
         await sleep(20);
 
-        const patternInput0 = screen.getByDataTest("sc4snmp:form:field-pattern-0").querySelector("input")
-        const patternInput1 = screen.getByDataTest("sc4snmp:form:field-pattern-1").querySelector("input")
-        const patternInput2 = screen.getByDataTest("sc4snmp:form:field-pattern-2").querySelector("input")
+        const patternInput0 = screen.getAllByDataTest("sc4snmp:form:field-pattern")[0].querySelector("input")
+        const patternInput1 = screen.getAllByDataTest("sc4snmp:form:field-pattern")[1].querySelector("input")
+        const patternInput2 = screen.getAllByDataTest("sc4snmp:form:field-pattern")[2].querySelector("input")
 
         fireEvent.change(patternInput0, {target: {value: "test"}})
         fireEvent.change(patternInput1, {target: {value: "test2"}})
@@ -341,7 +341,7 @@ describe("AddProfileModal", () => {
         fireEvent.click(submitButton);
         await sleep(10)
 
-        const patternError = screen.getByDataTest("sc4snmp:field-pattern-error-2-0")
+        const patternError = screen.getByDataTest("sc4snmp:field-pattern-error")
         expect(patternError.textContent).toBe("The same pattern has been already configured for this profile");
     })
 
@@ -354,44 +354,44 @@ describe("AddProfileModal", () => {
         fireEvent.click(addConditionalButton);
         await sleep(10)
 
-        const optionsButton0 = screen.getByDataTest("sc4snmp:form:conditional-select-operation-0")
+        const optionsButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-select-operation")[0]
         fireEvent.click(optionsButton0)
         await sleep(10)
-        const inOptionButton0 = screen.getByDataTest("sc4snmp:form:conditional-in-0")
+        const inOptionButton0 = screen.getAllByDataTest("sc4snmp:form:conditional-in")[0]
         fireEvent.click(inOptionButton0)
         await sleep(5)
-        const firstRowField = screen.getByDataTest("sc4snmp:form:conditional-field-0").querySelector(`input`)
+        const firstRowField = screen.getAllByDataTest("sc4snmp:form:conditional-field")[0].querySelector(`input`)
         fireEvent.change(firstRowField, {target: {value: "test"}})
-        const firstRowAddValue = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="add-row"]`)
+        const firstRowAddValue = screen.getAllByDataTest("sc4snmp:form:conditional-row")[0].querySelector(`[data-test="add-row"]`)
         fireEvent.click(firstRowAddValue)
         await sleep(5)
-        const firstRowValue0 = screen.getByDataTest("sc4snmp:form:conditional-condition-0-0").querySelector(`input`)
-        const firstRowValue1 = screen.getByDataTest("sc4snmp:form:conditional-condition-0-1").querySelector(`input`)
+        const firstRowValue0 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[0].querySelector(`input`)
+        const firstRowValue1 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[1].querySelector(`input`)
         fireEvent.change(firstRowValue0, {target: {value: "a"}})
         fireEvent.change(firstRowValue1, {target: {value: "b"}})
 
 
 
-        const optionsButton1 = screen.getByDataTest("sc4snmp:form:conditional-select-operation-1")
+        const optionsButton1 = screen.getAllByDataTest("sc4snmp:form:conditional-select-operation")[1]
         fireEvent.click(optionsButton1)
         await sleep(10)
-        const inOptionButton1 = screen.getByDataTest("sc4snmp:form:conditional-in-1")
+        const inOptionButton1 = screen.getByDataTest("sc4snmp:form:conditional-in")
         fireEvent.click(inOptionButton1)
         await sleep(5)
-        const secondRowField = screen.getByDataTest("sc4snmp:form:conditional-field-1").querySelector(`input`)
+        const secondRowField = screen.getAllByDataTest("sc4snmp:form:conditional-field")[1].querySelector(`input`)
         fireEvent.change(secondRowField, {target: {value: "test"}})
-        const secondRowAddValue = screen.getByDataTest("sc4snmp:form:conditional-row-1").querySelector(`[data-test="add-row"]`)
+        const secondRowAddValue = screen.getAllByDataTest("sc4snmp:form:conditional-row")[1].querySelector(`[data-test="add-row"]`)
         fireEvent.click(secondRowAddValue)
         await sleep(5)
-        const secondRowValue0 = screen.getByDataTest("sc4snmp:form:conditional-condition-1-0").querySelector(`input`)
-        const secondRowValue1 = screen.getByDataTest("sc4snmp:form:conditional-condition-1-1").querySelector(`input`)
+        const secondRowValue0 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[2].querySelector(`input`)
+        const secondRowValue1 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[3].querySelector(`input`)
         fireEvent.change(secondRowValue0, {target: {value: "b"}})
         fireEvent.change(secondRowValue1, {target: {value: "a"}})
 
         fireEvent.click(submitButton)
         await sleep(5);
 
-        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-field-error-1-0")
+        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-field-error")
         expect(sameConditionalError.textContent).toBe("The same condition has been already configured for this profile")
     })
 
@@ -405,23 +405,23 @@ describe("AddProfileModal", () => {
         await sleep(10)
 
         const fieldInput0 =
-            screen.getByDataTest("sc4snmp:form:conditional-field-0").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-field")[0].querySelector('[data-test="textbox"]')
         const valueInput0 =
-            screen.getByDataTest("sc4snmp:form:conditional-condition-0").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-condition")[0].querySelector('[data-test="textbox"]')
         fireEvent.change(fieldInput0, {target: {value: "test"}})
         fireEvent.change(valueInput0, {target: {value: "a"}})
 
         const fieldInput1 =
-            screen.getByDataTest("sc4snmp:form:conditional-field-1").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-field")[1].querySelector('[data-test="textbox"]')
         const valueInput1 =
-            screen.getByDataTest("sc4snmp:form:conditional-condition-1").querySelector('[data-test="textbox"]')
+            screen.getAllByDataTest("sc4snmp:form:conditional-condition")[1].querySelector('[data-test="textbox"]')
         fireEvent.change(fieldInput1, {target: {value: "test"}})
         fireEvent.change(valueInput1, {target: {value: "a"}})
 
         fireEvent.click(submitButton)
         await sleep(5);
 
-        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-field-error-1-0")
+        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-field-error")
         expect(sameConditionalError.textContent).toBe("The same condition has been already configured for this profile")
     })
 
@@ -433,24 +433,24 @@ describe("AddProfileModal", () => {
         fireEvent.click(addConditionalButton);
         await sleep(10)
 
-        const optionsButton0 = screen.getByDataTest("sc4snmp:form:conditional-select-operation-0")
+        const optionsButton0 = screen.getByDataTest("sc4snmp:form:conditional-select-operation")
         fireEvent.click(optionsButton0)
         await sleep(10)
-        const inOptionButton0 = screen.getByDataTest("sc4snmp:form:conditional-in-0")
+        const inOptionButton0 = screen.getByDataTest("sc4snmp:form:conditional-in")
         fireEvent.click(inOptionButton0)
         await sleep(5)
-        const firstRowAddValue = screen.getByDataTest("sc4snmp:form:conditional-row-0").querySelector(`[data-test="add-row"]`)
+        const firstRowAddValue = screen.getByDataTest("sc4snmp:form:conditional-row").querySelector(`[data-test="add-row"]`)
         fireEvent.click(firstRowAddValue)
         await sleep(5)
-        const firstRowValue0 = screen.getByDataTest("sc4snmp:form:conditional-condition-0-0").querySelector(`input`)
-        const firstRowValue1 = screen.getByDataTest("sc4snmp:form:conditional-condition-0-1").querySelector(`input`)
+        const firstRowValue0 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[0].querySelector(`input`)
+        const firstRowValue1 = screen.getAllByDataTest("sc4snmp:form:conditional-condition")[1].querySelector(`input`)
         fireEvent.change(firstRowValue0, {target: {value: "a"}})
         fireEvent.change(firstRowValue1, {target: {value: "a"}})
 
         fireEvent.click(submitButton)
         await sleep(5);
 
-        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-condition-error-0-1-0")
+        const sameConditionalError = screen.getByDataTest("sc4snmp:conditional-condition-error")
         expect(sameConditionalError.textContent).toBe("The same value has been already configured for this condition")
     })
 })