diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml
index e8b33f9..7f67ca7 100755
--- a/impl/extension/jdbc/pom.xml
+++ b/impl/extension/jdbc/pom.xml
@@ -71,6 +71,13 @@
 			<groupId>commons-dbcp</groupId>
 			<artifactId>commons-dbcp</artifactId>
 		</dependency>
+
+		<!-- for tests -->
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<repositories>
@@ -110,4 +117,8 @@
 			</dependencies>
 		</profile>
 	</profiles>
+
+	<properties>
+		<arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
+	</properties>
 </project>
diff --git a/impl/extension/jdbc/src/test/java/test/Tests.java b/impl/extension/jdbc/src/test/java/test/Tests.java
index 3c8e26f..1710a0a 100644
--- a/impl/extension/jdbc/src/test/java/test/Tests.java
+++ b/impl/extension/jdbc/src/test/java/test/Tests.java
@@ -45,16 +45,8 @@ import javax.enterprise.inject.Produces;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.Ignore;
 
-import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig;
-import br.gov.frameworkdemoiselle.internal.producer.ConnectionProducer;
-import br.gov.frameworkdemoiselle.internal.producer.DataSourceProducer;
-import br.gov.frameworkdemoiselle.internal.proxy.BasicDataSourceProxy;
-import br.gov.frameworkdemoiselle.internal.proxy.ConnectionProxy;
-import br.gov.frameworkdemoiselle.transaction.JDBCTransaction;
-
 @Ignore
 public final class Tests {
 
@@ -66,22 +58,13 @@ public final class Tests {
 	}
 
 	private static WebArchive createDeployment() {
-		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
-				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
-
 		return ShrinkWrap
 				.create(WebArchive.class)
 				.addClass(Tests.class)
-				.addClass(JDBCConfig.class)
-				.addClass(ConnectionProducer.class)
-				.addClass(DataSourceProducer.class)
-				.addClass(BasicDataSourceProxy.class)
-				.addClass(ConnectionProxy.class)
-				.addClass(JDBCTransaction.class)
+				.addPackages(true, "br")
 				.addAsResource(createFileAsset("src/main/resources/demoiselle-jdbc-bundle.properties"),
 						"demoiselle-jdbc-bundle.properties")
-				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
-				.addAsLibraries(libs);
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
 	}
 
 	public static FileAsset createFileAsset(final String pathname) {
diff --git a/impl/extension/jpa/pom.xml b/impl/extension/jpa/pom.xml
index d6eeb15..f64a159 100755
--- a/impl/extension/jpa/pom.xml
+++ b/impl/extension/jpa/pom.xml
@@ -110,4 +110,8 @@
 			</dependencies>
 		</profile>
 	</profiles>
+
+	<properties>
+		<arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
+	</properties>
 </project>
diff --git a/impl/extension/jpa/src/test/java/test/Tests.java b/impl/extension/jpa/src/test/java/test/Tests.java
index 5c13178..ef66513 100644
--- a/impl/extension/jpa/src/test/java/test/Tests.java
+++ b/impl/extension/jpa/src/test/java/test/Tests.java
@@ -45,18 +45,8 @@ import javax.enterprise.inject.Produces;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.Ignore;
 
-import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerFactoryProducer;
-import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
-import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
-import br.gov.frameworkdemoiselle.internal.proxy.QueryProxy;
-import br.gov.frameworkdemoiselle.internal.proxy.TypedQueryProxy;
-import br.gov.frameworkdemoiselle.template.JPACrud;
-import br.gov.frameworkdemoiselle.transaction.JPATransaction;
-
 @Ignore
 public final class Tests {
 
@@ -68,24 +58,13 @@ public final class Tests {
 	}
 
 	private static WebArchive createDeployment() {
-		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
-				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
-
 		return ShrinkWrap
 				.create(WebArchive.class)
 				.addClass(Tests.class)
-				.addClass(EntityManagerConfig.class)
-				.addClass(EntityManagerFactoryProducer.class)
-				.addClass(EntityManagerProducer.class)
-				.addClass(EntityManagerProxy.class)
-				.addClass(QueryProxy.class)
-				.addClass(TypedQueryProxy.class)
-				.addClass(JPACrud.class)
-				.addClass(JPATransaction.class)
+				.addPackages(true, "br")
 				.addAsResource(createFileAsset("src/main/resources/demoiselle-jpa-bundle.properties"),
 						"demoiselle-jpa-bundle.properties")
-				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
-				.addAsLibraries(libs);
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
 	}
 
 	public static FileAsset createFileAsset(final String pathname) {
diff --git a/impl/extension/jta/pom.xml b/impl/extension/jta/pom.xml
index 22ee10b..75a0b1f 100755
--- a/impl/extension/jta/pom.xml
+++ b/impl/extension/jta/pom.xml
@@ -71,7 +71,7 @@
 			<groupId>javax.transaction</groupId>
 			<artifactId>jta</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
@@ -103,4 +103,8 @@
 			</releases>
 		</repository>
 	</repositories>
+
+	<properties>
+		<arquillian.bom.version>1.0.3.Final</arquillian.bom.version>
+	</properties>
 </project>
diff --git a/impl/extension/jta/src/test/java/jtatransaction/interceptor/InterceptorJTATransactionTest.java b/impl/extension/jta/src/test/java/jtatransaction/interceptor/InterceptorJTATransactionTest.java
index 2aaca39..9c66e23 100644
--- a/impl/extension/jta/src/test/java/jtatransaction/interceptor/InterceptorJTATransactionTest.java
+++ b/impl/extension/jta/src/test/java/jtatransaction/interceptor/InterceptorJTATransactionTest.java
@@ -6,7 +6,7 @@ import static junit.framework.Assert.assertNull;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.transaction.TransactionRequiredException;
+import javax.persistence.TransactionRequiredException;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
diff --git a/impl/extension/jta/src/test/java/test/Tests.java b/impl/extension/jta/src/test/java/test/Tests.java
index 70f1a69..7235063 100644
--- a/impl/extension/jta/src/test/java/test/Tests.java
+++ b/impl/extension/jta/src/test/java/test/Tests.java
@@ -46,11 +46,8 @@ import javax.enterprise.inject.Produces;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.junit.Ignore;
 
-import br.gov.frameworkdemoiselle.transaction.JTATransaction;
-
 @Ignore
 public final class Tests {
 
@@ -62,17 +59,14 @@ public final class Tests {
 	}
 
 	public static WebArchive createDeployment() {
-		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml" , "arquillian-test")
-				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
-		
 		return ShrinkWrap
 				.create(WebArchive.class)
 				.addClass(Tests.class)
-				.addClass(JTATransaction.class)
-				.addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties") , "demoiselle-jta-bundle.properties" )
-				.addAsResource(createFileAsset("src/test/resources/log/log4j.properties") , "log4j.properties" )
-				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
-				.addAsLibraries(libs);
+				.addPackages(true, "br")
+				.addAsResource(createFileAsset("src/main/resources/demoiselle-jta-bundle.properties"),
+						"demoiselle-jta-bundle.properties")
+				.addAsResource(createFileAsset("src/test/resources/log/log4j.properties"), "log4j.properties")
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml");
 	}
 
 	public static FileAsset createFileAsset(final String pathname) {
diff --git a/impl/extension/servlet/src/test/java/xxxx/XTest.java b/impl/extension/servlet/src/test/java/xxxx/XTest.java
index a38c19e..78db17d 100644
--- a/impl/extension/servlet/src/test/java/xxxx/XTest.java
+++ b/impl/extension/servlet/src/test/java/xxxx/XTest.java
@@ -32,7 +32,7 @@ public class XTest {
 	@Test
 	public void xxxx() {
 		HttpClient client = new HttpClient();
-		GetMethod method = new GetMethod(deploymentUrl + "login");
+		GetMethod method = new GetMethod(deploymentUrl + "/login");
 
 		try {
 			int status = client.executeMethod(method);
diff --git a/pom.xml b/pom.xml
index ac5a070..7d1a9c3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 		<module>impl/extension/jdbc</module>
 		<module>impl/extension/jpa</module>
 		<module>impl/extension/jsf</module>
-<!-- 		<module>impl/extension/jta</module> -->
+		<module>impl/extension/jta</module>
 		<module>impl/extension/se</module>
 		<module>impl/extension/servlet</module>
 		<module>impl/extension/jmx</module>
--
libgit2 0.21.2