diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/AddNewCardPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/AddNewCardPage.java
new file mode 100644
index 0000000000..070499ef0e
--- /dev/null
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/AddNewCardPage.java
@@ -0,0 +1,27 @@
+package io.mosip.test.mob.inji.pages;
+
+import io.appium.java_client.AppiumDriver;
+import io.appium.java_client.pagefactory.AndroidFindBy;
+import org.openqa.selenium.WebElement;
+
+public class AddNewCardPage extends BasePage{
+
+    @AndroidFindBy(accessibility = "issuersScreenHeader")
+    private WebElement addNewCardHeader;
+
+    @AndroidFindBy(accessibility = "issuerHeading-Mosip")
+    private WebElement downloadViaUin;
+    public AddNewCardPage(AppiumDriver driver) {
+        super(driver);
+    }
+
+    public boolean isAddNewCardPageLoaded() {
+        return this.isElementDisplayed(addNewCardHeader, "Home page");
+    }
+
+    public RetrieveIdPage clickOnDownloadViaUin(){
+        clickOnElement(downloadViaUin);
+        return new RetrieveIdPage(driver);
+    }
+
+}
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/AppUnlockMethodPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/AppUnlockMethodPage.java
index bfbde48b18..3d82fddab2 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/AppUnlockMethodPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/AppUnlockMethodPage.java
@@ -7,11 +7,11 @@
 
 public class AppUnlockMethodPage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Select App Unlock Method')]")
+    @AndroidFindBy(accessibility = "selectAppUnlockMethod")
     @iOSXCUITFindBy(accessibility = "Select App Unlock Method")
     private WebElement selectAppUnlockMethodText;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Use Passcode')]")
+    @AndroidFindBy(accessibility = "usePasscode")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Use Passcode\"`]")
     private WebElement usePasscodeButton;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/BasePage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/BasePage.java
index 6c3e5acb45..ec66bf0465 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/BasePage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/BasePage.java
@@ -8,7 +8,6 @@
 import org.openqa.selenium.support.PageFactory;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import io.mosip.test.mob.inji.utils.CommonMethods;
 
 import static java.time.Duration.ofSeconds;
 
@@ -31,7 +30,7 @@ protected boolean isElementDisplayed(By locator, long seconds, String elementNam
             ExtentLogger.pass(elementName + " is displayed");
             return true;
         } catch (Exception e) {
-            ExtentLogger.fail(elementName + " is not displayed");
+            //ExtentLogger.fail(elementName + " is not displayed");
             return false;
         }
     }
@@ -42,7 +41,7 @@ protected boolean isElementDisplayed(WebElement element, String elementName) {
             ExtentLogger.pass(elementName + " is displayed");
             return true;
         } catch (Exception e) {
-            ExtentLogger.fail(elementName + " is not displayed");
+            //ExtentLogger.fail(elementName + " is not displayed");
             return false;
         }
     }
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/ChooseLanguagePage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/ChooseLanguagePage.java
index c5ebe05ef8..ebfe0c417f 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/ChooseLanguagePage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/ChooseLanguagePage.java
@@ -4,16 +4,16 @@
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
 import org.openqa.selenium.WebElement;
-import io.mosip.test.mob.inji.utils.CommonMethods;
+import utils.CommonMethods;
 
 
 public class ChooseLanguagePage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Choose Language')]")
+    @AndroidFindBy(accessibility = "chooseLanguage")
     @iOSXCUITFindBy(accessibility = "Choose Language")
     private WebElement chooseLanguageText;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Save Preference')]")
+    @AndroidFindBy(accessibility = "savePreference")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Save Preference\"`]")
     private WebElement savePreferenceText;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/GenerateUinOrVidPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/GenerateUinOrVidPage.java
index fa18d1e0ff..67d5549b5b 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/GenerateUinOrVidPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/GenerateUinOrVidPage.java
@@ -32,9 +32,9 @@ public GenerateUinOrVidPage enterApplicationID(String applicationId) {
         return this;
     }
 
