diff --git a/inji-web/src/components/Common/ItemBox.tsx b/inji-web/src/components/Common/ItemBox.tsx
index 4fd447c..e31bc3f 100644
--- a/inji-web/src/components/Common/ItemBox.tsx
+++ b/inji-web/src/components/Common/ItemBox.tsx
@@ -4,7 +4,7 @@ import {ItemBoxProps} from "../../types/components";
 export const ItemBox: React.FC<ItemBoxProps> = (props) => {
     return <React.Fragment>
         <div key={props.index}
-             data-testid="ItemBox-Outer-Container"
+             data-testid={`ItemBox-Outer-Container-${props.index}`}
              className="bg-iw-tileBackground shadow flex flex-row shadow-iw-shadow p-4 rounded-md cursor-pointer items-center"
              onClick={props.onClick}>
             <img data-testid="ItemBox-Logo" src={props.url} alt="Issuer Logo"
diff --git a/inji-web/src/components/Common/LanguageSelector.tsx b/inji-web/src/components/Common/LanguageSelector.tsx
index ad0d7f5..08a779e 100644
--- a/inji-web/src/components/Common/LanguageSelector.tsx
+++ b/inji-web/src/components/Common/LanguageSelector.tsx
@@ -33,8 +33,9 @@ export const LanguageSelector: React.FC = () => {
             <button
                 type="button"
                 className="inline-flex items-center"
+                data-testid={"Language-Selector-Button"}
                 onMouseDown={() => setIsOpen(open => !isOpen)}>
-                <p>{LanguagesSupported.find(lang => lang.value === language)?.label}</p>
+                <p data-testid={`Language-Selector-Selected-DropDown-${language}`}>{LanguagesSupported.find(lang => lang.value === language)?.label}</p>
                 {isOpen ? <RiArrowUpSFill size={20} color={'var(--iw-color-languageArrowIcon)'} /> : <RiArrowDownSFill size={20} color={'var(--iw-color-languageArrowIcon)'}/> }
             </button>
 
@@ -44,6 +45,7 @@ export const LanguageSelector: React.FC = () => {
                     <ul className="py-1 divide-y divide-gray-200">
                         {LanguagesSupported.map((item) => (
                             <li key={item.value}
+                                data-testid={`Language-Selector-DropDown-Item-${item.value}`}
                                 className={language === item.value ? "text-iw-primary" : ""}>
                                 <button
                                     type="button"