diff --git a/TXFramework/wsat-simple/pom.xml b/TXFramework/wsat-simple/pom.xml
index e697329aa7..1f63365938 100644
--- a/TXFramework/wsat-simple/pom.xml
+++ b/TXFramework/wsat-simple/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.jboss.narayana.quickstart.txframework.wsat-simple</groupId>
     <artifactId>wsat-simple-all</artifactId>
     <version>5.0.0.M2-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>JBoss Narayana Quickstarts: Simple WS-AT Web service using the TXFramework</name>
     <description>JBoss Narayana Quickstarts: Simple WS-AT Web service using the TXFramework</description>
 
@@ -140,6 +140,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -147,31 +153,7 @@
               deployed -->
         <finalName>wsat-simple</finalName>
         <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
-                <configuration>
-                    <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <archive>
-                        <manifestEntries>
-                            <Dependencies>org.jboss.xts</Dependencies>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- JBoss AS plugin to deploy war -->
-            <plugin>
-                <groupId>org.jboss.as.plugins</groupId>
-                <artifactId>jboss-as-maven-plugin</artifactId>
-                <version>${jboss-as.version}</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <!-- Compiler plugin enforces Java 1.6 compatibility and activates
-          annotation processors -->
-            <plugin>
+	    <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>
diff --git a/TXFramework/wsat-simple/src/main/java/org/jboss/narayana/quickstarts/wsat/simple/RestaurantServiceATImpl.java b/TXFramework/wsat-simple/src/main/java/org/jboss/narayana/quickstarts/wsat/simple/RestaurantServiceATImpl.java
index ff40276a29..e6445b453f 100644
--- a/TXFramework/wsat-simple/src/main/java/org/jboss/narayana/quickstarts/wsat/simple/RestaurantServiceATImpl.java
+++ b/TXFramework/wsat-simple/src/main/java/org/jboss/narayana/quickstarts/wsat/simple/RestaurantServiceATImpl.java
@@ -37,6 +37,8 @@
 import org.jboss.narayana.txframework.api.annotation.transaction.Transactional;
 import org.jboss.narayana.txframework.api.configuration.BridgeType;
 
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
@@ -51,7 +53,8 @@
 @Transactional(bridgeType = BridgeType.NONE)
 @WebService(serviceName = "RestaurantServiceATService", portName = "RestaurantServiceAT", name = "RestaurantServiceAT", targetNamespace = "http://www.jboss.org/narayana/quickstarts/wsat/simple/Restaurant")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