-    public OtpVerification clickOnGetUinOrVidButton() {
+    public OtpVerificationPage clickOnGetUinOrVidButton() {
         clickOnElement(getUinOrVidButton);
-        return new OtpVerification(driver);
+        return new OtpVerificationPage(driver);
     }
 
 }
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/HelpPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/HelpPage.java
index 89f44065bb..4ae3ed1995 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/HelpPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/HelpPage.java
@@ -7,7 +7,7 @@
 
 public class HelpPage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Help')]")
+    @AndroidFindBy(accessibility = "helpScreen")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Help\"`]")
     private WebElement helpText;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/HomePage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/HomePage.java
index 7e50c374ac..b957798e93 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/HomePage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/HomePage.java
@@ -7,7 +7,7 @@
 import org.openqa.selenium.WebElement;
 
 public class HomePage extends BasePage {
-    @AndroidFindBy(xpath = "//*[contains(@text,'Download Card')]")
+    @AndroidFindBy(uiAutomator = "new UiSelector().resourceId(\"downloadIcon\")")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Download Card\"`]")
     private WebElement downloadCardButton;
 
@@ -34,27 +34,35 @@ public class HomePage extends BasePage {
     @AndroidFindBy(xpath = "//*[contains(@text,'Secure Key Storage not found')]")
     private WebElement secureKeyStoragePopup;
 
+    @AndroidFindBy(xpath = "//*[contains(@text,'Some security features will be unavailable')]")
+    private WebElement securityFeatureUnavailablePopup;
+
     @AndroidFindBy(xpath = "//*[contains(@text,'OK, I')]")
     private WebElement riskItButton;
 
+    @AndroidFindBy(xpath = "//*[contains(@text,'Ok')]")
+    private WebElement okButton;
+
     @AndroidFindBy(accessibility = "pinIcon")
     private WebElement pinIcon;
 
-
     public HomePage(AppiumDriver driver) {
         super(driver);
     }
 
     public boolean isHomePageLoaded() {
-        if (isElementDisplayed(secureKeyStoragePopup, "secure key storage popup")) {
+        /*if (isElementDisplayed(secureKeyStoragePopup, "secure key storage popup")) {
             clickOnElement(riskItButton);
+        }*/
+        if (isElementDisplayed(securityFeatureUnavailablePopup, "security features will be unavailable popup")) {
+            clickOnElement(okButton);
         }
         return this.isElementDisplayed(homeButton, "Home page");
     }
 
-    public RetrieveIdPage downloadCard() {
+    public AddNewCardPage downloadCard() {
         this.clickOnElement(downloadCardButton);
-        return new RetrieveIdPage(driver);
+        return new AddNewCardPage(driver);
     }
 
     public boolean isNameDisplayed(String name) {
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/MoreOptionsPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/MoreOptionsPage.java
index b7e64c364a..abda9c5f0e 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/MoreOptionsPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/MoreOptionsPage.java
@@ -7,22 +7,22 @@
 
 public class MoreOptionsPage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Remove from Wallet')]")
+    @AndroidFindBy(accessibility = "removeFromWallet")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`name == \"listItemTitle\"`][4]")
     private WebElement removeFromWalletButton;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'More Options')]")
+    @AndroidFindBy(accessibility = "kebabTitle")
     @iOSXCUITFindBy(accessibility = "More Options")
     private WebElement moreOptionsText;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Pin Card')]")
+    @AndroidFindBy(accessibility = "pinOrUnPinCard")
     private WebElement pinOrUnPinCardButton;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Activation pending for online login!')]")
+    @AndroidFindBy(accessibility = "pendingActivationOrActivated")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Activation pending for online login!\"`]")
     private WebElement activationPending;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Activated for online login!')]")
+    @AndroidFindBy(accessibility = "profileAuthenticated")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"\uE8E8 Activated for online login!\"`][4]")
     private WebElement activatedForOnlineLoginButton;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerification.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerificationPage.java
similarity index 88%
rename from injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerification.java
rename to injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerificationPage.java
index 235e37120e..675baadcae 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerification.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/OtpVerificationPage.java
@@ -6,13 +6,13 @@
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
 import org.openqa.selenium.WebElement;
 
