diff --git a/.project b/.project
deleted file mode 100644
index 54b94984712..00000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Resteasy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2..00000000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 390d07ff105..445a9dc3ae1 100755
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -146,23 +146,17 @@
                 <module>resteasy-bom</module>
                 <module>resteasy-cache</module>
                 <module>resteasy-guice</module>
-                <!-- <module>eagledns</module> -->
                 <module>security</module>
                 <module>resteasy-links</module>
                 <module>resteasy-spring</module>
                 <module>resteasy-jsapi</module>
-                <!-- <module>resteasy-jsapi-testing</module> -->
                 <module>resteasy-cdi</module>
                 <module>resteasy-servlet-initializer</module>
                 <module>server-adapters</module>
                 <module>war-tests</module>
-                <!-- <module>as8-integration-testing/ejb-singleton-test</module> -->
                 <module>async-http-servlet-3.0</module>
-                <!--<module>examples</module>-->
                 <module>jboss-modules</module>
                 <module>profiling-tests</module>
-                <!-- <module>arquillian</module> -->
-                <!-- <module>as7-integration-testing/modules-test</module> -->
             </modules>
         </profile>
         <profile>
diff --git a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/asynch/AsynchTest.java b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/asynch/AsynchTest.java
index 3cc37f55a8a..33a4d50422c 100644
--- a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/asynch/AsynchTest.java
+++ b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/asynch/AsynchTest.java
@@ -29,7 +29,6 @@
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
  * @version $Revision: 1 $
  */
-@Ignore("https://issues.jboss.org/browse/RESTEASY-1217")
 public class AsynchTest
 {
    private static CountDownLatch latch;
@@ -96,6 +95,7 @@ public static void before() throws Exception
    public static void after() throws Exception
    {
       EmbeddedContainer.stop();
+      Thread.sleep(1000);
    }
 
    @Test
@@ -150,11 +150,13 @@ public void testAsynch() throws Exception
          URI newURI = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), query, uri.getFragment());
          request = new ClientRequest(newURI.toString());
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatus());
          Assert.assertEquals(response.getEntity(String.class), "content");
 
          // test its still there
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatus());
          Assert.assertEquals(response.getEntity(String.class), "content");
 
@@ -163,6 +165,7 @@ public void testAsynch() throws Exception
          response = request.delete();
          Assert.assertEquals(HttpServletResponse.SC_NO_CONTENT, response.getStatus());
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_GONE, response.getStatus());
          response.releaseConnection();
       }
@@ -188,12 +191,14 @@ public void testAsynch() throws Exception
 
          request = new ClientRequest(jobUrl1);
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_GONE, response.getStatus());
          response.releaseConnection();
 
          // test its still there
          request = new ClientRequest(jobUrl2);
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_OK, response.getStatus());
          Assert.assertEquals(response.getEntity(String.class), "content");
 
@@ -224,6 +229,7 @@ public void testAsynch() throws Exception
          Assert.assertEquals(response.getEntity(String.class), "content");         
 
          response = request.get();
+         Thread.sleep(1000);
          Assert.assertEquals(HttpServletResponse.SC_GONE, response.getStatus());
          response.releaseConnection();
       }
diff --git a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestSecureProcessing.java b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestSecureProcessing.java
index 6b958de62f0..139d162d611 100644
--- a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestSecureProcessing.java
+++ b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestSecureProcessing.java
@@ -104,6 +104,7 @@ public static void before(Hashtable<String, String> contextParams) throws Except
    public void after() throws Exception
    {
       EmbeddedContainer.stop();
+      Thread.sleep(1000);
       dispatcher = null;
       deployment = null;
    }
diff --git a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java
index ce9db77c5f5..e90d2d610d2 100644
--- a/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java
+++ b/jaxrs/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java
@@ -25,7 +25,6 @@
  * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a>
  * @date Jan 6, 2012
  */
-@Ignore("https://issues.jboss.org/browse/RESTEASY-1216")
 public class TestXXE
 {
    protected static ResteasyDeployment deployment;
diff --git a/jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/spring/AsynchSpringTest.java b/jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/spring/AsynchSpringTest.java
index 0c752d178fe..b5aee5b8354 100644
--- a/jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/spring/AsynchSpringTest.java
+++ b/jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/springmvc/test/spring/AsynchSpringTest.java
@@ -180,8 +180,9 @@ public void testAsynch() throws Exception
          Assert.assertEquals(HttpServletResponse.SC_ACCEPTED, response.getStatus());
          String jobUrl2 = response.getResponseHeaders().getFirst(HttpHeaders.LOCATION);
          Assert.assertTrue(latch.await(3, TimeUnit.SECONDS));
-         response.releaseConnection();         
-         
+         response.releaseConnection();
+
+         Thread.sleep(1000);
          // test its still there
          request = new ClientRequest(jobUrl2);
          response = request.post();