diff --git a/.gitignore b/.gitignore
index 9f681b7cd5..35b34dc9e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,6 @@
 .gradle/
 .project
 .settings/
-captcha.txt
-config.xml
-config.yml
 chromedriver.log
 bin/
 build/
diff --git a/config.xml b/config.xml
new file mode 100644
index 0000000000..c1cdca883c
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,85 @@
+ci.user.regular.username=Manishgoyaler
+ci.user.regular.password=Rogers123
+ci.user.regular2.username=Manishgoyaler
+ci.user.regular2.password=Rogers123
+ci.user.regular3.username=Manishgoyaler
+ci.user.regular3.password=Rogers123
+ci.user.regular4.username=Manishgoyaler
+ci.user.regular4.password=Rogers123
+ci.user.regular5.username=Manishgoyaler
+ci.user.regular5.password=Rogers123
+ci.user.regular6.username=Manishgoyaler
+ci.user.regular6.password=Rogers123
+ci.user.regular7.username=Manishgoyaler
+ci.user.regular7.password=Rogers123
+ci.user.regular8.username=Manishgoyaler
+ci.user.regular8.password=Rogers123
+ci.user.regular9.username=Manishgoyaler
+ci.user.regular9.password=Rogers123
+ci.user.regular10.username=Manishgoyaler
+ci.user.regular10.password=Rogers123
+ci.user.regular11.username=Manishgoyaler
+ci.user.regular11.password=Rogers123
+ci.user.regular12.username=Manishgoyaler
+ci.user.regular12.password=Rogers123
+ci.user.regular13.username=Manishgoyaler
+ci.user.regular13.password=Rogers123
+ci.user.language1.username=Manishgoyaler
+ci.user.language1.password=Rogers123
+ci.user.language2.username=Manishgoyaler
+ci.user.language2.password=Rogers123
+ci.user.language3.username=Manishgoyaler
+ci.user.language3.password=Rogers123
+ci.user.language4.username=Manishgoyaler
+ci.user.language4.password=Rogers123
+ci.user.language5.username=Manishgoyaler
+ci.user.language5.password=Rogers123
+ci.user.language6.username=Manishgoyaler
+ci.user.language6.password=Rogers123
+ci.user.language7.username=Manishgoyaler
+ci.user.language7.password=Rogers123
+ci.user.language8.username=Manishgoyaler
+ci.user.language8.password=Rogers123
+ci.user.language9.username=Manishgoyaler
+ci.user.language9.password=Rogers123
+ci.user.language10.username=Manishgoyaler
+ci.user.language10.password=Rogers123
+ci.user.language11.username=Manishgoyaler
+ci.user.language11.password=Rogers123
+ci.user.closeAccountUser.username=Manishgoyaler
+ci.user.closeAccountUser.password=Rogers123
+ci.user.blockedAccountUser.username=Manishgoyaler
+ci.user.blockedAccountUser.password=Rogers123
+ci.user.wikiastaff.username=Manishgoyaler
+ci.user.wikiastaff.id=""
+ci.user.wikiastaff.password=Rogers123
+ci.user.wikiastaff2.username=Manishgoyaler
+ci.user.wikiastaff2.password=Rogers123
+ci.user.wikiamonobook.username=Manishgoyaler
+ci.user.wikiamonobook.password=Rogers123
+ci.user.facebook.password=Rogers123
+ci.user.facebook.username=Manishgoyaler
+ci.email.generic.password=Rogers123
+ci.email.qawikia1.username=Manishgoyaler
+ci.email.qawikia1.password=Rogers123
+ci.email.qawikia2.username=Manishgoyaler
+ci.email.qawikia2.password=Rogers123
+ci.email.qawikia4.username=Manishgoyaler
+ci.email.qawikia4.password=Rogers123
+ci.user.tooManyLoginAttempts.username=Manishgoyaler
+ci.user.tooManyLoginAttempts.password=Rogers123
+ci.user.forgottenpassword=Rogers123.username=Manishgoyaler1
+ci.user.forgottenpassword=Rogers123.username=Manishgoyaler2
+ci.user.forgottenpassword=Rogers123.username=Manishgoyaler3
+ci.user.vePreferredUser.username=Manishgoyaler
+ci.user.vePreferredUser.password=Rogers123
+ci.user.ckPreferredUser.username=Manishgoyaler
+ci.user.ckPreferredUser.password=Rogers123
+ci.user.sourcePreferredUser.username=Manishgoyaler
+ci.user.sourcePreferredUser.password=Rogers123
+ci.user.defaultPreferredUser.username=Manishgoyaler
+ci.user.defaultPreferredUser.password=Rogers123
+ci.user.goSearchPreferredUser.username=Manishgoyaler
+ci.user.goSearchPreferredUser.password=Rogers123
+ci.api.token=""
+ci.api.youtube.key=""
\ No newline at end of file
diff --git a/config_default.yml b/config_default.yml
index 3c27bf784a..c47d850aa3 100644
--- a/config_default.yml
+++ b/config_default.yml
@@ -2,11 +2,11 @@
 # To localy override values, create config.yml file next to this one.
 # You can also override these values by specyfing a system property
 
-browser: FF # acceptable values: FF, CHROME, GHOST, ANDROID, CHROMEMOBILEMERCURY, HTMLUNIT
+browser: CHROME # acceptable values: FF, CHROME, GHOST, ANDROID, CHROMEMOBILEMERCURY, HTMLUNIT
 wikiName: mediawiki119 # default testing wiki
 env: prod # acceptable values: prod, preview, sandbox-number dev-name
