diff --git a/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/Breeding_SuccessPage.java b/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/Breeding_SuccessPage.java
index a22ce11..cad2a4b 100644
--- a/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/Breeding_SuccessPage.java
+++ b/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/Breeding_SuccessPage.java
@@ -16,6 +16,9 @@ public class Breeding_SuccessPage extends BasePage{
 	@AndroidFindBy(id = "home") 
 	private MobileElement home;
 	
+	@AndroidFindBy(id = "record_another_cattle") 
+	private MobileElement record_another;
+	
 	public void pressSubmitButton() {
 		waitVisibility(submit_btn);
 		click(submit_btn);
@@ -29,5 +32,8 @@ public void homeButton() {
 		click(home);
 	}
 	
+	public void recordAnotherActivity() throws Exception {
+		record_another.click();
+	}
 
 }
diff --git a/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/SP_HomePage.java b/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/SP_HomePage.java
index 9fdf284..f7054b7 100644
--- a/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/SP_HomePage.java
+++ b/AndroidAutomation_ServiceProvider/src/main/java/com/nitara/PageObjects/SP_HomePage.java
@@ -147,6 +147,11 @@ public void click_SettingsButton()
 		click(settings);	
 	}
 	
+	public void click_HomeButton()
+	{	waitForVisibility(home_btn);
+		click(home_btn);	
+	}
+	
 	
 	
 	
diff --git a/AndroidAutomation_ServiceProvider/src/main/resources/TestData.xlsx b/AndroidAutomation_ServiceProvider/src/main/resources/TestData.xlsx
index 878bcd5..1f9cba1 100644
Binary files a/AndroidAutomation_ServiceProvider/src/main/resources/TestData.xlsx and b/AndroidAutomation_ServiceProvider/src/main/resources/TestData.xlsx differ
diff --git a/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/Helper.java b/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/Helper.java
index 6f6e76f..89b11c3 100644
--- a/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/Helper.java
+++ b/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/Helper.java
@@ -21,7 +21,6 @@ public void goTo_AddBreedingActivityScreenFromBasicCP(String CoopTag, String act
 		basicCattleProfilePage.select_breeding();
 		basicCattleProfilePage.waitForPageLoad();
 		breedingActivityListPage.select_Activity(activity);
-		breedingActivityListPage.waitForPageLoad();
 		
 		
 	}