-public class OtpVerification extends BasePage {
+public class OtpVerificationPage extends BasePage {
 
     @AndroidFindBy(xpath = "//*[contains(@text,'OTP Verification')]")
     @iOSXCUITFindBy(accessibility = "OTP Verification")
     private WebElement otpVerificationText;
 
-    public OtpVerification(AppiumDriver driver) {
+    public OtpVerificationPage(AppiumDriver driver) {
         super(driver);
     }
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/PleaseConfirmPopupPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/PleaseConfirmPopupPage.java
index 4fe81ffd32..7df4945be0 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/PleaseConfirmPopupPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/PleaseConfirmPopupPage.java
@@ -18,8 +18,9 @@ public boolean isPleaseConfirmPopupPageLoaded() {
         return this.isElementDisplayed(yesButton, "Popup confirmation page");
     }
 
-    public void clickOnConfirmButton() {
+    public OtpVerificationPage clickOnConfirmButton() {
         clickOnElement(yesButton);
+        return new OtpVerificationPage(driver);
     }
 
 }
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/RetrieveIdPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/RetrieveIdPage.java
index a327ca441c..88b22129e2 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/RetrieveIdPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/RetrieveIdPage.java
@@ -47,9 +47,9 @@ public RetrieveIdPage setEnterIdTextBox(String uinOrVid) {
         return this;
     }
 
-    public OtpVerification clickOnGenerateCardButton() {
+    public OtpVerificationPage clickOnGenerateCardButton() {
         this.clickOnElement(generateCardButton);
-        return new OtpVerification(driver);
+        return new OtpVerificationPage(driver);
     }
 
     public GenerateUinOrVidPage clickOnGetItNowText() {
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/SetPasscode.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/SetPasscode.java
index 0931d4e20d..ed91f11ba6 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/SetPasscode.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/SetPasscode.java
@@ -1,11 +1,11 @@
 package io.mosip.test.mob.inji.pages;
 
-import io.mosip.test.mob.inji.constants.Target;
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.pagefactory.AndroidFindBy;
 import io.appium.java_client.pagefactory.iOSXCUITFindBy;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
+import io.mosip.test.mob.inji.constants.Target;
 
 public class SetPasscode extends BasePage {
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/SettingsPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/SettingsPage.java
index 2270f8f71d..8416ff510f 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/SettingsPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/SettingsPage.java
@@ -7,11 +7,11 @@
 
 public class SettingsPage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Settings')]")
+    @AndroidFindBy(accessibility = "settingsScreen")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Settings\"`]")
     private WebElement settingsTittle;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Logout')]")
+    @AndroidFindBy(accessibility = "logout")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeStaticText[`label == \"Logout\"`]")
     private WebElement logoutButton;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/UnlockApplicationPage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/UnlockApplicationPage.java
index a3a2ca0d5a..30389627b2 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/UnlockApplicationPage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/UnlockApplicationPage.java
@@ -7,7 +7,7 @@
 
 public class UnlockApplicationPage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Unlock application')]")
+    @AndroidFindBy(accessibility = "unlockApplication")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Unlock application\"`]")
     private WebElement unlockApplicationButton;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/pages/WelcomePage.java b/injitest/src/main/java/io/mosip/test/mob/inji/pages/WelcomePage.java
index 3baac755f0..fb28c573e6 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/pages/WelcomePage.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/pages/WelcomePage.java
@@ -7,19 +7,19 @@
 
 public class WelcomePage extends BasePage {
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Welcome!')]")
+    @AndroidFindBy(accessibility = "introTitle")
     @iOSXCUITFindBy(accessibility = "Welcome!")
     private WebElement welcomeText;
 
-    @AndroidFindBy(xpath = "(//*[@class='android.widget.TextView'])[3]")
+    @AndroidFindBy(accessibility = "introText")
     @iOSXCUITFindBy(xpath = "//*[contains(@value,'Keep your digital')]")
     private WebElement welcomeTextDescription;
 
-    @AndroidFindBy(xpath = "//*[contains(@text,'Skip')]")
+    @AndroidFindBy(accessibility = "skip")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeButton[`label == \"Skip\"`][1]")
     private WebElement skipButton;
 
-    @AndroidFindBy(xpath = "//*[@text='Next']")
+    @AndroidFindBy(accessibility = "next")
     @iOSXCUITFindBy(iOSClassChain = "**/XCUIElementTypeOther[`label == \"Next\"`][4]")
     private WebElement nextButton;
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ActivateVcTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ActivateVcTest.java
index 8f08d6a73a..8b4e185055 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ActivateVcTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ActivateVcTest.java
@@ -1,13 +1,14 @@
 package io.mosip.test.mob.inji.testcases;
 
-import org.testng.annotations.Test;
 import io.mosip.test.mob.inji.pages.*;
 import io.mosip.test.mob.inji.utils.TestDataReader;
+import org.testng.annotations.Test;
+
 
 import static org.testng.Assert.assertTrue;
 
 public class ActivateVcTest extends BaseTest {
-    @Test(groups = "AVT")
+    @Test
     public void activateVc() throws InterruptedException {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -27,10 +28,13 @@ public void activateVc() throws InterruptedException {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
@@ -42,7 +46,10 @@ public void activateVc() throws InterruptedException {
         PleaseConfirmPopupPage pleaseConfirmPopupPage = moreOptionsPage.clickOnActivationPending();
 
         assertTrue(pleaseConfirmPopupPage.isPleaseConfirmPopupPageLoaded(), "Verify if pop up page is displayed");
-        pleaseConfirmPopupPage.clickOnConfirmButton();
+        OtpVerificationPage otpVerificationPage = pleaseConfirmPopupPage.clickOnConfirmButton();
+
+        assertTrue(otpVerificationPage.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
+        otpVerificationPage.enterOtp(TestDataReader.readData("passcode"), target);
 
         assertTrue(moreOptionsPage.isVcActivatedForOnlineLogin(), "Verify if VC is activated");
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/BaseTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/BaseTest.java
index 418d52200b..6d147e66a5 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/BaseTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/BaseTest.java
@@ -1,11 +1,13 @@
 package io.mosip.test.mob.inji.testcases;
 
+
+import io.appium.java_client.AppiumDriver;
 import io.mosip.test.mob.inji.constants.Target;
 import io.mosip.test.mob.inji.driver.DriverManager;
 import io.mosip.test.mob.inji.exceptions.PlatformNotSupportException;
-import io.appium.java_client.AppiumDriver;
 import org.testng.annotations.*;
 
+
 import java.net.MalformedURLException;
 
 public class BaseTest {
@@ -26,10 +28,12 @@ public void setup(String platformName) {
         } catch (MalformedURLException | PlatformNotSupportException | InterruptedException e) {
             throw new RuntimeException(e);
         }
+        //ScreenRecording.startScreenRecording(driver);
     }
 
     @AfterMethod(alwaysRun = true)
     public void teardown() {
+        //ScreenRecording.stopScreenRecording(driver);
         driver.quit();
     }
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ChangeLanguageTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ChangeLanguageTest.java
index 40340db436..ebfea55a7b 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ChangeLanguageTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/ChangeLanguageTest.java
@@ -8,7 +8,7 @@
 
 public class ChangeLanguageTest extends BaseTest {
 
-	@Test(groups = "CLT")
+    @Test
     public void changeLanguage() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/DeletingVcTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/DeletingVcTest.java
index 39f1a8d466..a02d8fc2b1 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/DeletingVcTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/DeletingVcTest.java
@@ -8,7 +8,7 @@
 import static org.testng.Assert.assertTrue;
 
 public class DeletingVcTest extends BaseTest {
-	@Test(groups = "DVT")
+    @Test
     public void deleteVc() throws InterruptedException {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -28,10 +28,13 @@ public void deleteVc() throws InterruptedException {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/GenerateUinOrVidTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/GenerateUinOrVidTest.java
index ba9ec835b0..ee6299bc39 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/GenerateUinOrVidTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/GenerateUinOrVidTest.java
@@ -8,7 +8,7 @@
 
 public class GenerateUinOrVidTest extends BaseTest {
 
-	@Test(groups = "GUOVT")
+    @Test
     public void generateUinOrVidUsingAid() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -28,13 +28,16 @@ public void generateUinOrVidUsingAid() {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
         GenerateUinOrVidPage generateUinOrVidPage = retrieveIdPage.clickOnGetItNowText();
 
         assertTrue(generateUinOrVidPage.isGenerateUinOrVidPageLoaded(), "Verify if generate uin or vid page page is displayed");
-        OtpVerification otpVerification = generateUinOrVidPage.enterApplicationID(TestDataReader.readData("aid")).clickOnGetUinOrVidButton();
+        OtpVerificationPage otpVerification = generateUinOrVidPage.enterApplicationID(TestDataReader.readData("aid")).clickOnGetUinOrVidButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/PinVcTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/PinVcTest.java
index 0d2209f2e4..c8c2da2d30 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/PinVcTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/PinVcTest.java
@@ -8,7 +8,7 @@
 
 public class PinVcTest extends BaseTest {
 
-	@Test(groups = "PVT")
+    @Test
     public void pinVc() throws InterruptedException {
 
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
@@ -29,10 +29,13 @@ public void pinVc() throws InterruptedException {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/UnlockWithPasscodeTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/UnlockWithPasscodeTest.java
index 6fbc2ce284..7f0bcaec91 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/UnlockWithPasscodeTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/UnlockWithPasscodeTest.java
@@ -8,7 +8,7 @@
 
 public class UnlockWithPasscodeTest extends BaseTest {
 
-	@Test(groups = "UWPT")
+    @Test
     public void logoutAndLoginWithPasscode() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingUinTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingUinTest.java
index 3b77efc8de..c10e88cbab 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingUinTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingUinTest.java
@@ -7,7 +7,7 @@
 import static org.testng.Assert.assertTrue;
 
 public class VcDownloadAndVerifyUsingUinTest extends BaseTest {
-	@Test(groups = "VDAVUUT")
+    @Test
     public void downloadAndVerifyVcUsingUin() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -27,10 +27,13 @@ public void downloadAndVerifyVcUsingUin() {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingVidTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingVidTest.java
index 74b9661654..f6d6749e2c 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingVidTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VcDownloadAndVerifyUsingVidTest.java
@@ -7,7 +7,7 @@
 import static org.testng.Assert.assertTrue;
 
 public class VcDownloadAndVerifyUsingVidTest extends BaseTest {
-	@Test(groups = "VDAVUVT")
+    @Test
     public void downloadAndVerifyVcUsingVid() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -27,10 +27,13 @@ public void downloadAndVerifyVcUsingVid() {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.clickOnVid(target).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.clickOnVid(target).setEnterIdTextBox(TestDataReader.readData("vid")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHelpPageTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHelpPageTest.java
index 397ed639ea..91857aae6d 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHelpPageTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHelpPageTest.java
@@ -8,7 +8,7 @@
 
 public class VerifyHelpPageTest extends BaseTest {
 
-	@Test(groups = "VHPT")
+    @Test
     public void verifyHelpPage() {
 
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHistoryTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHistoryTest.java
index 414160960f..852e16b1bf 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHistoryTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyHistoryTest.java
@@ -7,7 +7,7 @@
 import static org.testng.Assert.assertTrue;
 
 public class VerifyHistoryTest extends BaseTest {
-	@Test(groups = "VHT")
+    @Test
     public void generateAndVerifyHistory() {
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
 
@@ -27,10 +27,13 @@ public void generateAndVerifyHistory() {
         HomePage homePage = confirmPasscode.confirmPasscode(TestDataReader.readData("passcode"), target);
 
         assertTrue(homePage.isHomePageLoaded(), "Verify if home page is displayed");
-        RetrieveIdPage retrieveIdPage = homePage.downloadCard();
+        AddNewCardPage addNewCardPage = homePage.downloadCard();
+
+        assertTrue(addNewCardPage.isAddNewCardPageLoaded(), "Verify if add new card page is displayed");
+        RetrieveIdPage retrieveIdPage = addNewCardPage.clickOnDownloadViaUin();
 
         assertTrue(retrieveIdPage.isRetrieveIdPageLoaded(), "Verify if retrieve id page is displayed");
-        OtpVerification otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
+        OtpVerificationPage otpVerification = retrieveIdPage.setEnterIdTextBox(TestDataReader.readData("uin")).clickOnGenerateCardButton();
 
         assertTrue(otpVerification.isOtpVerificationPageLoaded(), "Verify if otp verification page is displayed");
         otpVerification.enterOtp(TestDataReader.readData("otp"), target);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyWelcomePagesTest.java b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyWelcomePagesTest.java
index 22f06c8156..80e95cfcea 100644
--- a/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyWelcomePagesTest.java
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/testcases/VerifyWelcomePagesTest.java
@@ -3,12 +3,11 @@
 import org.testng.annotations.Test;
 import io.mosip.test.mob.inji.pages.*;
 
-import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 public class VerifyWelcomePagesTest extends BaseTest {
 
-	@Test(groups = "VWPT")
+    @Test
     public void verifyWelcomePagesContent() {
 
         ChooseLanguagePage chooseLanguagePage = new ChooseLanguagePage(driver);
diff --git a/injitest/src/main/java/io/mosip/test/mob/inji/utils/ScreenRecording.java b/injitest/src/main/java/io/mosip/test/mob/inji/utils/ScreenRecording.java
new file mode 100644
index 0000000000..4914bb8b3c
--- /dev/null
+++ b/injitest/src/main/java/io/mosip/test/mob/inji/utils/ScreenRecording.java
@@ -0,0 +1,30 @@
+package io.mosip.test.mob.inji.utils;
+
+import io.appium.java_client.AppiumDriver;
+import io.appium.java_client.screenrecording.CanRecordScreen;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Base64;
+
+public class ScreenRecording {
+
+    public static void startScreenRecording(AppiumDriver driver){
+        ((CanRecordScreen)driver).startRecordingScreen();
+    }
+
+    public static void stopScreenRecording(AppiumDriver driver){
+        String base64String = ((CanRecordScreen)driver).stopRecordingScreen();
+        byte[] data = Base64.getDecoder().decode(base64String);
+        String
+                destinationPath="report/videoRecording.mp4";
+        Path path = Paths.get(destinationPath);
+        try {
+            Files.write(path, data);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/injitest/src/main/resources/TestData.json b/injitest/src/main/resources/TestData.json
index d1c2f3a106..7f82d4b4db 100644
--- a/injitest/src/main/resources/TestData.json
+++ b/injitest/src/main/resources/TestData.json
@@ -1,9 +1,9 @@
 {
-  "uin": "6187360582",
-  "vid": "5037415473849368",
+  "uin": "5740943928",
+  "vid": "61305189560392",
   "otp": "111111",
   "passcode": "111111",
-  "fullName": "santush",
+  "fullName": "fbgfhgfhghd",
   "idType": "National card",
   "status": "Valid",
   "generatedOn": "9/5/2023",
diff --git a/injitest/target/classes/constants/Target.class b/injitest/target/classes/constants/Target.class
deleted file mode 100644
index ecb2a69432..0000000000
Binary files a/injitest/target/classes/constants/Target.class and /dev/null differ
diff --git a/injitest/target/classes/driver/DriverManager.class b/injitest/target/classes/driver/DriverManager.class
deleted file mode 100644
index 42287875c4..0000000000
Binary files a/injitest/target/classes/driver/DriverManager.class and /dev/null differ
diff --git a/injitest/target/classes/exceptions/PlatformNotSupportException.class b/injitest/target/classes/exceptions/PlatformNotSupportException.class
deleted file mode 100644
index 59f467f337..0000000000
Binary files a/injitest/target/classes/exceptions/PlatformNotSupportException.class and /dev/null differ
diff --git a/injitest/target/classes/extentReports/ExtentLogger.class b/injitest/target/classes/extentReports/ExtentLogger.class
deleted file mode 100644
index 0574383286..0000000000
Binary files a/injitest/target/classes/extentReports/ExtentLogger.class and /dev/null differ
diff --git a/injitest/target/classes/extentReports/ExtentReport.class b/injitest/target/classes/extentReports/ExtentReport.class
deleted file mode 100644
index 2d05d82c82..0000000000
Binary files a/injitest/target/classes/extentReports/ExtentReport.class and /dev/null differ
diff --git a/injitest/target/classes/listeners/Listeners.class b/injitest/target/classes/listeners/Listeners.class
deleted file mode 100644
index 614d8a2619..0000000000
Binary files a/injitest/target/classes/listeners/Listeners.class and /dev/null differ
diff --git a/injitest/target/classes/pages/AppUnlockMethodPage.class b/injitest/target/classes/pages/AppUnlockMethodPage.class
deleted file mode 100644
index 246ee4a89b..0000000000
Binary files a/injitest/target/classes/pages/AppUnlockMethodPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/BasePage.class b/injitest/target/classes/pages/BasePage.class
deleted file mode 100644
index 87a3435cf9..0000000000
Binary files a/injitest/target/classes/pages/BasePage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/ChooseLanguagePage.class b/injitest/target/classes/pages/ChooseLanguagePage.class
deleted file mode 100644
index 58906c7757..0000000000
Binary files a/injitest/target/classes/pages/ChooseLanguagePage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/ConfirmPasscode.class b/injitest/target/classes/pages/ConfirmPasscode.class
deleted file mode 100644
index de2633c6f0..0000000000
Binary files a/injitest/target/classes/pages/ConfirmPasscode.class and /dev/null differ
diff --git a/injitest/target/classes/pages/EnterYourPasscodePage.class b/injitest/target/classes/pages/EnterYourPasscodePage.class
deleted file mode 100644
index f6184699d7..0000000000
Binary files a/injitest/target/classes/pages/EnterYourPasscodePage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/GenerateUinOrVidPage.class b/injitest/target/classes/pages/GenerateUinOrVidPage.class
deleted file mode 100644
index 0f4c91cc68..0000000000
Binary files a/injitest/target/classes/pages/GenerateUinOrVidPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/HassleFreeAuthenticationPage.class b/injitest/target/classes/pages/HassleFreeAuthenticationPage.class
deleted file mode 100644
index e703da8100..0000000000
Binary files a/injitest/target/classes/pages/HassleFreeAuthenticationPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/HelpPage.class b/injitest/target/classes/pages/HelpPage.class
deleted file mode 100644
index 667e5125e1..0000000000
Binary files a/injitest/target/classes/pages/HelpPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/HistoryPage.class b/injitest/target/classes/pages/HistoryPage.class
deleted file mode 100644
index e67326fe98..0000000000
Binary files a/injitest/target/classes/pages/HistoryPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/HomePage.class b/injitest/target/classes/pages/HomePage.class
deleted file mode 100644
index f82c328c27..0000000000
Binary files a/injitest/target/classes/pages/HomePage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/MoreOptionsPage.class b/injitest/target/classes/pages/MoreOptionsPage.class
deleted file mode 100644
index d7770dde3f..0000000000
Binary files a/injitest/target/classes/pages/MoreOptionsPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/OtpVerification.class b/injitest/target/classes/pages/OtpVerification.class
deleted file mode 100644
index 62b1d4ce80..0000000000
Binary files a/injitest/target/classes/pages/OtpVerification.class and /dev/null differ
diff --git a/injitest/target/classes/pages/PleaseConfirmPopupPage.class b/injitest/target/classes/pages/PleaseConfirmPopupPage.class
deleted file mode 100644
index 823a047169..0000000000
Binary files a/injitest/target/classes/pages/PleaseConfirmPopupPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/RetrieveIdPage.class b/injitest/target/classes/pages/RetrieveIdPage.class
deleted file mode 100644
index 31eef43fad..0000000000
Binary files a/injitest/target/classes/pages/RetrieveIdPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/SecureSharingPage.class b/injitest/target/classes/pages/SecureSharingPage.class
deleted file mode 100644
index aaa9036204..0000000000
Binary files a/injitest/target/classes/pages/SecureSharingPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/SetPasscode.class b/injitest/target/classes/pages/SetPasscode.class
deleted file mode 100644
index 75a1ba6674..0000000000
Binary files a/injitest/target/classes/pages/SetPasscode.class and /dev/null differ
diff --git a/injitest/target/classes/pages/SettingsPage.class b/injitest/target/classes/pages/SettingsPage.class
deleted file mode 100644
index 4bcf47a637..0000000000
Binary files a/injitest/target/classes/pages/SettingsPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/TrustedDigitalWalletPage.class b/injitest/target/classes/pages/TrustedDigitalWalletPage.class
deleted file mode 100644
index 6f7846fd28..0000000000
Binary files a/injitest/target/classes/pages/TrustedDigitalWalletPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/UnlockApplicationPage.class b/injitest/target/classes/pages/UnlockApplicationPage.class
deleted file mode 100644
index e860a03644..0000000000
Binary files a/injitest/target/classes/pages/UnlockApplicationPage.class and /dev/null differ
diff --git a/injitest/target/classes/pages/WelcomePage.class b/injitest/target/classes/pages/WelcomePage.class
deleted file mode 100644
index 22b71e0d81..0000000000
Binary files a/injitest/target/classes/pages/WelcomePage.class and /dev/null differ
diff --git a/injitest/target/classes/utils/CommonMethods.class b/injitest/target/classes/utils/CommonMethods.class
deleted file mode 100644
index d29421c9c4..0000000000
Binary files a/injitest/target/classes/utils/CommonMethods.class and /dev/null differ
diff --git a/injitest/target/classes/utils/PropertiesReader.class b/injitest/target/classes/utils/PropertiesReader.class
deleted file mode 100644
index 2a2cab12f4..0000000000
Binary files a/injitest/target/classes/utils/PropertiesReader.class and /dev/null differ
diff --git a/injitest/target/classes/utils/TestDataReader.class b/injitest/target/classes/utils/TestDataReader.class
deleted file mode 100644
index c2f227a1dc..0000000000
Binary files a/injitest/target/classes/utils/TestDataReader.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/ActivateVcTest.class b/injitest/target/test-classes/com/test/ActivateVcTest.class
deleted file mode 100644
index 6bb1077787..0000000000
Binary files a/injitest/target/test-classes/com/test/ActivateVcTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/BaseTest.class b/injitest/target/test-classes/com/test/BaseTest.class
deleted file mode 100644
index 4c3cc14fb6..0000000000
Binary files a/injitest/target/test-classes/com/test/BaseTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/ChangeLanguageTest.class b/injitest/target/test-classes/com/test/ChangeLanguageTest.class
deleted file mode 100644
index 6225ad2ef9..0000000000
Binary files a/injitest/target/test-classes/com/test/ChangeLanguageTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/DeletingVcTest.class b/injitest/target/test-classes/com/test/DeletingVcTest.class
deleted file mode 100644
index 672906262e..0000000000
Binary files a/injitest/target/test-classes/com/test/DeletingVcTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/GenerateUinOrVidTest.class b/injitest/target/test-classes/com/test/GenerateUinOrVidTest.class
deleted file mode 100644
index c10e245713..0000000000
Binary files a/injitest/target/test-classes/com/test/GenerateUinOrVidTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/PinVcTest.class b/injitest/target/test-classes/com/test/PinVcTest.class
deleted file mode 100644
index a2954cff99..0000000000
Binary files a/injitest/target/test-classes/com/test/PinVcTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/UnlockWithPasscodeTest.class b/injitest/target/test-classes/com/test/UnlockWithPasscodeTest.class
deleted file mode 100644
index 8122cea628..0000000000
Binary files a/injitest/target/test-classes/com/test/UnlockWithPasscodeTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingUinTest.class b/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingUinTest.class
deleted file mode 100644
index a03b4f612a..0000000000
Binary files a/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingUinTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingVidTest.class b/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingVidTest.class
deleted file mode 100644
index d860d5bedb..0000000000
Binary files a/injitest/target/test-classes/com/test/VcDownloadAndVerifyUsingVidTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/VerifyHelpPageTest.class b/injitest/target/test-classes/com/test/VerifyHelpPageTest.class
deleted file mode 100644
index 74a3e659a7..0000000000
Binary files a/injitest/target/test-classes/com/test/VerifyHelpPageTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/VerifyHistoryTest.class b/injitest/target/test-classes/com/test/VerifyHistoryTest.class
deleted file mode 100644
index 50a8abd95a..0000000000
Binary files a/injitest/target/test-classes/com/test/VerifyHistoryTest.class and /dev/null differ
diff --git a/injitest/target/test-classes/com/test/VerifyWelcomePagesTest.class b/injitest/target/test-classes/com/test/VerifyWelcomePagesTest.class
deleted file mode 100644
index 0eaacc3033..0000000000
Binary files a/injitest/target/test-classes/com/test/VerifyWelcomePagesTest.class and /dev/null differ