-credentialsPath: /selenium-config/config.xml # Path to your config.xml file
-captchaPath: /selenium-config/captcha.txt # Path to your captcha.txt file
+credentialsPath: config.xml # Path to your config.xml file
+captchaPath: captcha.txt # Path to your captcha.txt file
 qs: null
 disableFlash: true
 jsErrorsEnabled: false
diff --git a/pom.xml b/pom.xml
index 31a7576ba8..f0e0b13bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,11 @@
 			<artifactId>htmlunit</artifactId>
 			<version>2.18</version>
 		</dependency>
+		 <dependency>
+        <groupId>org.littleshoot</groupId>
+        <artifactId>littleproxy</artifactId>
+        <version>1.1.0-beta1</version>
+    	</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -160,7 +165,7 @@
 					<suiteXmlFiles>
 						<suiteXmlFile>${testSuite}</suiteXmlFile>
 					</suiteXmlFiles>
-					<argLine>-Xms800m -Xmx800m -XX:MaxPermSize=1024m</argLine>
+					<argLine>-Xms800m -Xmx800m -XX:MaxPermSize=1024m -Djava.awt.headless=true</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/src/test/java/com/wikia/webdriver/common/core/XMLReader.java b/src/test/java/com/wikia/webdriver/common/core/XMLReader.java
index 7b6a72690f..05d9d88ec2 100644
--- a/src/test/java/com/wikia/webdriver/common/core/XMLReader.java
+++ b/src/test/java/com/wikia/webdriver/common/core/XMLReader.java
@@ -5,8 +5,13 @@
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
 
 public class XMLReader {
 
@@ -21,14 +26,45 @@ private XMLReader() {
    */
   public static String getValue(File file, String key) {
 
-    try {
+    /*try {
       XMLConfiguration xml = new XMLConfiguration(file);
       return xml.getString(key);
     } catch (ConfigurationException e) {
       PageObjectLogging.log("Error while reading XML config", e, false);
 
       return e.getMessage();
+    }*/
+
+    Properties prop = new Properties();
+    InputStream input = null;
+
+    try {
+
+      input = new FileInputStream(file);
+
+      // load a properties file
+      prop.load(input);
+
+      // get the property value and print it out
+      System.out.println("value for " + key + " = " + prop.getProperty(key));
+      if(StringUtils.isEmpty(prop.getProperty(key)) ) {
+        System.out.println("Can not find value for " + key);
+      }
+      return prop.getProperty(key);
+
+    } catch (IOException ex) {
+      ex.printStackTrace();
+    } finally {
+      if (input != null) {
+        try {
+          input.close();
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
     }
+    System.out.println("Can not find value for " + key);
+    return "";
   }
 
   public static String getValue(String key) {
diff --git a/src/test/java/com/wikia/webdriver/testcases/interactivemapstests/PinMapTests.java b/src/test/java/com/wikia/webdriver/testcases/interactivemapstests/PinMapTests.java
index a4a82c2b5e..a701db9909 100644
--- a/src/test/java/com/wikia/webdriver/testcases/interactivemapstests/PinMapTests.java
+++ b/src/test/java/com/wikia/webdriver/testcases/interactivemapstests/PinMapTests.java
@@ -82,8 +82,9 @@ public void PinMapTests_003_VerifyPinCreationErrors() {
   @RelatedIssue(issueID = " ",
       comment = "This maps test should not fail")
   @DontRun(env = {"dev", "sandbox", "preview"})
-  @Test(groups = {"PinMapTests_004", "PinMapTests", "InteractiveMaps"},
-      dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  @Test(groups = {"PinMapTests_004", "PinMapTests", "InteractiveMaps"}
+  //,dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  )
   @Execute(asUser = User.USER)
   public void PinMapTests_004_VerifyPopUpAfterClickPin() {
     WikiBasePageObject base = new WikiBasePageObject(driver);
@@ -97,8 +98,9 @@ public void PinMapTests_004_VerifyPopUpAfterClickPin() {
   }
 
   @DontRun(env = {"dev", "sandbox", "preview"})
-  @Test(enabled = false, groups = {"PinMapTests_005", "PinMapTests", "InteractiveMaps"},
-      dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  @Test(enabled = false, groups = {"PinMapTests_005", "PinMapTests", "InteractiveMaps"}
+  //,dependsOnMethods = "PinMapTests_006_VerifyChangePinData")
+  )
   @Execute(asUser = User.USER)
   public void PinMapTests_005_VerifyDeletePin() {
     WikiBasePageObject base = new WikiBasePageObject(driver);
diff --git a/src/test/java/com/wikia/webdriver/testsuites/testSuite.xml b/src/test/java/com/wikia/webdriver/testsuites/testSuite.xml
index 88ad11ca7a..e65dc4f202 100644
--- a/src/test/java/com/wikia/webdriver/testsuites/testSuite.xml
+++ b/src/test/java/com/wikia/webdriver/testsuites/testSuite.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Wikia test suite" configfailurepolicy="continue">
+<suite name="Wikia test suite" configfailurepolicy="continue" allow-return-values="true">
     <listeners>
         <listener class-name="com.wikia.webdriver.common.testnglisteners.InvokeMethodAdapter"/>
     </listeners>