diff --git a/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/HelperFunctions.java b/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/HelperFunctions.java
index d146fa1..3ed2103 100644
--- a/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/HelperFunctions.java
+++ b/AndroidAutomation_ServiceProvider/src/test/java/appCommonClasses/HelperFunctions.java
@@ -154,7 +154,7 @@ public void submitData() {
 		//submitDataSuccessPage.assert_successMsg();
 //		submitDataSuccessPage.assert_totalRequest("1");
 //		submitDataSuccessPage.assert_requestSubmitted("1");
-		enterOTPPage.waitForPageLoad();
+		enterOTPPage.waitForPageLoadBar();
 		submitDataSuccessPage.goto_Homepage();
 		
 		
diff --git a/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/AccountManagement/Login.java b/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/AccountManagement/Login.java
index 81801dc..ff0c911 100644
--- a/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/AccountManagement/Login.java
+++ b/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/AccountManagement/Login.java
@@ -16,11 +16,13 @@ public void Login_ValidData() throws Exception {
 		
 		/** Select Language */
 		chooseLanguagePage.select_Language("ENGLISH");
+		chooseLanguagePage.waitForPageLoadBar();
 		chooseLanguagePage.click_skipBtn(); // Skip Tutorial
 		
 		/** Enter Phone Number **/
 		enterPhoneNoPage.enter_PhoneNo("8820288909");
 		enterPhoneNoPage.click_continue();
+		enterPhoneNoPage.waitForPageLoadBar();
 		
 		/** Enter PIN */
 		enterPinPage.enter_pin("123456");
diff --git a/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/BreedingManagement/AddPD.java b/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/BreedingManagement/AddPD.java
index f2a1d5e..f03904a 100644
--- a/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/BreedingManagement/AddPD.java
+++ b/AndroidAutomation_ServiceProvider/src/test/java/com/nitara/BreedingManagement/AddPD.java
@@ -27,7 +27,6 @@ public void PD_AddData(Map<String,String> data) throws Exception {
 		RegisterMilkingCattle reg = new RegisterMilkingCattle();
 		String coopTag = reg.registerMilkingOrDryCattle(url,"RegisterMilkingCattle_Inseminated");
 		
-		
 		//helperFunctions.Insemination_ForGivenDate(coopTag,new GenerateData().getPastDate(283));
 		
 		new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
@@ -44,4 +43,100 @@ public void PD_AddData(Map<String,String> data) throws Exception {
 		/** Submit data and assert success message */
 		new HelperFunctions().submitData();
 	}
+	
+	@Test(groups="Regression",dataProvider = "getData",dataProviderClass = DataProviderUtils.class)
+	public void PD_NoInseminationData(Map<String,String> data) throws Exception {
+	
+	/**Login **/
+	new Login().Login_ValidData();
+	
+	/** Register cattle */
+	String url = prop.getProperty("APIbaseUrl");
+	RegisterMilkingCattle reg = new RegisterMilkingCattle();
+	String coopTag = reg.registerMilkingOrDryCattle(url,"RegisterMilkingOrDryCattle");
+	
+	new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
+	
+	/** Assert warning */
+	addPDPage.assertWarningMsg(data.get("warningMessage"));
+	}
+	
+	@Test(groups="Regression",dataProvider = "getData",dataProviderClass = DataProviderUtils.class)
+	public void PD_PDdateWithin21DaysOfInseminationdate(Map<String,String> data) throws Exception {
+	
+	/**Login **/
+	new Login().Login_ValidData();
+	
+	/** Register cattle */
+	String url = prop.getProperty("APIbaseUrl");
+	RegisterMilkingCattle reg = new RegisterMilkingCattle();
+	String coopTag = reg.registerMilkingOrDryCattle(url,"RegisterMilkingCattle_Inseminated");
+	
+	new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
+	
+	/** Fill PD form */
+	addPDPage.enter_PDdate(data.get("pregnancyTestDate"));
+	addPDPage.press_SaveButton();
+	
+	/** Assert warning */
+	addPDPage.assertWarningMsg(data.get("warningMessage"));
+	}
+	
+	@Test(groups="Regression",dataProvider = "getData",dataProviderClass = DataProviderUtils.class)
+	public void PD_PDdateWithin21DaysOfPDdate(Map<String,String> data) throws Exception {
+	
+	/**Login **/
+	new Login().Login_ValidData();
+	
+	/** Register cattle */
+	String url = prop.getProperty("APIbaseUrl");
+	RegisterMilkingCattle reg = new RegisterMilkingCattle();
+	String coopTag = reg.registerMilkingOrDryCattle(url,"RegisterMilkingCattle_Inseminated");
+	
+	new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
+	
+	/** Fill PD form */
+	addPDPage.enter_PDdate(data.get("pregnancyTestDate"));
+	addPDPage.press_SaveButton();
+	
+	/** Submit data and assert success message */
+	breedingSuccessPage.pressSubmitButton();
+	new HelperFunctions().submitData();
+	
+	new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
+	
+	/** Fill another PD form */
+	addPDPage.enter_PDdate(data.get("SecondpregnancyTestDate"));
+	addPDPage.press_SaveButton();	
+	
+	/** Assert warning */
+	addPDPage.assertWarningMsg(data.get("warningMessage"));
+	}
+	
+	@Test(groups="Regression",dataProvider = "getData",dataProviderClass = DataProviderUtils.class)
+	public void PD_recording2PDActivitiesInOfflineMode(Map<String,String> data) throws Exception {
+	
+	/**Login **/
+	new Login().Login_ValidData();
+	
+	/** Register cattle */
+	String url = prop.getProperty("APIbaseUrl");
+	RegisterMilkingCattle reg = new RegisterMilkingCattle();
+	String coopTag = reg.registerMilkingOrDryCattle(url,"RegisterMilkingCattle_Inseminated");
+	
+	new Helper().goTo_AddBreedingActivityScreenFromBasicCP(coopTag,"pd");
+	
+	/** Fill PD form */
+	addPDPage.enter_PDdate(data.get("pregnancyTestDate"));
+	addPDPage.press_SaveButton();
+	
+	/** Fill another PD form */
+	breedingSuccessPage.recordAnotherActivity();
+	breedingActivityListPage.select_pd();
+	addPDPage.enter_PDdate(data.get("SecondpregnancyTestDate"));
+	addPDPage.press_SaveButton();	
+	
+	/** Assert warning */
+	addPDPage.assertWarningMsg(data.get("warningMessage"));
+	}
 }