diff --git a/src/main/java/SignInTest.java b/src/main/java/SignInTest.java
index 2c109950..d3beea71 100644
--- a/src/main/java/SignInTest.java
+++ b/src/main/java/SignInTest.java
@@ -1,30 +1,60 @@
-import com.sun.javafx.PlatformUtil;
+import java.util.concurrent.TimeUnit;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
 import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
-public class SignInTest {
+import com.sun.javafx.PlatformUtil;
 
-    WebDriver driver = new ChromeDriver();
+public class SignInTest {
 
+    WebDriver driver ;
+    SignInTestElements sine;
+    
+    @BeforeTest
+    public void beforeTest() {
+    	setDriverPath();
+    	ChromeOptions options = new ChromeOptions();
+    	options.addArguments("--disable-notifications");
+    	driver = new ChromeDriver(options);
+    	sine = new SignInTestElements(driver);
+    }
     @Test
     public void shouldThrowAnErrorIfSignInDetailsAreMissing() {
 
-        setDriverPath();
-
         driver.get("https://www.cleartrip.com/");
-        waitFor(2000);
-
-        driver.findElement(By.linkText("Your trips")).click();
-        driver.findElement(By.id("SignIn")).click();
+        driver.manage().window().fullscreen();
+        driver.manage().timeouts().pageLoadTimeout(5, TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
+        
+//        waitFor(2000);
+        
+        //driver.findElement(By.linkText("Your trips")).click();
+        sine.yourTripsElement().click();
+        //driver.findElement(By.id("SignIn")).click();
+        sine.signInElement().click();
 
-        driver.findElement(By.id("signInButton")).click();
-
-        String errors1 = driver.findElement(By.id("errors1")).getText();
+        //driver.findElement(By.id("signInButton")).click();
+        driver.switchTo().frame(sine.iFrameElement());
+        sine.signInButtonElement().click();
+        
+        String errors1 = sine.errorMsgElement().getText();
         Assert.assertTrue(errors1.contains("There were errors in your submission"));
-        driver.quit();
+        
+        driver.switchTo().parentFrame();
+    }
+    
+    @AfterTest
+    public void afterTest()
+    {
+    	driver.close();
+    	driver.quit();
     }
 
     private void waitFor(int durationInMilliSeconds) {
@@ -35,7 +65,8 @@ private void waitFor(int durationInMilliSeconds) {
         }
     }
 
-    private void setDriverPath() {
+    @SuppressWarnings("restriction")
+	private void setDriverPath() {
         if (PlatformUtil.isMac()) {
             System.setProperty("webdriver.chrome.driver", "chromedriver");
         }