-@WebServlet("/RestaurantServiceAT")
+@Remote(RestaurantServiceAT.class)
+@Stateless
 public class RestaurantServiceATImpl implements RestaurantServiceAT {
 
     private MockRestaurantManager mockRestaurantManager = MockRestaurantManager.getSingletonInstance();
diff --git a/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/Client.java b/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/Client.java
index d139774f3b..b95c9bf089 100644
--- a/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/Client.java
+++ b/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/Client.java
@@ -50,7 +50,7 @@ public class Client implements RestaurantServiceAT {
      * @throws MalformedURLException if the WSDL url is malformed.
      */
     public Client() throws MalformedURLException {
-        URL wsdlLocation = new URL("http://localhost:8080/wsat-simple/RestaurantServiceAT?wsdl");
+        URL wsdlLocation = new URL("http://localhost:8080/test/RestaurantServiceATService/RestaurantServiceAT?wsdl");
         QName serviceName = new QName("http://www.jboss.org/narayana/quickstarts/wsat/simple/Restaurant",
                 "RestaurantServiceATService");
         QName portName = new QName("http://www.jboss.org/narayana/quickstarts/wsat/simple/Restaurant", "RestaurantServiceAT");
diff --git a/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/ClientTest.java b/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/ClientTest.java
index a238a9e64e..45587a250a 100644
--- a/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/ClientTest.java
+++ b/TXFramework/wsat-simple/src/test/java/org/jboss/narayana/quickstarts/wsat/simple/ClientTest.java
@@ -8,9 +8,10 @@
 import org.jboss.narayana.quickstarts.wsat.simple.jaxws.RestaurantServiceAT;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,12 +40,12 @@ public class ClientTest {
      * @return a WebArchive representing the required deployment
      */
     @Deployment
-    public static WebArchive createTestArchive() {
+    public static JavaArchive createTestArchive() {
 
-        return ShrinkWrap.create(WebArchive.class, "wsat-simple.war")
+        return ShrinkWrap.create(JavaArchive.class, "wsat-simple.jar")
                 .addPackages(true, RestaurantServiceATImpl.class.getPackage())
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
-                .setManifest(new StringAsset(ManifestMF));
+                .addAsManifestResource(new ByteArrayAsset("<interceptors><class>org.jboss.narayana.txframework.impl.ServiceRequestInterceptor</class></interceptors>".getBytes()), ArchivePaths.create("beans.xml"))
+                        .setManifest(new StringAsset(ManifestMF));
     }
 
     /**
diff --git a/TXFramework/wsat-simple/src/test/resources/arquillian.xml b/TXFramework/wsat-simple/src/test/resources/arquillian.xml
index ed436b77bf..17fb40dba8 100644
--- a/TXFramework/wsat-simple/src/test/resources/arquillian.xml
+++ b/TXFramework/wsat-simple/src/test/resources/arquillian.xml
@@ -6,7 +6,7 @@
 
    <!-- Uncomment to have test archives exported to the file system for inspection -->
    <engine> 
-      <property name="deploymentExportPath">target/</property> 
+      <property name="deploymentExportPath">target/arquillian</property> 
    </engine>
 
    <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
diff --git a/TXFramework/wsba-participant-completion-simple/pom.xml b/TXFramework/wsba-participant-completion-simple/pom.xml
index 1cdff7555c..dccde5abdc 100644
--- a/TXFramework/wsba-participant-completion-simple/pom.xml
+++ b/TXFramework/wsba-participant-completion-simple/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.jboss.narayana.quickstart.txframework.wsba-participant-completion-simple</groupId>
     <artifactId>wsba-participant-completion-simple-all</artifactId>
     <version>5.0.0.M2-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>JBoss Narayana Quickstarts: Simple WS-BA with participant completion Web service using the TXFramework</name>
     <description>JBoss Narayana Quickstarts: Simple WS-BA with participant completion Web service using the TXFramework</description>
 
@@ -107,32 +107,16 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.spec.javax.ejb</groupId>
+            <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
-                <configuration>
-                    <!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <archive>
-                        <manifestEntries>
-                            <Dependencies>org.jboss.narayana.txframework</Dependencies>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <!-- JBoss AS deployment disabled, as this is a test-only example! -->
-            <plugin>
-                <groupId>org.jboss.as.plugins</groupId>
-                <artifactId>jboss-as-maven-plugin</artifactId>
-                <version>${jboss-as.version}</version>
-                <configuration>
-                  <skip>true</skip>
-                </configuration>
-            </plugin>
             <!-- Compiler plugin enforces Java 1.6 compatibility and activates
           annotation processors -->
             <plugin>
diff --git a/TXFramework/wsba-participant-completion-simple/src/main/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/OrderServiceBAImpl.java b/TXFramework/wsba-participant-completion-simple/src/main/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/OrderServiceBAImpl.java
index b51446ff59..f87148036a 100644
--- a/TXFramework/wsba-participant-completion-simple/src/main/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/OrderServiceBAImpl.java
+++ b/TXFramework/wsba-participant-completion-simple/src/main/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/OrderServiceBAImpl.java
@@ -30,6 +30,8 @@
 import org.jboss.narayana.txframework.api.configuration.transaction.CompletionType;
 import org.jboss.narayana.txframework.api.management.WSBATxControl;
 
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
@@ -44,7 +46,8 @@
 @Compensatable(completionType = CompletionType.PARTICIPANT)
 @WebService(serviceName = "OrderServiceBAService", portName = "OrderServiceBA", name = "OrderServiceBA", targetNamespace = "http://www.jboss.org/as/quickstarts/helloworld/wsba/participantcompletion/order")
 @SOAPBinding(style = SOAPBinding.Style.RPC)
-@WebServlet("/OrderServiceBA")
+@Stateless
+@Remote(OrderServiceBA.class)
 public class OrderServiceBAImpl implements OrderServiceBA {
 
     /*
diff --git a/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/Client.java b/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/Client.java
index 6d8a693d1c..cc18519f43 100644
--- a/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/Client.java
+++ b/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/Client.java
@@ -48,7 +48,7 @@ public class Client implements OrderServiceBA {
      * @throws MalformedURLException if the WSDL url is malformed.
      */
     public Client() throws MalformedURLException {
-        URL wsdlLocation = new URL("http://localhost:8080/test/OrderServiceBA?wsdl");
+        URL wsdlLocation = new URL("http://localhost:8080/test/OrderServiceBAService/OrderServiceBA?wsdl");
         QName serviceName = new QName("http://www.jboss.org/as/quickstarts/helloworld/wsba/participantcompletion/order",
                 "OrderServiceBAService");
         QName portName = new QName("http://www.jboss.org/as/quickstarts/helloworld/wsba/participantcompletion/order",
diff --git a/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/ClientTest.java b/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/ClientTest.java
index bf842bbd79..e903515014 100644
--- a/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/ClientTest.java
+++ b/TXFramework/wsba-participant-completion-simple/src/test/java/org/jboss/narayana/quickstarts/wsba/participantcompletion/simple/ClientTest.java
@@ -28,8 +28,10 @@
 import org.jboss.narayana.quickstarts.wsba.participantcompletion.simple.jaxws.OrderServiceBA;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,10 +48,10 @@ public class ClientTest {
     public OrderServiceBA client;
 
     @Deployment
-    public static WebArchive createTestArchive() {
-        return ShrinkWrap.create(WebArchive.class, "test.war")
+    public static JavaArchive createTestArchive() {
+        return ShrinkWrap.create(JavaArchive.class, "test.jar")
                 .addPackages(true, OrderServiceBAImpl.class.getPackage().getName())
-                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                .addAsManifestResource(new ByteArrayAsset("<interceptors><class>org.jboss.narayana.txframework.impl.ServiceRequestInterceptor</class></interceptors>".getBytes()), ArchivePaths.create("beans.xml"))
                 .setManifest(new StringAsset(ManifestMF));
     }