diff --git a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java
index 083a2d4891..44662e523b 100644
--- a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java
+++ b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java
@@ -86,8 +86,9 @@ public Properties getVehicleSpecificClientProps(Properties p) {
    */
   public Status run(String[] argv, Properties p) {
     Status status = null;
-    if (TestUtil.iWhereAreWe == TestUtil.VM_HARNESS
-        && this instanceof com.sun.ts.tests.common.vehicle.VehicleClient) {
+    boolean inTestHarness = TestUtil.iWhereAreWe == TestUtil.VM_HARNESS;
+    boolean isVehicleClient = this instanceof com.sun.ts.tests.common.vehicle.VehicleClient;
+    if (inTestHarness && isVehicleClient) {
       TestUtil.logTrace("in ServiceEETest.run() method");
       String sVehicle = TestUtil.getProperty(p, "vehicle");
       String className = this.getClass().getName();
diff --git a/connector/pom.xml b/connector/pom.xml
index 1ed660a5c4..7efaf9140d 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -45,6 +45,32 @@
             <groupId>jakarta.resource</groupId>
             <artifactId>jakarta.resource-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit5</groupId>
+            <artifactId>arquillian-junit5-container</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.container</groupId>
+            <artifactId>arquillian-container-test-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>arquillian-protocol-common</artifactId>
+            <version>${arquillian.jakarta.tck.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck.arquillian</groupId>
+            <artifactId>tck-porting-lib</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <!-- Include the container descriptors in the output artifact -->
diff --git a/connector/rewrite-pom.xml b/connector/rewrite-pom.xml
new file mode 100644
index 0000000000..a6cde3ca72
--- /dev/null
+++ b/connector/rewrite-pom.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022, 2024  Contributors to the Eclipse Foundation
+    All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.7</version>
+    </parent>
+
+    <groupId>jakarta.tck</groupId>
+    <artifactId>connector-rewrite</artifactId>
+    <version>11.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>project</name>
+    <description>project</description>
+
+    <properties>
+        <ant.version>1.10.11</ant.version>
+        <arquillian.version>1.8.0.Final</arquillian.version>
+
+        <!-- CDI -->
+        <cdi-api.version>4.0.0</cdi-api.version>
+        <!-- Jakarta Concurrency -->
+        <concurrent-api.version>2.0.0</concurrent-api.version>
+        <!-- Jakarta Persistence -->
+        <jakarta-persistence-api.version>3.2.0-M2</jakarta-persistence-api.version>
+        <jakarta.activation-api.version>2.0.0</jakarta.activation-api.version>
+
+        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
+        <jakarta.authentication-api.version>2.0.0</jakarta.authentication-api.version>
+        <jakarta.authorization-api.version>2.1.0</jakarta.authorization-api.version>
+        <!-- Jakarta Batch -->
+        <jakarta.batch-api.version>2.0.0</jakarta.batch-api.version>
+        <!-- Jakarta Enterprise beans -->
+        <jakarta.ejb-api.version>4.0.0</jakarta.ejb-api.version>
+        <jakarta.el-api.version>6.0.0-M1</jakarta.el-api.version>
+        <jakarta.faces-api.version>3.0.0</jakarta.faces-api.version>
+        <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
+        <!-- Jakarta Interceptors -->
+        <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+        <jakarta.jws-api.version>3.0.0</jakarta.jws-api.version>
+        <jakarta.mail-api.version>2.0.0</jakarta.mail-api.version>
+        <!-- Jakarta Connectors -->
+        <jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
+        <!-- Jakarta EE Security + Authentication/Authorization -->
+        <jakarta.security.enterprise-api.version>2.0.0</jakarta.security.enterprise-api.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <!-- Jakarta Transactions -->
+        <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
+        <jakarta.validation-api.version>3.0.0</jakarta.validation-api.version>
+
+        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
+        <jakarta.xml.bind-api.version>3.0.0</jakarta.xml.bind-api.version>
+        <jakarta.xml.soap-api.version>3.0.0</jakarta.xml.soap-api.version>
+        <jakarta.xml.ws-api.version>4.0.0</jakarta.xml.ws-api.version>
+        <javatest.version>5.0</javatest.version>
+        <jaxb-osgi.version>3.0.0</jaxb-osgi.version>
+        <!-- Jakarta Messaging -->
+        <jms-api.version>3.1.0</jms-api.version>
+        <json.bind-api.version>3.0.0</json.bind-api.version>
+        <!-- Jakarta JSON -->
+        <jsonp-api.version>2.1.1</jsonp-api.version>
+        <!-- Jakarta Server Pages -->
+        <jsp-api.version>3.1.0</jsp-api.version>
+        <!-- Jakarta Standard Tag Library -->
+        <jstl-api.version>2.0.0</jstl-api.version>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <slf4j.version>2.0.0</slf4j.version>
+        <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
+        <version.openrewrite>8.24.0</version.openrewrite>
+        <version.org.jboss.arquillian.core>1.9.1.Final</version.org.jboss.arquillian.core>
+        <webservices-api-osgi.version>3.0.0</webservices-api-osgi.version>
+        <webservices-api.version>3.0.0</webservices-api.version>
+        <webservices-osgi.version>3.0.0</webservices-osgi.version>
+        <webservices-tools.version>3.0.0</webservices-tools.version>
+        <!-- Jakarta WebSocket -->
+        <websocket-api.version>2.2.0</websocket-api.version>
+        <websocket-client-api.version>2.2.0</websocket-client-api.version>
+    </properties>
+
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>libutil</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.resource</groupId>
+            <artifactId>jakarta.resource-api</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>oss.sonatype.org</id>
+            <name>Jetty Snapshot Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.12.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.sun.xml.ws</groupId>
+                    <artifactId>jaxws-maven-plugin</artifactId>
+                    <version>4.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                    <configuration>
+                        <mavenExecutorId>forked-path</mavenExecutorId>
+                        <preparationGoals>clean install</preparationGoals>
+                        <arguments>-Drelease -Dtck-audit</arguments>
+                    </configuration>
+                </plugin>
+                <!-- Plugin versions since ee4j parent no longer declares them-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.1.1</version>
+                    <configuration>
+                        <doclint>none</doclint>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <environmentVariables>
+                            <AS_JAVA>${java.home}</AS_JAVA>
+                            <JAVA_HOME>${java.home}</JAVA_HOME>
+                        </environmentVariables>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.0.0-M1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <!--  Run with: mvn -Drewrite.exclusions="$PWD/annotations,$PWD/appclient,$PWD/assembly,$PWD/bin,$PWD/common,$PWD/connector,$PWD/core-profile-tck,$PWD/docker,$PWD/docker-images,$PWD/ejb,$PWD/ejb30,$PWD/ejb30-ws,$PWD/ejb32,$PWD/el,$PWD/glassfish-runner,$PWD/glassfishtck,$PWD/install,$PWD/integration,$PWD/internal,$PWD/jacc,$PWD/javaee,$PWD/javamail,$PWD/jaxrs,$PWD/jaxws,$PWD/jaxws-common,$PWD/jdbc,$PWD/jdbc_extras,$PWD/jms,$PWD/jsonb,$PWD/jsonp,$PWD/jsp,$PWD/jstl,$PWD/jta,$PWD/jws,$PWD/jws,$PWD/common,$PWD/lib,$PWD/libutil,$PWD/notes,$PWD/release,$PWD/runtime,$PWD/saaj,$PWD/samples,$PWD/servlet,$PWD/signaturetest,$PWD/sql,$PWD/src,$PWD/user_guides,$PWD/webartifacts,$PWD/webservices12,$PWD/webservices13,$PWD/websocket,$PWD/xa" org.openrewrite.maven:rewrite-maven-plugin:runNoFork  2>&1 | tee /tmp/tck.log
+                -->
+                <groupId>org.openrewrite.maven</groupId>
+                <artifactId>rewrite-maven-plugin</artifactId>
+                <version>5.32.1</version>
+                <configuration>
+                    <activeRecipes>
+                        <recipe>tck.jakarta.platform.rewrite.GenerateNewTestClassRecipe</recipe>
+                    </activeRecipes>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.tck</groupId>
+                        <artifactId>tck-rewrite-tools</artifactId>
+                        <version>1.0.0-SNAPSHOT</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-core</artifactId>
+                        <version>8.24.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-testing-frameworks</artifactId>
+                        <version>2.6.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-github-actions</artifactId>
+                        <version>2.1.7</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-java-17</artifactId>
+                        <version>${version.openrewrite}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-test</artifactId>
+                        <version>${version.openrewrite}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.openrewrite</groupId>
+                        <artifactId>rewrite-java-test</artifactId>
+                        <version>${version.openrewrite}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDActivationSpec.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDActivationSpec.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDActivationSpec.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDActivationSpec.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDAdminObject.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDAdminObject.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDAdminObject.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDAdminObject.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDManagedConnectionFactory.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDManagedConnectionFactory.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDManagedConnectionFactory.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDManagedConnectionFactory.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageListener.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageListener.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageListener.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageListener.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageWork.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageWork.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageWork.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDMessageWork.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDResourceAdapterImpl.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDResourceAdapterImpl.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDResourceAdapterImpl.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDResourceAdapterImpl.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDWorkManager.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDWorkManager.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDWorkManager.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/CRDWorkManager.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/MsgXAResource.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/MsgXAResource.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/MsgXAResource.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/MsgXAResource.java
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/NestedWorkXid1.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/NestedWorkXid1.java
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/NestedWorkXid1.java
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/NestedWorkXid1.java
diff --git a/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/RADeployment.java b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/RADeployment.java
new file mode 100644
index 0000000000..580e0cf5f2
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/RADeployment.java
@@ -0,0 +1,58 @@
+package com.sun.ts.tests.common.connector.embedded.adapter1;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+
+public class RADeployment {
+    public static JavaArchive create_whitebox_rd_rar() {
+        JavaArchive resouredef_jar = ShrinkWrap.create(JavaArchive.class, "resouredef.jar")
+            .addClasses(
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDActivationSpec.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDAdminObject.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDManagedConnectionFactory.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDMessageListener.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDMessageWork.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDResourceAdapterImpl.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.CRDWorkManager.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.MsgXAResource.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.NestedWorkXid1.ContextType.class,
+                    com.sun.ts.tests.common.connector.embedded.adapter1.NestedWorkXid1.class,
+                    com.sun.ts.tests.common.connector.util.ConnectorStatus.class,
+                    com.sun.ts.tests.common.connector.util.Log.class,
+                    com.sun.ts.tests.common.connector.whitebox.WorkImpl.class,
+                    com.sun.ts.tests.common.connector.whitebox.WorkListenerImpl.class,
+                    com.sun.ts.tests.common.connector.whitebox.XidImpl.class,
+                    com.sun.ts.tests.common.connector.whitebox.NestedWorkXid.class,
+                    com.sun.ts.tests.common.connector.whitebox.TSDataSource.class,
+                    com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory.class,
+                    com.sun.ts.tests.common.connector.whitebox.Debug.class
+            );
+
+
+        JavaArchive whitebox_rd_rar = ShrinkWrap.create(JavaArchive.class, "whitebox-rd.rar");
+        whitebox_rd_rar.add(resouredef_jar, "resouredef.jar", ZipExporter.class);
+        String mf = """
+                Manifest-Version: 1.0
+                Ant-Version: Apache Ant 1.10.14
+                Created-By: 17.0.12+7 (Red Hat, Inc.)
+                Extension-List: tsharness cts whitebox
+                tsharness-Extension-Name: tsharness
+                tsharness-Specification-Version: 1.4
+                tsharness-Implementation-Version: 1.4
+                tsharness-Implementation-Vendor-Id: com.sun
+                cts-Extension-Name: cts
+                cts-Specification-Version: 1.4
+                cts-Implementation-Version: 1.4
+                cts-Implementation-Vendor-Id: com.sun
+                whitebox-Extension-Name: whitebox
+                whitebox-Specification-Version: 1.6
+                whitebox-Implementation-Version: 1.6
+                whitebox-Implementation-Vendor-Id: com.sun
+
+                """;
+        whitebox_rd_rar.setManifest(new StringAsset(mf));
+        return whitebox_rd_rar;
+    }
+}
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/README.txt b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/README.txt
similarity index 100%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/README.txt
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/README.txt
diff --git a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml
similarity index 92%
rename from common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml
rename to connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml
index 7a4ad8e3db..e458fbde75 100644
--- a/common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml
+++ b/connector/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1/build.xml
@@ -17,7 +17,7 @@
 
 -->
 
-<project name="adapter1_resouredef" basedir="." default="usage">
+<project name="adapter1_resouredef" basedir="../../../../../../../../../../../../common/src/main/java/com/sun/ts/tests/common/connector/embedded/adapter1" default="usage">
     <import file="../../../../../../../../../bin/xml/ts.import.xml"/> 
   
     <property name="whitebox.dir" value="com/sun/ts/tests/common/connector/whitebox"/>
@@ -50,7 +50,7 @@
     <target name="package" depends="compile, build.nested.jar">
         <mkdir dir="${dist.dir}/${pkg.dir}"/>   
 
-        <ant antfile="../../whitebox/build.xml" target="build.whitebox.jar"/>
+        <ant antfile="../../../../../../../../../../../../common/src/main/java/com/sun/ts/tests/common/connector/whitebox/build.xml" target="build.whitebox.jar"/>
 
         <!-- create a .rar that will only use annotations and no ra.xml-->
         <ts.rar archivename="whitebox-rd"
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientEjbTest.java
new file mode 100644
index 0000000000..d95ef2956a
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientEjbTest.java
@@ -0,0 +1,175 @@
+package com.sun.ts.tests.connector.annotations.anno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class annotationClientEjbTest extends com.sun.ts.tests.connector.annotations.anno.annotationClient {
+    static final String VEHICLE_ARCHIVE = "annotations_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        annotations_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        annotations_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        annotations_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        annotations_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/annotations/anno/annotations_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/annotations/anno/annotations_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/annotations/anno/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive annotations_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "annotations_ejb_vehicle_client.jar");
+            // The class files
+            annotations_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = annotationClient.class.getResource("annotations_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              annotations_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = annotationClient.class.getResource("annotations_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              annotations_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            annotations_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(annotations_ejb_vehicle_client, annotationClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive annotations_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "annotations_ejb_vehicle_ejb.jar");
+            // The class files
+            annotations_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.annotations.anno.annotationClient.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = annotationClient.class.getResource("annotations_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              annotations_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = annotationClient.class.getResource("annotations_jsp_vehicle_web.war.sun-web.xml");
+            if(ejbResURL1 != null) {
+              annotations_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(annotations_ejb_vehicle_ejb, annotationClient.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive annotations_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "annotations_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            annotations_ejb_vehicle_ear.addAsModule(annotations_ejb_vehicle_ejb);
+            annotations_ejb_vehicle_ear.addAsModule(annotations_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(annotations_ejb_vehicle_ear, annotationClient.class, earResURL);
+        return annotations_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnectorAnnotation() throws java.lang.Exception {
+            super.testConnectorAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testSetterMethodConfigPropAnno() throws java.lang.Exception {
+            super.testSetterMethodConfigPropAnno();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConfigPropertyAnnotation() throws java.lang.Exception {
+            super.testConfigPropertyAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRAAccessibility() throws java.lang.Exception {
+            super.testRAAccessibility();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientJspTest.java
new file mode 100644
index 0000000000..cc3094e4de
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientJspTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.connector.annotations.anno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class annotationClientJspTest extends com.sun.ts.tests.connector.annotations.anno.annotationClient {
+    static final String VEHICLE_ARCHIVE = "annotations_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        annotations_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        annotations_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        annotations_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        annotations_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/anno/annotations_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/annotations/anno/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive annotations_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "annotations_jsp_vehicle_web.war");
+            // The class files
+            annotations_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.annotations.anno.annotationClient.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = annotationClient.class.getResource("annotations_ejb_vehicle_ejb.xml");
+            if(warResURL != null) {
+              annotations_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = annotationClient.class.getResource("annotations_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              annotations_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            warResURL = annotationClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              annotations_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = annotationClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              annotations_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(annotations_jsp_vehicle_web, annotationClient.class, warResURL);
+
+
+
+        // Ear
+            EnterpriseArchive annotations_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "annotations_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            annotations_jsp_vehicle_ear.addAsModule(annotations_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = annotationClient.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              annotations_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(annotations_jsp_vehicle_ear, annotationClient.class, earResURL);
+        return annotations_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnectorAnnotation() throws java.lang.Exception {
+            super.testConnectorAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testSetterMethodConfigPropAnno() throws java.lang.Exception {
+            super.testSetterMethodConfigPropAnno();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConfigPropertyAnnotation() throws java.lang.Exception {
+            super.testConfigPropertyAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRAAccessibility() throws java.lang.Exception {
+            super.testRAAccessibility();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientServletTest.java
new file mode 100644
index 0000000000..8106e17930
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/anno/annotationClientServletTest.java
@@ -0,0 +1,138 @@
+package com.sun.ts.tests.connector.annotations.anno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class annotationClientServletTest extends com.sun.ts.tests.connector.annotations.anno.annotationClient {
+    static final String VEHICLE_ARCHIVE = "annotations_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        annotations_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        annotations_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        annotations_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        annotations_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        annotations_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/anno/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive annotations_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "annotations_servlet_vehicle_web.war");
+            // The class files
+            annotations_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.annotations.anno.annotationClient.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = annotationClient.class.getResource("annotations_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              annotations_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = annotationClient.class.getResource("annotations_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              annotations_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(annotations_servlet_vehicle_web, annotationClient.class, warResURL);
+
+
+
+        // Ear
+            EnterpriseArchive annotations_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "annotations_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            annotations_servlet_vehicle_ear.addAsModule(annotations_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(annotations_servlet_vehicle_ear, annotationClient.class, earResURL);
+        return annotations_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnectorAnnotation() throws java.lang.Exception {
+            super.testConnectorAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testSetterMethodConfigPropAnno() throws java.lang.Exception {
+            super.testSetterMethodConfigPropAnno();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConfigPropertyAnnotation() throws java.lang.Exception {
+            super.testConfigPropertyAnnotation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRAAccessibility() throws java.lang.Exception {
+            super.testRAAccessibility();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientEjbTest.java
new file mode 100644
index 0000000000..7bd950ff25
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientEjbTest.java
@@ -0,0 +1,162 @@
+package com.sun.ts.tests.connector.annotations.mdcomplete;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientEjbTest extends com.sun.ts.tests.connector.annotations.mdcomplete.Client {
+    static final String VEHICLE_ARCHIVE = "mdcomplete_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        mdcomplete_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        mdcomplete_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        mdcomplete_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        mdcomplete_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/annotations/mdcomplete/mdcomplete_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/annotations/mdcomplete/mdcomplete_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/annotations/mdcomplete/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive mdcomplete_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "mdcomplete_ejb_vehicle_client.jar");
+            // The class files
+            mdcomplete_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml");
+            if(resURL != null) {
+              mdcomplete_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              mdcomplete_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            mdcomplete_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(mdcomplete_ejb_vehicle_client, Client.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive mdcomplete_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "mdcomplete_ejb_vehicle_ejb.jar");
+            // The class files
+            mdcomplete_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.annotations.mdcomplete.Client.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = Client.class.getResource("mdcomplete_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              mdcomplete_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = Client.class.getResource("mdcomplete_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              mdcomplete_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(mdcomplete_ejb_vehicle_ejb, Client.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive mdcomplete_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdcomplete_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            mdcomplete_ejb_vehicle_ear.addAsModule(mdcomplete_ejb_vehicle_ejb);
+            mdcomplete_ejb_vehicle_ear.addAsModule(mdcomplete_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(mdcomplete_ejb_vehicle_ear, Client.class, earResURL);
+        return mdcomplete_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMDCompleteConfigProp() throws java.lang.Exception {
+            super.testMDCompleteConfigProp();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMDCompleteMCFAnno() throws java.lang.Exception {
+            super.testMDCompleteMCFAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientJspTest.java
new file mode 100644
index 0000000000..9464fbe03d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientJspTest.java
@@ -0,0 +1,139 @@
+package com.sun.ts.tests.connector.annotations.mdcomplete;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientJspTest extends com.sun.ts.tests.connector.annotations.mdcomplete.Client {
+    static final String VEHICLE_ARCHIVE = "mdcomplete_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        mdcomplete_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        mdcomplete_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        mdcomplete_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        mdcomplete_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/mdcomplete/mdcomplete_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/annotations/mdcomplete/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive mdcomplete_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "mdcomplete_jsp_vehicle_web.war");
+            // The class files
+            mdcomplete_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.annotations.mdcomplete.Client.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              mdcomplete_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("mdcomplete_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              mdcomplete_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              mdcomplete_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              mdcomplete_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(mdcomplete_jsp_vehicle_web, Client.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive mdcomplete_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdcomplete_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            mdcomplete_jsp_vehicle_ear.addAsModule(mdcomplete_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = Client.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              mdcomplete_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(mdcomplete_jsp_vehicle_ear, Client.class, earResURL);
+        return mdcomplete_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMDCompleteConfigProp() throws java.lang.Exception {
+            super.testMDCompleteConfigProp();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMDCompleteMCFAnno() throws java.lang.Exception {
+            super.testMDCompleteMCFAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientServletTest.java
new file mode 100644
index 0000000000..3f498e5cc7
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/mdcomplete/ClientServletTest.java
@@ -0,0 +1,131 @@
+package com.sun.ts.tests.connector.annotations.mdcomplete;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientServletTest extends com.sun.ts.tests.connector.annotations.mdcomplete.Client {
+    static final String VEHICLE_ARCHIVE = "mdcomplete_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        mdcomplete_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        mdcomplete_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        mdcomplete_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        mdcomplete_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        mdcomplete_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/mdcomplete/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive mdcomplete_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "mdcomplete_servlet_vehicle_web.war");
+            // The class files
+            mdcomplete_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.annotations.mdcomplete.Client.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("servlet_vehicle_web.xml");
+            if(warResURL != null) {
+              mdcomplete_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("mdcomplete_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              mdcomplete_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+           // Call the archive processor
+           archiveProcessor.processWebArchive(mdcomplete_servlet_vehicle_web, Client.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive mdcomplete_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "mdcomplete_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            mdcomplete_servlet_vehicle_ear.addAsModule(mdcomplete_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = Client.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              mdcomplete_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(mdcomplete_servlet_vehicle_ear, Client.class, earResURL);
+        return mdcomplete_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMDCompleteConfigProp() throws java.lang.Exception {
+            super.testMDCompleteConfigProp();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMDCompleteMCFAnno() throws java.lang.Exception {
+            super.testMDCompleteMCFAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientEjbTest.java
new file mode 100644
index 0000000000..35244d2080
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientEjbTest.java
@@ -0,0 +1,190 @@
+package com.sun.ts.tests.connector.annotations.partialanno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class paClientEjbTest extends com.sun.ts.tests.connector.annotations.partialanno.paClient {
+    static final String VEHICLE_ARCHIVE = "partialanno_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        partialanno_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        partialanno_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        partialanno_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        partialanno_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/annotations/partialanno/partialanno_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/annotations/partialanno/partialanno_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/annotations/partialanno/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive partialanno_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "partialanno_ejb_vehicle_client.jar");
+            // The class files
+            partialanno_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = paClient.class.getResource("mdcomplete_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              partialanno_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = paClient.class.getResource("mdcomplete_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              partialanno_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            partialanno_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(partialanno_ejb_vehicle_client, paClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive partialanno_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "partialanno_ejb_vehicle_ejb.jar");
+            // The class files
+            partialanno_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.annotations.partialanno.paClient.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = paClient.class.getResource("mdcomplete_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              partialanno_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = paClient.class.getResource("mdcomplete_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              partialanno_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(partialanno_ejb_vehicle_ejb, paClient.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive partialanno_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "partialanno_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            partialanno_ejb_vehicle_ear.addAsModule(partialanno_ejb_vehicle_ejb);
+            partialanno_ejb_vehicle_ear.addAsModule(partialanno_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(partialanno_ejb_vehicle_ear, paClient.class, earResURL);
+        return partialanno_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMixedModeConfigPropertyMCF() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyMCF();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNoDefaultVallAnnoElement() throws java.lang.Exception {
+            super.testNoDefaultVallAnnoElement();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMixedModeConfigPropertyRA() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMixedModeConfigPropertyOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMixedModeConfigPropertyNoOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyNoOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testDDOverridesAnno() throws java.lang.Exception {
+            super.testDDOverridesAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientJspTest.java
new file mode 100644
index 0000000000..d7b2e4d3d5
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientJspTest.java
@@ -0,0 +1,167 @@
+package com.sun.ts.tests.connector.annotations.partialanno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class paClientJspTest extends com.sun.ts.tests.connector.annotations.partialanno.paClient {
+    static final String VEHICLE_ARCHIVE = "partialanno_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        partialanno_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        partialanno_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        partialanno_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        partialanno_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/partialanno/partialanno_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/annotations/partialanno/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive partialanno_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "partialanno_jsp_vehicle_web.war");
+            // The class files
+            partialanno_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.annotations.partialanno.paClient.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = paClient.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              partialanno_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = paClient.class.getResource("partialanno_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              partialanno_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = paClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              partialanno_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = paClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              partialanno_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(partialanno_jsp_vehicle_web, paClient.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive partialanno_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "partialanno_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            partialanno_jsp_vehicle_ear.addAsModule(partialanno_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = paClient.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              partialanno_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(partialanno_jsp_vehicle_ear, paClient.class, earResURL);
+        return partialanno_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMixedModeConfigPropertyMCF() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyMCF();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNoDefaultVallAnnoElement() throws java.lang.Exception {
+            super.testNoDefaultVallAnnoElement();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMixedModeConfigPropertyRA() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMixedModeConfigPropertyOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMixedModeConfigPropertyNoOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyNoOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testDDOverridesAnno() throws java.lang.Exception {
+            super.testDDOverridesAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientServletTest.java
new file mode 100644
index 0000000000..d7f7b4fa99
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/annotations/partialanno/paClientServletTest.java
@@ -0,0 +1,157 @@
+package com.sun.ts.tests.connector.annotations.partialanno;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class paClientServletTest extends com.sun.ts.tests.connector.annotations.partialanno.paClient {
+    static final String VEHICLE_ARCHIVE = "partialanno_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        partialanno_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        partialanno_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        partialanno_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        partialanno_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        partialanno_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/annotations/partialanno/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive partialanno_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "partialanno_servlet_vehicle_web.war");
+            // The class files
+            partialanno_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.annotations.partialanno.paClient.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = paClient.class.getResource("servlet_vehicle_web.xml");
+            if(warResURL != null) {
+              partialanno_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = paClient.class.getResource("partialanno_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              partialanno_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(partialanno_servlet_vehicle_web, paClient.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive partialanno_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "partialanno_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            partialanno_servlet_vehicle_ear.addAsModule(partialanno_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = paClient.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              partialanno_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(partialanno_servlet_vehicle_ear, paClient.class, earResURL);
+        return partialanno_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMixedModeConfigPropertyMCF() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyMCF();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNoDefaultVallAnnoElement() throws java.lang.Exception {
+            super.testNoDefaultVallAnnoElement();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMixedModeConfigPropertyRA() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMixedModeConfigPropertyOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMixedModeConfigPropertyNoOverride() throws java.lang.Exception {
+            super.testMixedModeConfigPropertyNoOverride();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testDDOverridesAnno() throws java.lang.Exception {
+            super.testDDOverridesAnno();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1EjbTest.java
new file mode 100644
index 0000000000..ceb339a2cb
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1EjbTest.java
@@ -0,0 +1,157 @@
+package com.sun.ts.tests.connector.connManager;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connManagerClient1EjbTest extends com.sun.ts.tests.connector.connManager.connManagerClient1 {
+    static final String VEHICLE_ARCHIVE = "connManager_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connManager_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connManager_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connManager_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connManager_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/connManager/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive connManager_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "connManager_ejb_vehicle_client.jar");
+            // The class files
+            connManager_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = connManagerClient1.class.getResource("mdcomplete_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              connManager_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = connManagerClient1.class.getResource("mdcomplete_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              connManager_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            connManager_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(connManager_ejb_vehicle_client, connManagerClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive connManager_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "connManager_ejb_vehicle_ejb.jar");
+            // The class files
+            connManager_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.connManager.connManagerClient1.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = connManagerClient1.class.getResource("mdcomplete_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              connManager_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = connManagerClient1.class.getResource("mdcomplete_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              connManager_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(connManager_ejb_vehicle_ejb, connManagerClient1.class, ejbResURL1);
+        // Ear
+            EnterpriseArchive connManager_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connManager_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connManager_ejb_vehicle_ear.addAsModule(connManager_ejb_vehicle_ejb);
+            connManager_ejb_vehicle_ear.addAsModule(connManager_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connManager_ejb_vehicle_ear, connManagerClient1.class, earResURL);
+        return connManager_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testcheckConnectionManager() throws java.lang.Exception {
+            super.testcheckConnectionManager();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testTransactionSupportLevels() throws java.lang.Exception {
+            super.testTransactionSupportLevels();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1JspTest.java
new file mode 100644
index 0000000000..420cf802f1
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1JspTest.java
@@ -0,0 +1,133 @@
+package com.sun.ts.tests.connector.connManager;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connManagerClient1JspTest extends com.sun.ts.tests.connector.connManager.connManagerClient1 {
+    static final String VEHICLE_ARCHIVE = "connManager_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connManager_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connManager_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connManager_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connManager_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/connManager/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive connManager_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "connManager_jsp_vehicle_web.war");
+            // The class files
+            connManager_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.connManager.connManagerClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connManagerClient1.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              connManager_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connManagerClient1.class.getResource("connManager_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              connManager_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = connManagerClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              connManager_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = connManagerClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              connManager_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(connManager_jsp_vehicle_web, connManagerClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive connManager_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connManager_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connManager_jsp_vehicle_ear.addAsModule(connManager_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connManager_jsp_vehicle_ear, connManagerClient1.class, earResURL);
+        return connManager_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testcheckConnectionManager() throws java.lang.Exception {
+            super.testcheckConnectionManager();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testTransactionSupportLevels() throws java.lang.Exception {
+            super.testTransactionSupportLevels();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1ServletTest.java
new file mode 100644
index 0000000000..33b4247f39
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/connManager/connManagerClient1ServletTest.java
@@ -0,0 +1,125 @@
+package com.sun.ts.tests.connector.connManager;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connManagerClient1ServletTest extends com.sun.ts.tests.connector.connManager.connManagerClient1 {
+    static final String VEHICLE_ARCHIVE = "connManager_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connManager_ejb_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connManager_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connManager_jsp_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connManager_servlet_vehicle: META-INF/jboss-deployment-structure.xml
+        connManager_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/connManager/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive connManager_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "connManager_servlet_vehicle_web.war");
+            // The class files
+            connManager_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.connManager.connManagerClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connManagerClient1.class.getResource("servlet_vehicle_web.xml");
+            if(warResURL != null) {
+              connManager_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connManagerClient1.class.getResource("connManager_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              connManager_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(connManager_servlet_vehicle_web, connManagerClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive connManager_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connManager_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connManager_servlet_vehicle_ear.addAsModule(connManager_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connManager_servlet_vehicle_ear, connManagerClient1.class, earResURL);
+        return connManager_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testcheckConnectionManager() throws java.lang.Exception {
+            super.testcheckConnectionManager();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testTransactionSupportLevels() throws java.lang.Exception {
+            super.testTransactionSupportLevels();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/deployment/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ClientTest.java
new file mode 100644
index 0000000000..fbc75ec0cd
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/deployment/ClientTest.java
@@ -0,0 +1,128 @@
+package com.sun.ts.tests.connector.deployment;
+
+import com.sun.ts.tests.connector.deployment.DeploymentClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.deployment.DeploymentClient {
+    /**
+        EE10 Deployment Descriptors:
+        ejb_Deployment: 
+        ejb_Deployment_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        ejb_Deployment_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/deployment/ejb_Deployment_client.xml
+        /com/sun/ts/tests/connector/deployment/ejb_Deployment_client.jar.sun-application-client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.xml
+        /com/sun/ts/tests/connector/deployment/ejb_Deployment_ejb.jar.sun-ejb-jar.xml
+        Rar:
+
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = "ejb_Deployment", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive ejb_Deployment_client = ShrinkWrap.create(JavaArchive.class, "ejb_Deployment_client.jar");
+            // The class files
+            ejb_Deployment_client.addClasses(
+            com.sun.ts.tests.connector.deployment.Deployment.class,
+            com.sun.ts.tests.connector.deployment.DeploymentClient.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = DeploymentClient.class.getResource("ejb_Deployment_client.xml");
+            if(resURL != null) {
+              ejb_Deployment_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = DeploymentClient.class.getResource("ejb_Deployment_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              ejb_Deployment_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            ejb_Deployment_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.connector.deployment.DeploymentClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(ejb_Deployment_client, DeploymentClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive ejb_Deployment_ejb = ShrinkWrap.create(JavaArchive.class, "ejb_Deployment_ejb.jar");
+            // The class files
+            ejb_Deployment_ejb.addClasses(
+                com.sun.ts.tests.connector.deployment.Deployment.class,
+                com.sun.ts.tests.connector.deployment.DeploymentEJB.class,
+                com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = DeploymentClient.class.getResource("ejb_Deployment_ejb.xml");
+            if(ejbResURL1 != null) {
+              ejb_Deployment_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = DeploymentClient.class.getResource("ejb_Deployment_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              ejb_Deployment_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(ejb_Deployment_ejb, DeploymentClient.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive ejb_Deployment_ear = ShrinkWrap.create(EnterpriseArchive.class, "ejb_Deployment.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            ejb_Deployment_ear.addAsModule(ejb_Deployment_ejb);
+            ejb_Deployment_ear.addAsModule(ejb_Deployment_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(ejb_Deployment_ear, DeploymentClient.class, earResURL);
+        return ejb_Deployment_ear;
+        }
+
+        @Test
+        @Override
+        public void testRarInEar() throws java.lang.Exception {
+            super.testRarInEar();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1EjbTest.java
new file mode 100644
index 0000000000..20a963c237
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1EjbTest.java
@@ -0,0 +1,314 @@
+package com.sun.ts.tests.connector.localTx.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1EjbTest extends com.sun.ts.tests.connector.localTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_conn_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_conn_ejb_vehicle: 
+        localTx_conn_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_conn_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_conn_jsp_vehicle: 
+        localTx_conn_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_conn_servlet_vehicle: 
+        localTx_conn_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/connection/localTx_conn_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/connection/localTx_conn_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/connection/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_conn_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_conn_ejb_vehicle_client.jar");
+            // The class files
+            localTx_conn_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_conn_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = connectionClient1.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_conn_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            localTx_conn_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_conn_ejb_vehicle_client, connectionClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_conn_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_conn_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_conn_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.connection.connectionClient1.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = connectionClient1.class.getResource("/ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_conn_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = connectionClient1.class.getResource("/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_conn_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_conn_ejb_vehicle_ejb, connectionClient1.class, ejbResURL1);
+
+
+
+        // Ear
+            EnterpriseArchive localTx_conn_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_conn_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_conn_ejb_vehicle_ear.addAsModule(localTx_conn_ejb_vehicle_ejb);
+            localTx_conn_ejb_vehicle_ear.addAsModule(localTx_conn_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = connectionClient1.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              localTx_conn_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_conn_ejb_vehicle_ear, connectionClient1.class, earResURL);
+        return localTx_conn_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIResourceException() throws java.lang.Exception {
+            super.testAPIResourceException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPINotSupportedException() throws java.lang.Exception {
+            super.testAPINotSupportedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPILocalTransactionException() throws java.lang.Exception {
+            super.testAPILocalTransactionException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIResourceAllocationException() throws java.lang.Exception {
+            super.testAPIResourceAllocationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIResourceAdapterInternalException() throws java.lang.Exception {
+            super.testAPIResourceAdapterInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPISecurityException() throws java.lang.Exception {
+            super.testAPISecurityException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPISharingViolationException() throws java.lang.Exception {
+            super.testAPISharingViolationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIUnavailableException() throws java.lang.Exception {
+            super.testAPIUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIWorkException() throws java.lang.Exception {
+            super.testAPIWorkException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIWorkCompletedException() throws java.lang.Exception {
+            super.testAPIWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIWorkRejectedException() throws java.lang.Exception {
+            super.testAPIWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIEISSystemException() throws java.lang.Exception {
+            super.testAPIEISSystemException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIApplicationServerInternalException() throws java.lang.Exception {
+            super.testAPIApplicationServerInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPICommException() throws java.lang.Exception {
+            super.testAPICommException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIRetryableWorkRejectedException() throws java.lang.Exception {
+            super.testAPIRetryableWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIIllegalStateException() throws java.lang.Exception {
+            super.testAPIIllegalStateException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIRetryableUnavailableException() throws java.lang.Exception {
+            super.testAPIRetryableUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIManagedConnectionMetaData() throws java.lang.Exception {
+            super.testAPIManagedConnectionMetaData();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIManagedConnection() throws java.lang.Exception {
+            super.testAPIManagedConnection();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIInvalidPropertyException() throws java.lang.Exception {
+            super.testAPIInvalidPropertyException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAPIHintsContext() throws java.lang.Exception {
+            super.testAPIHintsContext();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1JspTest.java
new file mode 100644
index 0000000000..03277862ac
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1JspTest.java
@@ -0,0 +1,287 @@
+package com.sun.ts.tests.connector.localTx.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1JspTest extends com.sun.ts.tests.connector.localTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_conn_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_conn_ejb_vehicle: 
+        localTx_conn_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_conn_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_conn_jsp_vehicle: 
+        localTx_conn_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_conn_servlet_vehicle: 
+        localTx_conn_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/connection/localTx_conn_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/connection/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_conn_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_conn_jsp_vehicle_web.war");
+            // The class files
+            localTx_conn_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.localTx.connection.connectionClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_conn_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("localTx_conn_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_conn_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_conn_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_conn_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_conn_jsp_vehicle_web, connectionClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_conn_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_conn_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_conn_jsp_vehicle_ear.addAsModule(localTx_conn_jsp_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = connectionClient1.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              localTx_conn_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_conn_jsp_vehicle_ear, connectionClient1.class, earResURL);
+        return localTx_conn_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIResourceException() throws java.lang.Exception {
+            super.testAPIResourceException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPINotSupportedException() throws java.lang.Exception {
+            super.testAPINotSupportedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPILocalTransactionException() throws java.lang.Exception {
+            super.testAPILocalTransactionException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIResourceAllocationException() throws java.lang.Exception {
+            super.testAPIResourceAllocationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIResourceAdapterInternalException() throws java.lang.Exception {
+            super.testAPIResourceAdapterInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPISecurityException() throws java.lang.Exception {
+            super.testAPISecurityException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPISharingViolationException() throws java.lang.Exception {
+            super.testAPISharingViolationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIUnavailableException() throws java.lang.Exception {
+            super.testAPIUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIWorkException() throws java.lang.Exception {
+            super.testAPIWorkException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIWorkCompletedException() throws java.lang.Exception {
+            super.testAPIWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIWorkRejectedException() throws java.lang.Exception {
+            super.testAPIWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIEISSystemException() throws java.lang.Exception {
+            super.testAPIEISSystemException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIApplicationServerInternalException() throws java.lang.Exception {
+            super.testAPIApplicationServerInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPICommException() throws java.lang.Exception {
+            super.testAPICommException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIRetryableWorkRejectedException() throws java.lang.Exception {
+            super.testAPIRetryableWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIIllegalStateException() throws java.lang.Exception {
+            super.testAPIIllegalStateException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIRetryableUnavailableException() throws java.lang.Exception {
+            super.testAPIRetryableUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIManagedConnectionMetaData() throws java.lang.Exception {
+            super.testAPIManagedConnectionMetaData();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIManagedConnection() throws java.lang.Exception {
+            super.testAPIManagedConnection();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIInvalidPropertyException() throws java.lang.Exception {
+            super.testAPIInvalidPropertyException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAPIHintsContext() throws java.lang.Exception {
+            super.testAPIHintsContext();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1ServletTest.java
new file mode 100644
index 0000000000..fd06af32a3
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/connection/connectionClient1ServletTest.java
@@ -0,0 +1,273 @@
+package com.sun.ts.tests.connector.localTx.connection;
+
+import java.net.URL;
+
+import com.sun.ts.tests.common.connector.embedded.adapter1.RADeployment;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1ServletTest extends com.sun.ts.tests.connector.localTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_conn_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_conn_ejb_vehicle: 
+        localTx_conn_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_conn_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_conn_jsp_vehicle: 
+        localTx_conn_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_conn_servlet_vehicle: 
+        localTx_conn_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/connection/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+         */
+
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_conn_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_conn_servlet_vehicle_web.war");
+            // The class files
+            localTx_conn_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.localTx.connection.connectionClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("localTx_conn_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_conn_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("localTx_conn_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_conn_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_conn_servlet_vehicle_web, connectionClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive localTx_conn_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_conn_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_conn_servlet_vehicle_ear.addAsModule(localTx_conn_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_conn_servlet_vehicle_ear, connectionClient1.class, earResURL);
+        return localTx_conn_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIResourceException() throws java.lang.Exception {
+            super.testAPIResourceException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPINotSupportedException() throws java.lang.Exception {
+            super.testAPINotSupportedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPILocalTransactionException() throws java.lang.Exception {
+            super.testAPILocalTransactionException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIResourceAllocationException() throws java.lang.Exception {
+            super.testAPIResourceAllocationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIResourceAdapterInternalException() throws java.lang.Exception {
+            super.testAPIResourceAdapterInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPISecurityException() throws java.lang.Exception {
+            super.testAPISecurityException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPISharingViolationException() throws java.lang.Exception {
+            super.testAPISharingViolationException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIUnavailableException() throws java.lang.Exception {
+            super.testAPIUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIWorkException() throws java.lang.Exception {
+            super.testAPIWorkException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIWorkCompletedException() throws java.lang.Exception {
+            super.testAPIWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIWorkRejectedException() throws java.lang.Exception {
+            super.testAPIWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIEISSystemException() throws java.lang.Exception {
+            super.testAPIEISSystemException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIApplicationServerInternalException() throws java.lang.Exception {
+            super.testAPIApplicationServerInternalException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPICommException() throws java.lang.Exception {
+            super.testAPICommException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIRetryableWorkRejectedException() throws java.lang.Exception {
+            super.testAPIRetryableWorkRejectedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIIllegalStateException() throws java.lang.Exception {
+            super.testAPIIllegalStateException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIRetryableUnavailableException() throws java.lang.Exception {
+            super.testAPIRetryableUnavailableException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIManagedConnectionMetaData() throws java.lang.Exception {
+            super.testAPIManagedConnectionMetaData();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIManagedConnection() throws java.lang.Exception {
+            super.testAPIManagedConnection();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIInvalidPropertyException() throws java.lang.Exception {
+            super.testAPIInvalidPropertyException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAPIHintsContext() throws java.lang.Exception {
+            super.testAPIHintsContext();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1EjbTest.java
new file mode 100644
index 0000000000..df6f005b7e
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1EjbTest.java
@@ -0,0 +1,155 @@
+package com.sun.ts.tests.connector.localTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1EjbTest extends com.sun.ts.tests.connector.localTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_event_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_event_ejb_vehicle: 
+        localTx_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_event_jsp_vehicle: 
+        localTx_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_event_servlet_vehicle: 
+        localTx_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/event/localTx_event_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/event/localTx_event_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/event/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_event_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_event_ejb_vehicle_client.jar");
+            // The class files
+            localTx_event_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = eventClient1.class.getResource("localTx_event_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_event_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = eventClient1.class.getResource("localTx_event_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_event_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            localTx_event_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_event_ejb_vehicle_client, eventClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_event_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_event_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_event_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.localTx.event.eventClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = eventClient1.class.getResource("localTx_event_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = eventClient1.class.getResource("localTx_event_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_event_ejb_vehicle_ejb, eventClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive localTx_event_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_event_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_event_ejb_vehicle_ear.addAsModule(localTx_event_ejb_vehicle_ejb);
+            localTx_event_ejb_vehicle_ear.addAsModule(localTx_event_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_event_ejb_vehicle_ear, eventClient1.class, earResURL);
+        return localTx_event_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1JspTest.java
new file mode 100644
index 0000000000..d0e8faf8bf
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1JspTest.java
@@ -0,0 +1,126 @@
+package com.sun.ts.tests.connector.localTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1JspTest extends com.sun.ts.tests.connector.localTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_event_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_event_ejb_vehicle: 
+        localTx_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_event_jsp_vehicle: 
+        localTx_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_event_servlet_vehicle: 
+        localTx_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/event/localTx_event_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/event/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_event_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_event_jsp_vehicle_web.war");
+            // The class files
+            localTx_event_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("localTx_event_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_event_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("localTx_event_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_event_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_event_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_event_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_event_jsp_vehicle_web, eventClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_event_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_event_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_event_jsp_vehicle_ear.addAsModule(localTx_event_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_event_jsp_vehicle_ear, eventClient1.class, earResURL);
+        return localTx_event_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1ServletTest.java
new file mode 100644
index 0000000000..667503d86d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/event/eventClient1ServletTest.java
@@ -0,0 +1,118 @@
+package com.sun.ts.tests.connector.localTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1ServletTest extends com.sun.ts.tests.connector.localTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_event_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_event_ejb_vehicle: 
+        localTx_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_event_jsp_vehicle: 
+        localTx_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_event_servlet_vehicle: 
+        localTx_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/event/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_event_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_event_servlet_vehicle_web.war");
+            // The class files
+            localTx_event_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("localTx_event_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_event_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("localTx_event_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_event_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_event_servlet_vehicle_web, eventClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_event_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_event_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_event_servlet_vehicle_ear.addAsModule(localTx_event_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_event_servlet_vehicle_ear, eventClient1.class, earResURL);
+        return localTx_event_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1EjbTest.java
new file mode 100644
index 0000000000..99406edcfa
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1EjbTest.java
@@ -0,0 +1,195 @@
+package com.sun.ts.tests.connector.localTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1EjbTest extends com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_lifecycle_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_lifecycle_ejb_vehicle: 
+        localTx_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_lifecycle_jsp_vehicle: 
+        localTx_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_lifecycle_servlet_vehicle: 
+        localTx_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/lifecycle/localTx_lifecycle_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/lifecycle/localTx_lifecycle_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/lifecycle/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_lifecycle_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_lifecycle_ejb_vehicle_client.jar");
+            // The class files
+            localTx_lifecycle_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = lifecycleClient1.class.getResource("localTx_lifecycle_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = lifecycleClient1.class.getResource("localTx_lifecycle_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            localTx_lifecycle_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_lifecycle_ejb_vehicle_client, lifecycleClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_lifecycle_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_lifecycle_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_lifecycle_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = lifecycleClient1.class.getResource("localTx_lifecycle_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = lifecycleClient1.class.getResource("localTx_lifecycle_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_lifecycle_ejb_vehicle_ejb, lifecycleClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive localTx_lifecycle_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_lifecycle_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_lifecycle_ejb_vehicle_ear.addAsModule(localTx_lifecycle_ejb_vehicle_ejb);
+            localTx_lifecycle_ejb_vehicle_ear.addAsModule(localTx_lifecycle_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_lifecycle_ejb_vehicle_ear, lifecycleClient1.class, earResURL);
+        return localTx_lifecycle_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1JspTest.java
new file mode 100644
index 0000000000..796749cde2
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1JspTest.java
@@ -0,0 +1,169 @@
+package com.sun.ts.tests.connector.localTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1JspTest extends com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_lifecycle_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_lifecycle_ejb_vehicle: 
+        localTx_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_lifecycle_jsp_vehicle: 
+        localTx_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_lifecycle_servlet_vehicle: 
+        localTx_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/lifecycle/localTx_lifecycle_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/lifecycle/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_lifecycle_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_lifecycle_jsp_vehicle_web.war");
+            // The class files
+            localTx_lifecycle_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("localTx_lifecycle_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("localTx_lifecycle_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_lifecycle_jsp_vehicle_web, lifecycleClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_lifecycle_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_lifecycle_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_lifecycle_jsp_vehicle_ear.addAsModule(localTx_lifecycle_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_lifecycle_jsp_vehicle_ear, lifecycleClient1.class, earResURL);
+        return localTx_lifecycle_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1ServletTest.java
new file mode 100644
index 0000000000..1228385332
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1ServletTest.java
@@ -0,0 +1,160 @@
+package com.sun.ts.tests.connector.localTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1ServletTest extends com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_lifecycle_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_lifecycle_ejb_vehicle: 
+        localTx_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_lifecycle_jsp_vehicle: 
+        localTx_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_lifecycle_servlet_vehicle: 
+        localTx_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/lifecycle/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_lifecycle_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_lifecycle_servlet_vehicle_web.war");
+            // The class files
+            localTx_lifecycle_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.localTx.lifecycle.lifecycleClient1.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("localTx_lifecycle_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("localTx_lifecycle_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_lifecycle_servlet_vehicle_web, lifecycleClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_lifecycle_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_lifecycle_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_lifecycle_servlet_vehicle_ear.addAsModule(localTx_lifecycle_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_lifecycle_servlet_vehicle_ear, lifecycleClient1.class, earResURL);
+        return localTx_lifecycle_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientEjbTest.java
new file mode 100644
index 0000000000..f40bf4e9cc
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientEjbTest.java
@@ -0,0 +1,438 @@
+package com.sun.ts.tests.connector.localTx.msginflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector_mdb_optional")
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class MDBClientEjbTest extends com.sun.ts.tests.connector.localTx.msginflow.MDBClient {
+        @Deployment(name = "msginflow_mdb", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment() {
+            JavaArchive msginflow_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_msginflow.jar");
+            // The class files
+            msginflow_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            JavaArchive msginflow1_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow1_mdb_msginflow.jar");
+            // The class files
+            msginflow1_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBeanOne.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            EnterpriseArchive msginflow_mdb_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb.ear");
+            msginflow_mdb_ear.addAsModule(msginflow_mdb_msginflow_ejb);
+            msginflow_mdb_ear.addAsModule(msginflow1_mdb_msginflow_ejb);
+
+
+            return msginflow_mdb_ear;
+        }
+
+        @Deployment(name = "msginflow_mdb_jca", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment1() {
+            JavaArchive msginflow_mdb_jca_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_jca_msginflow.jar");
+            // The class files
+            msginflow_mdb_jca_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.JCAMessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            EnterpriseArchive msginflow_mdb_jca_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_jca.ear");
+            msginflow_mdb_jca_ear.addAsModule(msginflow_mdb_jca_msginflow_ejb);
+
+            return msginflow_mdb_jca_ear;
+        }
+
+    static final String VEHICLE_ARCHIVE = "msginflow_mdb_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        msginflow_mdb: 
+        msginflow_mdb_ejb_vehicle: 
+        msginflow_mdb_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        msginflow_mdb_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jca: 
+        msginflow_mdb_jca_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jsp_vehicle: 
+        msginflow_mdb_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        msginflow_mdb_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_servlet_vehicle: 
+        msginflow_mdb_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/msginflow/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive msginflow_mdb_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_ejb_vehicle_client.jar");
+            // The class files
+            msginflow_mdb_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = MDBClient.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml");
+            if(resURL != null) {
+              msginflow_mdb_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = MDBClient.class.getResource("//com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              msginflow_mdb_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            msginflow_mdb_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(msginflow_mdb_ejb_vehicle_client, MDBClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive msginflow_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_msginflow_ejb.jar");
+            // The class files
+            msginflow_mdb_msginflow_ejb.addClasses(
+                com.sun.ts.tests.connector.mdb.MessageBean.class,
+                com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.xml");
+            if(ejbResURL1 != null) {
+              msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(msginflow_mdb_msginflow_ejb, MDBClient.class, ejbResURL1);
+        // Ejb 2
+            // the jar with the correct archive name
+            JavaArchive msginflow1_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow1_mdb_msginflow_ejb.jar");
+            // The class files
+            msginflow1_mdb_msginflow_ejb.addClasses(
+                com.sun.ts.tests.connector.mdb.MessageBeanOne.class,
+                com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL2 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.xml");
+            if(ejbResURL2 != null) {
+              msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL2, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL2 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL2 != null) {
+              msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL2, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(msginflow1_mdb_msginflow_ejb, MDBClient.class, ejbResURL2);
+        // Ejb 3
+            // the jar with the correct archive name
+            JavaArchive msginflow_mdb_jca_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_jca_msginflow_ejb.jar");
+            // The class files
+            msginflow_mdb_jca_msginflow_ejb.addClasses(
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.tests.connector.mdb.JCAMessageBean.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL3 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml");
+            if(ejbResURL3 != null) {
+              msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL3, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL3 = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL3 != null) {
+              msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL3, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(msginflow_mdb_jca_msginflow_ejb, MDBClient.class, ejbResURL3);
+        // Ejb 4
+            // the jar with the correct archive name
+            JavaArchive msginflow_mdb_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_ejb_vehicle_ejb.jar");
+            // The class files
+            msginflow_mdb_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.tests.connector.localTx.msginflow.MDBClient.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL4 = MDBClient.class.getResource("/ejb_vehicle_ejb.xml");
+            if(ejbResURL4 != null) {
+              msginflow_mdb_ejb_vehicle_ejb.addAsManifestResource(ejbResURL4, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL4 = MDBClient.class.getResource("/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL4 != null) {
+              msginflow_mdb_ejb_vehicle_ejb.addAsManifestResource(ejbResURL4, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(msginflow_mdb_ejb_vehicle_ejb, MDBClient.class, ejbResURL4);
+
+
+        // Ear
+            EnterpriseArchive msginflow_mdb_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            msginflow_mdb_ejb_vehicle_ear.addAsModule(msginflow_mdb_msginflow_ejb);
+            msginflow_mdb_ejb_vehicle_ear.addAsModule(msginflow1_mdb_msginflow_ejb);
+            msginflow_mdb_ejb_vehicle_ear.addAsModule(msginflow_mdb_jca_msginflow_ejb);
+            msginflow_mdb_ejb_vehicle_ear.addAsModule(msginflow_mdb_ejb_vehicle_ejb);
+            msginflow_mdb_ejb_vehicle_ear.addAsModule(msginflow_mdb_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = MDBClient.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              msginflow_mdb_ejb_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(msginflow_mdb_ejb_vehicle_ear, MDBClient.class, earResURL);
+        return msginflow_mdb_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testReceiveMessage() throws java.lang.Exception {
+            super.testReceiveMessage();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testProxyInterfaceImp() throws java.lang.Exception {
+            super.testProxyInterfaceImp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testUniqueMessageEndpoint() throws java.lang.Exception {
+            super.testUniqueMessageEndpoint();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testMessageEndpointFactoryForEquals() throws java.lang.Exception {
+            super.testMessageEndpointFactoryForEquals();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testUniqueMessageEndpointFactory() throws java.lang.Exception {
+            super.testUniqueMessageEndpointFactory();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testEndpointActivationName() throws java.lang.Exception {
+            super.testEndpointActivationName();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testGetEndpoinClass() throws java.lang.Exception {
+            super.testGetEndpoinClass();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testMessageDeliveryTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testMessageDeliveryNonTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryNonTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testMessageDeliveryTransactedUsingXid() throws java.lang.Exception {
+            super.testMessageDeliveryTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testActivationSpeccalledOnce() throws java.lang.Exception {
+            super.testActivationSpeccalledOnce();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testEJBExceptionNotSupported() throws java.lang.Exception {
+            super.testEJBExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testEJBExceptionRequired() throws java.lang.Exception {
+            super.testEJBExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testAppExceptionNotSupported() throws java.lang.Exception {
+            super.testAppExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testAppExceptionRequired() throws java.lang.Exception {
+            super.testAppExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testSICMsgPrincipal() throws java.lang.Exception {
+            super.testSICMsgPrincipal();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testIBAnnoMsgTransactedUsingXid() throws java.lang.Exception {
+            super.testIBAnnoMsgTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testActivationSpecImplRAA() throws java.lang.Exception {
+            super.testActivationSpecImplRAA();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testIBAnnoASConfigProp() throws java.lang.Exception {
+            super.testIBAnnoASConfigProp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("ejb")
+        public void testContextSetupCompleted() throws java.lang.Exception {
+            super.testContextSetupCompleted();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientJspTest.java
new file mode 100644
index 0000000000..2f2f8796e6
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientJspTest.java
@@ -0,0 +1,348 @@
+package com.sun.ts.tests.connector.localTx.msginflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector_mdb_optional")
+@Tag("platform")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class MDBClientJspTest extends com.sun.ts.tests.connector.localTx.msginflow.MDBClient {
+        @Deployment(name = "msginflow_mdb", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment() {
+            JavaArchive msginflow_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_msginflow.jar");
+            // The class files
+            msginflow_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            JavaArchive msginflow1_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow1_mdb_msginflow.jar");
+            // The class files
+            msginflow1_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBeanOne.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            EnterpriseArchive msginflow_mdb_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb.ear");
+            msginflow_mdb_ear.addAsModule(msginflow_mdb_msginflow_ejb);
+            msginflow_mdb_ear.addAsModule(msginflow1_mdb_msginflow_ejb);
+
+
+            return msginflow_mdb_ear;
+        }
+
+        @Deployment(name = "msginflow_mdb_jca", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment1() {
+            JavaArchive msginflow_mdb_jca_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_jca_msginflow.jar");
+            // The class files
+            msginflow_mdb_jca_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.JCAMessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+
+            EnterpriseArchive msginflow_mdb_jca_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_jca.ear");
+            msginflow_mdb_jca_ear.addAsModule(msginflow_mdb_jca_msginflow_ejb);
+
+            return msginflow_mdb_jca_ear;
+        }
+
+    static final String VEHICLE_ARCHIVE = "msginflow_mdb_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        msginflow_mdb: 
+        msginflow_mdb_ejb_vehicle: 
+        msginflow_mdb_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        msginflow_mdb_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jca: 
+        msginflow_mdb_jca_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jsp_vehicle: 
+        msginflow_mdb_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        msginflow_mdb_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_servlet_vehicle: 
+        msginflow_mdb_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Ejb:
+
+        /com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml
+        /com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml
+        War:
+
+        /com/sun/ts/tests/connector/localTx/msginflow/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive msginflow_mdb_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "msginflow_mdb_jsp_vehicle_web.war");
+            // The class files
+            msginflow_mdb_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.localTx.msginflow.MDBClient.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = MDBClient.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              msginflow_mdb_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = MDBClient.class.getResource("msginflow_mdb_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              msginflow_mdb_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = MDBClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              msginflow_mdb_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = MDBClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              msginflow_mdb_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(msginflow_mdb_jsp_vehicle_web, MDBClient.class, warResURL);
+
+        // Ear
+            EnterpriseArchive msginflow_mdb_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            msginflow_mdb_jsp_vehicle_ear.addAsModule(msginflow_mdb_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(msginflow_mdb_jsp_vehicle_ear, MDBClient.class, earResURL);
+        return msginflow_mdb_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testReceiveMessage() throws java.lang.Exception {
+            super.testReceiveMessage();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testProxyInterfaceImp() throws java.lang.Exception {
+            super.testProxyInterfaceImp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testUniqueMessageEndpoint() throws java.lang.Exception {
+            super.testUniqueMessageEndpoint();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testMessageEndpointFactoryForEquals() throws java.lang.Exception {
+            super.testMessageEndpointFactoryForEquals();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testUniqueMessageEndpointFactory() throws java.lang.Exception {
+            super.testUniqueMessageEndpointFactory();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testEndpointActivationName() throws java.lang.Exception {
+            super.testEndpointActivationName();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testGetEndpoinClass() throws java.lang.Exception {
+            super.testGetEndpoinClass();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testMessageDeliveryTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testMessageDeliveryNonTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryNonTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testMessageDeliveryTransactedUsingXid() throws java.lang.Exception {
+            super.testMessageDeliveryTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testActivationSpeccalledOnce() throws java.lang.Exception {
+            super.testActivationSpeccalledOnce();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testEJBExceptionNotSupported() throws java.lang.Exception {
+            super.testEJBExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testEJBExceptionRequired() throws java.lang.Exception {
+            super.testEJBExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testAppExceptionNotSupported() throws java.lang.Exception {
+            super.testAppExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testAppExceptionRequired() throws java.lang.Exception {
+            super.testAppExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testSICMsgPrincipal() throws java.lang.Exception {
+            super.testSICMsgPrincipal();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testIBAnnoMsgTransactedUsingXid() throws java.lang.Exception {
+            super.testIBAnnoMsgTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testActivationSpecImplRAA() throws java.lang.Exception {
+            super.testActivationSpecImplRAA();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testIBAnnoASConfigProp() throws java.lang.Exception {
+            super.testIBAnnoASConfigProp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("jsp")
+        public void testContextSetupCompleted() throws java.lang.Exception {
+            super.testContextSetupCompleted();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientServletTest.java
new file mode 100644
index 0000000000..cf2f907b90
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/msginflow/MDBClientServletTest.java
@@ -0,0 +1,343 @@
+package com.sun.ts.tests.connector.localTx.msginflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector_mdb_optional")
+@Tag("platform")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class MDBClientServletTest extends com.sun.ts.tests.connector.localTx.msginflow.MDBClient {
+        @Deployment(name = "msginflow_mdb", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+            JavaArchive msginflow_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_msginflow_ejb.jar");
+            // The class files
+            msginflow_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+            archiveProcessor.processEjbArchive(msginflow_mdb_msginflow_ejb, com.sun.ts.tests.connector.mdb.MessageBean.class, ejbResURL);
+
+            JavaArchive msginflow1_mdb_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow1_mdb_msginflow_ejb.jar");
+            // The class files
+            msginflow1_mdb_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.MessageBeanOne.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow1_mdb_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow1_mdb_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+            archiveProcessor.processEjbArchive(msginflow1_mdb_msginflow_ejb, com.sun.ts.tests.connector.mdb.MessageBean.class, ejbResURL);
+
+            EnterpriseArchive msginflow_mdb_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb.ear");
+            msginflow_mdb_ear.addAsModule(msginflow_mdb_msginflow_ejb);
+            msginflow_mdb_ear.addAsModule(msginflow1_mdb_msginflow_ejb);
+
+
+            return msginflow_mdb_ear;
+        }
+
+        @Deployment(name = "msginflow_mdb_jca", order = 1, testable = false)
+        public static EnterpriseArchive createCommonDeployment1(@ArquillianResource TestArchiveProcessor archiveProcessor)  {
+            JavaArchive msginflow_mdb_jca_msginflow_ejb = ShrinkWrap.create(JavaArchive.class, "msginflow_mdb_jca_msginflow_ejb.jar");
+            // The class files
+            msginflow_mdb_jca_msginflow_ejb.addClasses(
+                    com.sun.ts.tests.connector.mdb.JCAMessageBean.class,
+                    com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            URL ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml");
+            }
+            ejbResURL = MDBClient.class.getResource("/com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml");
+            if (ejbResURL != null) {
+                msginflow_mdb_jca_msginflow_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
+            }
+            archiveProcessor.processEjbArchive(msginflow_mdb_jca_msginflow_ejb, com.sun.ts.tests.connector.mdb.JCAMessageBean.class, ejbResURL);
+
+            EnterpriseArchive msginflow_mdb_jca_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_jca.ear");
+            msginflow_mdb_jca_ear.addAsModule(msginflow_mdb_jca_msginflow_ejb);
+
+            return msginflow_mdb_jca_ear;
+        }
+
+    static final String VEHICLE_ARCHIVE = "msginflow_mdb_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        msginflow_mdb: 
+        msginflow_mdb_ejb_vehicle: 
+        msginflow_mdb_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        msginflow_mdb_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jca: 
+        msginflow_mdb_jca_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_jsp_vehicle: 
+        msginflow_mdb_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        msginflow_mdb_msginflow_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        msginflow_mdb_servlet_vehicle: 
+        msginflow_mdb_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Ejb:
+
+        /com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.xml
+        /com/sun/ts/tests/connector/mdb/msginflow_mdb_jca_msginflow_ejb.jar.sun-ejb-jar.xml
+        War:
+
+        /com/sun/ts/tests/connector/localTx/msginflow/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive msginflow_mdb_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "msginflow_mdb_servlet_vehicle_web.war");
+            // The class files
+            msginflow_mdb_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.localTx.msginflow.MDBClient.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = MDBClient.class.getResource("servlet_vehicle_web.xml");
+            if(warResURL != null) {
+              msginflow_mdb_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = MDBClient.class.getResource("msginflow_mdb_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              msginflow_mdb_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(msginflow_mdb_servlet_vehicle_web, MDBClient.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive msginflow_mdb_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "msginflow_mdb_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            msginflow_mdb_servlet_vehicle_ear.addAsModule(msginflow_mdb_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(msginflow_mdb_servlet_vehicle_ear, MDBClient.class, earResURL);
+        return msginflow_mdb_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testReceiveMessage() throws java.lang.Exception {
+            super.testReceiveMessage();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testProxyInterfaceImp() throws java.lang.Exception {
+            super.testProxyInterfaceImp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testUniqueMessageEndpoint() throws java.lang.Exception {
+            super.testUniqueMessageEndpoint();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testMessageEndpointFactoryForEquals() throws java.lang.Exception {
+            super.testMessageEndpointFactoryForEquals();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testUniqueMessageEndpointFactory() throws java.lang.Exception {
+            super.testUniqueMessageEndpointFactory();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testEndpointActivationName() throws java.lang.Exception {
+            super.testEndpointActivationName();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testGetEndpoinClass() throws java.lang.Exception {
+            super.testGetEndpoinClass();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testMessageDeliveryTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testMessageDeliveryNonTransacted() throws java.lang.Exception {
+            super.testMessageDeliveryNonTransacted();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testMessageDeliveryTransactedUsingXid() throws java.lang.Exception {
+            super.testMessageDeliveryTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testActivationSpeccalledOnce() throws java.lang.Exception {
+            super.testActivationSpeccalledOnce();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testEJBExceptionNotSupported() throws java.lang.Exception {
+            super.testEJBExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testEJBExceptionRequired() throws java.lang.Exception {
+            super.testEJBExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testAppExceptionNotSupported() throws java.lang.Exception {
+            super.testAppExceptionNotSupported();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testAppExceptionRequired() throws java.lang.Exception {
+            super.testAppExceptionRequired();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testSICMsgPrincipal() throws java.lang.Exception {
+            super.testSICMsgPrincipal();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testIBAnnoMsgTransactedUsingXid() throws java.lang.Exception {
+            super.testIBAnnoMsgTransactedUsingXid();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testActivationSpecImplRAA() throws java.lang.Exception {
+            super.testActivationSpecImplRAA();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testIBAnnoASConfigProp() throws java.lang.Exception {
+            super.testIBAnnoASConfigProp();
+        }
+
+        @Test
+        @Override
+        @OperateOnDeployment("msginflow_mdb")
+        @TargetVehicle("servlet")
+        public void testContextSetupCompleted() throws java.lang.Exception {
+            super.testContextSetupCompleted();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1EjbTest.java
new file mode 100644
index 0000000000..4d264b3833
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1EjbTest.java
@@ -0,0 +1,231 @@
+package com.sun.ts.tests.connector.localTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1EjbTest extends com.sun.ts.tests.connector.localTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_security_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_security_ejb_vehicle: 
+        localTx_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_security_jsp_vehicle: 
+        localTx_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_security_servlet_vehicle: 
+        localTx_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/security/localTx_security_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/security/localTx_security_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/security/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_security_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_security_ejb_vehicle_client.jar");
+            // The class files
+            localTx_security_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = securityClient1.class.getResource("localTx_security_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_security_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = securityClient1.class.getResource("localTx_security_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_security_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            localTx_security_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_security_ejb_vehicle_client, securityClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_security_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_security_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_security_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.security.securityClient1.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = securityClient1.class.getResource("localTx_security_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = securityClient1.class.getResource("localTx_security_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_security_ejb_vehicle_ejb, securityClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive localTx_security_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_security_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_security_ejb_vehicle_ear.addAsModule(localTx_security_ejb_vehicle_ejb);
+            localTx_security_ejb_vehicle_ear.addAsModule(localTx_security_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_security_ejb_vehicle_ear, securityClient1.class, earResURL);
+        return localTx_security_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestCPCandNullPrin() throws java.lang.Exception {
+            super.testCBTestCPCandNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestCPCandGPC() throws java.lang.Exception {
+            super.testCBTestCPCandGPC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestAllCallbacksAndPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksAndPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestCPCandPrin() throws java.lang.Exception {
+            super.testCBTestCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestAllCallbacksNullPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestCPCandPVC() throws java.lang.Exception {
+            super.testCBTestCPCandPVC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestGPCandCPCFail() throws java.lang.Exception {
+            super.testCBTestGPCandCPCFail();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testCBTestEISCPCandPrin() throws java.lang.Exception {
+            super.testCBTestEISCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1JspTest.java
new file mode 100644
index 0000000000..4cc901a117
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1JspTest.java
@@ -0,0 +1,204 @@
+package com.sun.ts.tests.connector.localTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1JspTest extends com.sun.ts.tests.connector.localTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_security_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_security_ejb_vehicle: 
+        localTx_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_security_jsp_vehicle: 
+        localTx_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_security_servlet_vehicle: 
+        localTx_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/security/localTx_security_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/security/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_security_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_security_jsp_vehicle_web.war");
+            // The class files
+            localTx_security_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.localTx.security.securityClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("localTx_security_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_security_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("localTx_security_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_security_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_security_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_security_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_security_jsp_vehicle_web, securityClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive localTx_security_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_security_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_security_jsp_vehicle_ear.addAsModule(localTx_security_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_security_jsp_vehicle_ear, securityClient1.class, earResURL);
+        return localTx_security_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestCPCandNullPrin() throws java.lang.Exception {
+            super.testCBTestCPCandNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestCPCandGPC() throws java.lang.Exception {
+            super.testCBTestCPCandGPC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestAllCallbacksAndPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksAndPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestCPCandPrin() throws java.lang.Exception {
+            super.testCBTestCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestAllCallbacksNullPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestCPCandPVC() throws java.lang.Exception {
+            super.testCBTestCPCandPVC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestGPCandCPCFail() throws java.lang.Exception {
+            super.testCBTestGPCandCPCFail();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testCBTestEISCPCandPrin() throws java.lang.Exception {
+            super.testCBTestEISCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1ServletTest.java
new file mode 100644
index 0000000000..57b30926ce
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/security/securityClient1ServletTest.java
@@ -0,0 +1,195 @@
+package com.sun.ts.tests.connector.localTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1ServletTest extends com.sun.ts.tests.connector.localTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_security_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_security_ejb_vehicle: 
+        localTx_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_security_jsp_vehicle: 
+        localTx_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_security_servlet_vehicle: 
+        localTx_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/security/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_security_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_security_servlet_vehicle_web.war");
+            // The class files
+            localTx_security_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.localTx.security.securityClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("localTx_security_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_security_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("localTx_security_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_security_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_security_servlet_vehicle_web, securityClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_security_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_security_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_security_servlet_vehicle_ear.addAsModule(localTx_security_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_security_servlet_vehicle_ear, securityClient1.class, earResURL);
+        return localTx_security_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestCPCandNullPrin() throws java.lang.Exception {
+            super.testCBTestCPCandNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestCPCandGPC() throws java.lang.Exception {
+            super.testCBTestCPCandGPC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestAllCallbacksAndPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksAndPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestCPCandPrin() throws java.lang.Exception {
+            super.testCBTestCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestAllCallbacksNullPrin() throws java.lang.Exception {
+            super.testCBTestAllCallbacksNullPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestCPCandPVC() throws java.lang.Exception {
+            super.testCBTestCPCandPVC();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestGPCandCPCFail() throws java.lang.Exception {
+            super.testCBTestGPCandCPCFail();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testCBTestEISCPCandPrin() throws java.lang.Exception {
+            super.testCBTestEISCPCandPrin();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ClientTest.java
new file mode 100644
index 0000000000..d18e9e28df
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ClientTest.java
@@ -0,0 +1,139 @@
+package com.sun.ts.tests.connector.localTx.transaction.conSharing2;
+
+import com.sun.ts.tests.connector.localTx.transaction.conSharing2.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("connector_jta_optional")
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.localTx.transaction.conSharing2.Client {
+    /**
+        EE10 Deployment Descriptors:
+        ejb_txTran_conSharing2: 
+        ejb_txTran_conSharing2_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        ejb_txTran_conSharing2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.jar.sun-application-client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.jar.sun-ejb-jar.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = "ejb_txTran_conSharing2", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive ejb_txTran_conSharing2_client = ShrinkWrap.create(JavaArchive.class, "ejb_txTran_conSharing2_client.jar");
+            // The class files
+            ejb_txTran_conSharing2_client.addClasses(
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.transaction.conSharing2.Client.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBean.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = Client.class.getResource("com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.xml");
+            if(resURL != null) {
+              ejb_txTran_conSharing2_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              ejb_txTran_conSharing2_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            ejb_txTran_conSharing2_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.connector.localTx.transaction.conSharing2.Client\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(ejb_txTran_conSharing2_client, Client.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive ejb_txTran_conSharing2_ejb = ShrinkWrap.create(JavaArchive.class, "ejb_txTran_conSharing2_ejb.jar");
+            // The class files
+            ejb_txTran_conSharing2_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanAEJB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBeanEJB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanBEJB.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.BeanA.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing2.TestBean.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.xml");
+            if(ejbResURL1 != null) {
+              ejb_txTran_conSharing2_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing2/ejb_txTran_conSharing2_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              ejb_txTran_conSharing2_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(ejb_txTran_conSharing2_ejb, Client.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive ejb_txTran_conSharing2_ear = ShrinkWrap.create(EnterpriseArchive.class, "ejb_txTran_conSharing2.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            ejb_txTran_conSharing2_ear.addAsModule(ejb_txTran_conSharing2_ejb);
+            ejb_txTran_conSharing2_ear.addAsModule(ejb_txTran_conSharing2_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = Client.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              ejb_txTran_conSharing2_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(ejb_txTran_conSharing2_ear, Client.class, earResURL);
+        return ejb_txTran_conSharing2_ear;
+        }
+
+        @Test
+        @Override
+        public void testMultiComponentLocalTx() throws java.lang.Exception {
+            super.testMultiComponentLocalTx();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ClientTest.java
new file mode 100644
index 0000000000..86bbe0c7bb
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ClientTest.java
@@ -0,0 +1,139 @@
+package com.sun.ts.tests.connector.localTx.transaction.conSharing3;
+
+import com.sun.ts.tests.connector.localTx.transaction.conSharing3.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("connector_jta_optional")
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.localTx.transaction.conSharing3.Client {
+    /**
+        EE10 Deployment Descriptors:
+        ejb_txTran_conSharing3: 
+        ejb_txTran_conSharing3_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        ejb_txTran_conSharing3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.jar.sun-application-client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml
+        /com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.jar.sun-ejb-jar.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = "ejb_txTran_conSharing3", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive ejb_txTran_conSharing3_client = ShrinkWrap.create(JavaArchive.class, "ejb_txTran_conSharing3_client.jar");
+            // The class files
+            ejb_txTran_conSharing3_client.addClasses(
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.transaction.conSharing3.Client.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBean.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = Client.class.getResource("com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.xml");
+            if(resURL != null) {
+              ejb_txTran_conSharing3_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              ejb_txTran_conSharing3_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            ejb_txTran_conSharing3_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.connector.localTx.transaction.conSharing3.Client\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(ejb_txTran_conSharing3_client, Client.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive ejb_txTran_conSharing3_ejb = ShrinkWrap.create(JavaArchive.class, "ejb_txTran_conSharing3_ejb.jar");
+            // The class files
+            ejb_txTran_conSharing3_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanA.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBeanEJB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanBEJB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanAEJB.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.BeanB.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.tests.connector.localTx.transaction.conSharing3.TestBean.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.xml");
+            if(ejbResURL1 != null) {
+              ejb_txTran_conSharing3_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = Client.class.getResource("/com/sun/ts/tests/connector/localTx/transaction/conSharing3/ejb_txTran_conSharing3_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              ejb_txTran_conSharing3_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(ejb_txTran_conSharing3_ejb, Client.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive ejb_txTran_conSharing3_ear = ShrinkWrap.create(EnterpriseArchive.class, "ejb_txTran_conSharing3.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            ejb_txTran_conSharing3_ear.addAsModule(ejb_txTran_conSharing3_ejb);
+            ejb_txTran_conSharing3_ear.addAsModule(ejb_txTran_conSharing3_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = Client.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              ejb_txTran_conSharing3_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(ejb_txTran_conSharing3_ear, Client.class, earResURL);
+        return ejb_txTran_conSharing3_ear;
+        }
+
+        @Test
+        @Override
+        public void test1() throws java.lang.Exception {
+            super.test1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1EjbTest.java
new file mode 100644
index 0000000000..c401749d44
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1EjbTest.java
@@ -0,0 +1,179 @@
+package com.sun.ts.tests.connector.localTx.transinflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class transinflowClient1EjbTest extends com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_transinflow_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_transinflow_ejb_vehicle: 
+        localTx_transinflow_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_transinflow_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_transinflow_jsp_vehicle: 
+        localTx_transinflow_jsp_vehicle_web: WEB-INF/web.xml
+        localTx_transinflow_servlet_vehicle: 
+        localTx_transinflow_servlet_vehicle_web: WEB-INF/web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/transinflow/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_transinflow_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_transinflow_ejb_vehicle_client.jar");
+            // The class files
+            localTx_transinflow_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = transinflowClient1.class.getResource("transinflow_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_transinflow_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = transinflowClient1.class.getResource("transinflow_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_transinflow_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            localTx_transinflow_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_transinflow_ejb_vehicle_client, transinflowClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_transinflow_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_transinflow_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_transinflow_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = transinflowClient1.class.getResource("transinflow_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_transinflow_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = transinflowClient1.class.getResource("transinflow_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_transinflow_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_transinflow_ejb_vehicle_ejb, transinflowClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive localTx_transinflow_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_transinflow_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_transinflow_ejb_vehicle_ear.addAsModule(localTx_transinflow_ejb_vehicle_ejb);
+            localTx_transinflow_ejb_vehicle_ear.addAsModule(localTx_transinflow_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_transinflow_ejb_vehicle_ear, transinflowClient1.class, earResURL);
+        return localTx_transinflow_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testGetTransactionSupport() throws java.lang.Exception {
+            super.testGetTransactionSupport();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testSetResourceAdapterMethod() throws java.lang.Exception {
+            super.testSetResourceAdapterMethod();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testXATerminator() throws java.lang.Exception {
+            super.testXATerminator();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testTransactionSynchronizationRegistry() throws java.lang.Exception {
+            super.testTransactionSynchronizationRegistry();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConcurrentWorkXid() throws java.lang.Exception {
+            super.testConcurrentWorkXid();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1JspTest.java
new file mode 100644
index 0000000000..fca70f13ae
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1JspTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.connector.localTx.transinflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class transinflowClient1JspTest extends com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_transinflow_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_transinflow_ejb_vehicle: 
+        localTx_transinflow_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_transinflow_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_transinflow_jsp_vehicle: 
+        localTx_transinflow_jsp_vehicle_web: WEB-INF/web.xml
+        localTx_transinflow_servlet_vehicle: 
+        localTx_transinflow_servlet_vehicle_web: WEB-INF/web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/transinflow/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_transinflow_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_transinflow_jsp_vehicle_web.war");
+            // The class files
+            localTx_transinflow_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = transinflowClient1.class.getResource("transinflow_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_transinflow_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = transinflowClient1.class.getResource("transinflow_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_transinflow_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = transinflowClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_transinflow_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = transinflowClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_transinflow_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_transinflow_jsp_vehicle_web, transinflowClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_transinflow_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_transinflow_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_transinflow_jsp_vehicle_ear.addAsModule(localTx_transinflow_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_transinflow_jsp_vehicle_ear, transinflowClient1.class, earResURL);
+        return localTx_transinflow_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testGetTransactionSupport() throws java.lang.Exception {
+            super.testGetTransactionSupport();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testSetResourceAdapterMethod() throws java.lang.Exception {
+            super.testSetResourceAdapterMethod();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testXATerminator() throws java.lang.Exception {
+            super.testXATerminator();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testTransactionSynchronizationRegistry() throws java.lang.Exception {
+            super.testTransactionSynchronizationRegistry();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConcurrentWorkXid() throws java.lang.Exception {
+            super.testConcurrentWorkXid();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1ServletTest.java
new file mode 100644
index 0000000000..646bf51e1c
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1ServletTest.java
@@ -0,0 +1,146 @@
+package com.sun.ts.tests.connector.localTx.transinflow;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class transinflowClient1ServletTest extends com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_transinflow_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_transinflow_ejb_vehicle: 
+        localTx_transinflow_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_transinflow_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_transinflow_jsp_vehicle: 
+        localTx_transinflow_jsp_vehicle_web: WEB-INF/web.xml
+        localTx_transinflow_servlet_vehicle: 
+        localTx_transinflow_servlet_vehicle_web: WEB-INF/web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/transinflow/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_transinflow_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_transinflow_servlet_vehicle_web.war");
+            // The class files
+            localTx_transinflow_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.localTx.transinflow.transinflowClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = transinflowClient1.class.getResource("transinflow_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_transinflow_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = transinflowClient1.class.getResource("transinflow_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_transinflow_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_transinflow_servlet_vehicle_web, transinflowClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive localTx_transinflow_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_transinflow_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_transinflow_servlet_vehicle_ear.addAsModule(localTx_transinflow_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_transinflow_servlet_vehicle_ear, transinflowClient1.class, earResURL);
+        return localTx_transinflow_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testGetTransactionSupport() throws java.lang.Exception {
+            super.testGetTransactionSupport();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testSetResourceAdapterMethod() throws java.lang.Exception {
+            super.testSetResourceAdapterMethod();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testXATerminator() throws java.lang.Exception {
+            super.testXATerminator();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testTransactionSynchronizationRegistry() throws java.lang.Exception {
+            super.testTransactionSynchronizationRegistry();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConcurrentWorkXid() throws java.lang.Exception {
+            super.testConcurrentWorkXid();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientEjbTest.java
new file mode 100644
index 0000000000..0cc3f0bad7
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientEjbTest.java
@@ -0,0 +1,231 @@
+package com.sun.ts.tests.connector.localTx.workcontext;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class WorkContextClientEjbTest extends com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient {
+    static final String VEHICLE_ARCHIVE = "workcontext_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workcontext_ejb_vehicle: 
+        workcontext_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workcontext_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workcontext_jsp_vehicle: 
+        workcontext_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workcontext_servlet_vehicle: 
+        workcontext_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/workcontext/workcontext_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/workcontext/workcontext_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/workcontext/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive workcontext_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "workcontext_ejb_vehicle_client.jar");
+            // The class files
+            workcontext_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = WorkContextClient.class.getResource("workcontext_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              workcontext_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = WorkContextClient.class.getResource("workcontext_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              workcontext_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            workcontext_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(workcontext_ejb_vehicle_client, WorkContextClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive workcontext_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "workcontext_ejb_vehicle_ejb.jar");
+            // The class files
+            workcontext_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = WorkContextClient.class.getResource("workcontext_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              workcontext_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = WorkContextClient.class.getResource("workcontext_jsp_vehicle_web.war.sun-web.xml");
+            if(ejbResURL1 != null) {
+              workcontext_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(workcontext_ejb_vehicle_ejb, WorkContextClient.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive workcontext_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workcontext_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workcontext_ejb_vehicle_ear.addAsModule(workcontext_ejb_vehicle_ejb);
+            workcontext_ejb_vehicle_ear.addAsModule(workcontext_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workcontext_ejb_vehicle_ear, WorkContextClient.class, earResURL);
+        return workcontext_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testIsContextSupported() throws java.lang.Exception {
+            super.testIsContextSupported();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testSecurityContextExecSubject() throws java.lang.Exception {
+            super.testSecurityContextExecSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testSecurityContextServiceSubject() throws java.lang.Exception {
+            super.testSecurityContextServiceSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testSecurityContextCBH() throws java.lang.Exception {
+            super.testSecurityContextCBH();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkContextErrorCode() throws java.lang.Exception {
+            super.testWorkContextErrorCode();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkContextErrorCode2() throws java.lang.Exception {
+            super.testWorkContextErrorCode2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWorkContexts() throws java.lang.Exception {
+            super.testNestedWorkContexts();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWorkContexts2() throws java.lang.Exception {
+            super.testNestedWorkContexts2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWorkContexts3() throws java.lang.Exception {
+            super.testNestedWorkContexts3();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkContextProvider() throws java.lang.Exception {
+            super.testWorkContextProvider();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkContextNotifications() throws java.lang.Exception {
+            super.testWorkContextNotifications();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testHICNotifications() throws java.lang.Exception {
+            super.testHICNotifications();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientJspTest.java
new file mode 100644
index 0000000000..e8bbaecdb1
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientJspTest.java
@@ -0,0 +1,203 @@
+package com.sun.ts.tests.connector.localTx.workcontext;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class WorkContextClientJspTest extends com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient {
+    static final String VEHICLE_ARCHIVE = "workcontext_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workcontext_ejb_vehicle: 
+        workcontext_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workcontext_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workcontext_jsp_vehicle: 
+        workcontext_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workcontext_servlet_vehicle: 
+        workcontext_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/workcontext/workcontext_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/workcontext/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive workcontext_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "workcontext_jsp_vehicle_web.war");
+            // The class files
+            workcontext_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = WorkContextClient.class.getResource("workcontext_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              workcontext_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = WorkContextClient.class.getResource("workcontext_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              workcontext_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = WorkContextClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              workcontext_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = WorkContextClient.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              workcontext_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(workcontext_jsp_vehicle_web, WorkContextClient.class, warResURL);
+        // Ear
+            EnterpriseArchive workcontext_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workcontext_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workcontext_jsp_vehicle_ear.addAsModule(workcontext_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workcontext_jsp_vehicle_ear, WorkContextClient.class, earResURL);
+        return workcontext_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testIsContextSupported() throws java.lang.Exception {
+            super.testIsContextSupported();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testSecurityContextExecSubject() throws java.lang.Exception {
+            super.testSecurityContextExecSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testSecurityContextServiceSubject() throws java.lang.Exception {
+            super.testSecurityContextServiceSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testSecurityContextCBH() throws java.lang.Exception {
+            super.testSecurityContextCBH();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkContextErrorCode() throws java.lang.Exception {
+            super.testWorkContextErrorCode();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkContextErrorCode2() throws java.lang.Exception {
+            super.testWorkContextErrorCode2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWorkContexts() throws java.lang.Exception {
+            super.testNestedWorkContexts();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWorkContexts2() throws java.lang.Exception {
+            super.testNestedWorkContexts2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWorkContexts3() throws java.lang.Exception {
+            super.testNestedWorkContexts3();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkContextProvider() throws java.lang.Exception {
+            super.testWorkContextProvider();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkContextNotifications() throws java.lang.Exception {
+            super.testWorkContextNotifications();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testHICNotifications() throws java.lang.Exception {
+            super.testHICNotifications();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientServletTest.java
new file mode 100644
index 0000000000..502b3e0b86
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workcontext/WorkContextClientServletTest.java
@@ -0,0 +1,197 @@
+package com.sun.ts.tests.connector.localTx.workcontext;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class WorkContextClientServletTest extends com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient {
+    static final String VEHICLE_ARCHIVE = "workcontext_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workcontext_ejb_vehicle: 
+        workcontext_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workcontext_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workcontext_jsp_vehicle: 
+        workcontext_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workcontext_servlet_vehicle: 
+        workcontext_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/workcontext/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive workcontext_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "workcontext_servlet_vehicle_web.war");
+            // The class files
+            workcontext_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.localTx.workcontext.WorkContextClient.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = WorkContextClient.class.getResource("workcontext_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              workcontext_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = WorkContextClient.class.getResource("workcontext_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              workcontext_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(workcontext_servlet_vehicle_web, WorkContextClient.class, warResURL);
+
+
+
+        // Ear
+            EnterpriseArchive workcontext_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workcontext_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workcontext_servlet_vehicle_ear.addAsModule(workcontext_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workcontext_servlet_vehicle_ear, WorkContextClient.class, earResURL);
+        return workcontext_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testIsContextSupported() throws java.lang.Exception {
+            super.testIsContextSupported();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testSecurityContextExecSubject() throws java.lang.Exception {
+            super.testSecurityContextExecSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testSecurityContextServiceSubject() throws java.lang.Exception {
+            super.testSecurityContextServiceSubject();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testSecurityContextCBH() throws java.lang.Exception {
+            super.testSecurityContextCBH();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkContextErrorCode() throws java.lang.Exception {
+            super.testWorkContextErrorCode();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkContextErrorCode2() throws java.lang.Exception {
+            super.testWorkContextErrorCode2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWorkContexts() throws java.lang.Exception {
+            super.testNestedWorkContexts();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWorkContexts2() throws java.lang.Exception {
+            super.testNestedWorkContexts2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWorkContexts3() throws java.lang.Exception {
+            super.testNestedWorkContexts3();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkContextProvider() throws java.lang.Exception {
+            super.testWorkContextProvider();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkContextNotifications() throws java.lang.Exception {
+            super.testWorkContextNotifications();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testHICNotifications() throws java.lang.Exception {
+            super.testHICNotifications();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/ejb_vehicle.props b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/ejb_vehicle.props
index fd493476f3..339e460baf 100644
--- a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/ejb_vehicle.props
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/ejb_vehicle.props
@@ -4,7 +4,6 @@ ejbcount=1
 ejb0.name=com.sun.ts.tests.common.vehicle.ejb.EJBVehicle
 ejb0.type=session
 ejb0.remoteInterface=com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote
-ejb0.homeInterface=com.sun.ts.tests.common.vehicle.ejb.EJBVehicleHome
 ejb0.JNDIName=com_sun_ts_tests_common_vehicle_ejb_EJBVehicle
 ejb0.isReentrant=false
 ejb0.transactionAttribute=TX_REQUIRED
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1EjbTest.java
new file mode 100644
index 0000000000..e6679efbed
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1EjbTest.java
@@ -0,0 +1,202 @@
+package com.sun.ts.tests.connector.localTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1EjbTest extends com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_workmgt_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_workmgt_ejb_vehicle: 
+        localTx_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_workmgt_jsp_vehicle: 
+        localTx_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_workmgt_servlet_vehicle: 
+        localTx_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/localTx/workmgt/localTx_workmgt_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/localTx/workmgt/localTx_workmgt_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/localTx/workmgt/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive localTx_workmgt_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "localTx_workmgt_ejb_vehicle_client.jar");
+            // The class files
+            localTx_workmgt_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = workmgtClient1.class.getResource("localTx_workmgt_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              localTx_workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = workmgtClient1.class.getResource("localTx_workmgt_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              localTx_workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            localTx_workmgt_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(localTx_workmgt_ejb_vehicle_client, workmgtClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive localTx_workmgt_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "localTx_workmgt_ejb_vehicle_ejb.jar");
+            // The class files
+            localTx_workmgt_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = workmgtClient1.class.getResource("localTx_workmgt_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              localTx_workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = workmgtClient1.class.getResource("localTx_workmgt_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              localTx_workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(localTx_workmgt_ejb_vehicle_ejb, workmgtClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive localTx_workmgt_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_workmgt_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_workmgt_ejb_vehicle_ear.addAsModule(localTx_workmgt_ejb_vehicle_ejb);
+            localTx_workmgt_ejb_vehicle_ear.addAsModule(localTx_workmgt_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_workmgt_ejb_vehicle_ear, workmgtClient1.class, earResURL);
+        return localTx_workmgt_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1JspTest.java
new file mode 100644
index 0000000000..4f0ac513af
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1JspTest.java
@@ -0,0 +1,178 @@
+package com.sun.ts.tests.connector.localTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1JspTest extends com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_workmgt_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_workmgt_ejb_vehicle: 
+        localTx_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_workmgt_jsp_vehicle: 
+        localTx_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_workmgt_servlet_vehicle: 
+        localTx_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/workmgt/localTx_workmgt_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/localTx/workmgt/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_workmgt_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_workmgt_jsp_vehicle_web.war");
+            // The class files
+            localTx_workmgt_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("localTx_workmgt_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              localTx_workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("localTx_workmgt_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              localTx_workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              localTx_workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_workmgt_jsp_vehicle_web, workmgtClient1.class, warResURL);
+
+
+
+        // Ear
+            EnterpriseArchive localTx_workmgt_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_workmgt_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_workmgt_jsp_vehicle_ear.addAsModule(localTx_workmgt_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_workmgt_jsp_vehicle_ear, workmgtClient1.class, earResURL);
+        return localTx_workmgt_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1ServletTest.java
new file mode 100644
index 0000000000..63d865d9cb
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1ServletTest.java
@@ -0,0 +1,167 @@
+package com.sun.ts.tests.connector.localTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1ServletTest extends com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "localTx_workmgt_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        localTx_workmgt_ejb_vehicle: 
+        localTx_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        localTx_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        localTx_workmgt_jsp_vehicle: 
+        localTx_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        localTx_workmgt_servlet_vehicle: 
+        localTx_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/localTx/workmgt/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive localTx_workmgt_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "localTx_workmgt_servlet_vehicle_web.war");
+            // The class files
+            localTx_workmgt_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.localTx.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("localTx_workmgt_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              localTx_workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("localTx_workmgt_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              localTx_workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(localTx_workmgt_servlet_vehicle_web, workmgtClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive localTx_workmgt_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "localTx_workmgt_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            localTx_workmgt_servlet_vehicle_ear.addAsModule(localTx_workmgt_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(localTx_workmgt_servlet_vehicle_ear, workmgtClient1.class, earResURL);
+        return localTx_workmgt_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1EjbTest.java
new file mode 100644
index 0000000000..8d8dbac66e
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1EjbTest.java
@@ -0,0 +1,180 @@
+package com.sun.ts.tests.connector.noTx.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1EjbTest extends com.sun.ts.tests.connector.noTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "connection_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connection_ejb_vehicle: 
+        connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection_jsp_vehicle: 
+        connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection_servlet_vehicle: 
+        connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_appclient_vehicle: 
+        connection1_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle: 
+        connection1_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection1_jsp_vehicle: 
+        connection1_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_servlet_vehicle: 
+        connection1_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_appclient_vehicle: 
+        connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle: 
+        connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connectionfactorytests_jsp_vehicle: 
+        connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_servlet_vehicle: 
+        connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/noTx/connection/connection_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/noTx/connection/connection_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/noTx/connection/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive connection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "connection_ejb_vehicle_client.jar");
+            // The class files
+            connection_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = connectionClient1.class.getResource("connection_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              connection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = connectionClient1.class.getResource("connection_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              connection_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            connection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(connection_ejb_vehicle_client, connectionClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive connection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "connection_ejb_vehicle_ejb.jar");
+            // The class files
+            connection_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.noTx.connection.connectionClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = connectionClient1.class.getResource("connection_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              connection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = connectionClient1.class.getResource("connection_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              connection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(connection_ejb_vehicle_ejb, connectionClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive connection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connection_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connection_ejb_vehicle_ear.addAsModule(connection_ejb_vehicle_ejb);
+            connection_ejb_vehicle_ear.addAsModule(connection_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connection_ejb_vehicle_ear, connectionClient1.class, earResURL);
+        return connection_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1JspTest.java
new file mode 100644
index 0000000000..717b5210bb
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1JspTest.java
@@ -0,0 +1,153 @@
+package com.sun.ts.tests.connector.noTx.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1JspTest extends com.sun.ts.tests.connector.noTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "connection_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connection_ejb_vehicle: 
+        connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection_jsp_vehicle: 
+        connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection_servlet_vehicle: 
+        connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_appclient_vehicle: 
+        connection1_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle: 
+        connection1_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection1_jsp_vehicle: 
+        connection1_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_servlet_vehicle: 
+        connection1_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_appclient_vehicle: 
+        connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle: 
+        connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connectionfactorytests_jsp_vehicle: 
+        connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_servlet_vehicle: 
+        connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/connection/connection_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/noTx/connection/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive connection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "connection_jsp_vehicle_web.war");
+            // The class files
+            connection_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.connection.connectionClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("connection_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              connection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("connection_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              connection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              connection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              connection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(connection_jsp_vehicle_web, connectionClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive connection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connection_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connection_jsp_vehicle_ear.addAsModule(connection_jsp_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connection_jsp_vehicle_ear, connectionClient1.class, earResURL);
+        return connection_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1ServletTest.java
new file mode 100644
index 0000000000..acfc6974fe
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/connection/connectionClient1ServletTest.java
@@ -0,0 +1,142 @@
+package com.sun.ts.tests.connector.noTx.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1ServletTest extends com.sun.ts.tests.connector.noTx.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "connection_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        connection_ejb_vehicle: 
+        connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection_jsp_vehicle: 
+        connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection_servlet_vehicle: 
+        connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_appclient_vehicle: 
+        connection1_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle: 
+        connection1_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connection1_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connection1_jsp_vehicle: 
+        connection1_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connection1_servlet_vehicle: 
+        connection1_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_appclient_vehicle: 
+        connectionfactorytests_appclient_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle: 
+        connectionfactorytests_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        connectionfactorytests_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        connectionfactorytests_jsp_vehicle: 
+        connectionfactorytests_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        connectionfactorytests_servlet_vehicle: 
+        connectionfactorytests_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/connection/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive connection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "connection_servlet_vehicle_web.war");
+            // The class files
+            connection_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.connection.connectionClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("connection_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              connection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("connection_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              connection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(connection_servlet_vehicle_web, connectionClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive connection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "connection_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            connection_servlet_vehicle_ear.addAsModule(connection_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(connection_servlet_vehicle_ear, connectionClient1.class, earResURL);
+        return connection_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1EjbTest.java
new file mode 100644
index 0000000000..4c30024799
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1EjbTest.java
@@ -0,0 +1,155 @@
+package com.sun.ts.tests.connector.noTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1EjbTest extends com.sun.ts.tests.connector.noTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "event_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        event_ejb_vehicle: 
+        event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        event_jsp_vehicle: 
+        event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        event_servlet_vehicle: 
+        event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/noTx/event/event_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/noTx/event/event_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/noTx/event/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive event_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "event_ejb_vehicle_client.jar");
+            // The class files
+            event_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = eventClient1.class.getResource("event_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              event_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = eventClient1.class.getResource("event_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              event_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            event_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(event_ejb_vehicle_client, eventClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive event_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "event_ejb_vehicle_ejb.jar");
+            // The class files
+            event_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.noTx.event.eventClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = eventClient1.class.getResource("event_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = eventClient1.class.getResource("event_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(event_ejb_vehicle_ejb, eventClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive event_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "event_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            event_ejb_vehicle_ear.addAsModule(event_ejb_vehicle_ejb);
+            event_ejb_vehicle_ear.addAsModule(event_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(event_ejb_vehicle_ear, eventClient1.class, earResURL);
+        return event_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1JspTest.java
new file mode 100644
index 0000000000..ed6a6780dc
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1JspTest.java
@@ -0,0 +1,128 @@
+package com.sun.ts.tests.connector.noTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1JspTest extends com.sun.ts.tests.connector.noTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "event_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        event_ejb_vehicle: 
+        event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        event_jsp_vehicle: 
+        event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        event_servlet_vehicle: 
+        event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/event/event_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/noTx/event/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive event_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "event_jsp_vehicle_web.war");
+            // The class files
+            event_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("event_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              event_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("event_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              event_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              event_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              event_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(event_jsp_vehicle_web, eventClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive event_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "event_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            event_jsp_vehicle_ear.addAsModule(event_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(event_jsp_vehicle_ear, eventClient1.class, earResURL);
+        return event_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1ServletTest.java
new file mode 100644
index 0000000000..cd33c4f372
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/event/eventClient1ServletTest.java
@@ -0,0 +1,118 @@
+package com.sun.ts.tests.connector.noTx.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1ServletTest extends com.sun.ts.tests.connector.noTx.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "event_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        event_ejb_vehicle: 
+        event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        event_jsp_vehicle: 
+        event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        event_servlet_vehicle: 
+        event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/event/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive event_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "event_servlet_vehicle_web.war");
+            // The class files
+            event_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("event_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              event_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("event_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              event_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(event_servlet_vehicle_web, eventClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive event_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "event_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            event_servlet_vehicle_ear.addAsModule(event_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(event_servlet_vehicle_ear, eventClient1.class, earResURL);
+        return event_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1EjbTest.java
new file mode 100644
index 0000000000..9e2f115802
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1EjbTest.java
@@ -0,0 +1,196 @@
+package com.sun.ts.tests.connector.noTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1EjbTest extends com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "lifecycle_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        lifecycle_ejb_vehicle: 
+        lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        lifecycle_jsp_vehicle: 
+        lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        lifecycle_servlet_vehicle: 
+        lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/noTx/lifecycle/lifecycle_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/noTx/lifecycle/lifecycle_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/noTx/lifecycle/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive lifecycle_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "lifecycle_ejb_vehicle_client.jar");
+            // The class files
+            lifecycle_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = lifecycleClient1.class.getResource("lifecycle_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = lifecycleClient1.class.getResource("lifecycle_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            lifecycle_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(lifecycle_ejb_vehicle_client, lifecycleClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive lifecycle_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "lifecycle_ejb_vehicle_ejb.jar");
+            // The class files
+            lifecycle_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = lifecycleClient1.class.getResource("/ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = lifecycleClient1.class.getResource("/ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(lifecycle_ejb_vehicle_ejb, lifecycleClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive lifecycle_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "lifecycle_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            lifecycle_ejb_vehicle_ear.addAsModule(lifecycle_ejb_vehicle_ejb);
+            lifecycle_ejb_vehicle_ear.addAsModule(lifecycle_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(lifecycle_ejb_vehicle_ear, lifecycleClient1.class, earResURL);
+        return lifecycle_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1JspTest.java
new file mode 100644
index 0000000000..8563a3b3fc
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1JspTest.java
@@ -0,0 +1,165 @@
+package com.sun.ts.tests.connector.noTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1JspTest extends com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "lifecycle_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        lifecycle_ejb_vehicle: 
+        lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        lifecycle_jsp_vehicle: 
+        lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        lifecycle_servlet_vehicle: 
+        lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/lifecycle/lifecycle_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/noTx/lifecycle/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive lifecycle_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "lifecycle_jsp_vehicle_web.war");
+            // The class files
+            lifecycle_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("lifecycle_jsp_vehicle_web.xml");
+            lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("lifecycle_jsp_vehicle_web.war.sun-web.xml");
+            lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(lifecycle_jsp_vehicle_web, lifecycleClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive lifecycle_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "lifecycle_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            lifecycle_jsp_vehicle_ear.addAsModule(lifecycle_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(lifecycle_jsp_vehicle_ear, lifecycleClient1.class, earResURL);
+        return lifecycle_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1ServletTest.java
new file mode 100644
index 0000000000..fc3cc5fd80
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1ServletTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.connector.noTx.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1ServletTest extends com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "lifecycle_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        lifecycle_ejb_vehicle: 
+        lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        lifecycle_jsp_vehicle: 
+        lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        lifecycle_servlet_vehicle: 
+        lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/lifecycle/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive lifecycle_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "lifecycle_servlet_vehicle_web.war");
+            // The class files
+            lifecycle_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.connector.noTx.lifecycle.lifecycleClient1.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("lifecycle_servlet_vehicle_servlet.xml");
+            lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("lifecycle_servlet_vehicle_web.war.sun-web.xml");
+            lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(lifecycle_servlet_vehicle_web, lifecycleClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive lifecycle_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "lifecycle_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            lifecycle_servlet_vehicle_ear.addAsModule(lifecycle_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(lifecycle_servlet_vehicle_ear, lifecycleClient1.class, earResURL);
+        return lifecycle_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1EjbTest.java
new file mode 100644
index 0000000000..c6042007cc
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1EjbTest.java
@@ -0,0 +1,174 @@
+package com.sun.ts.tests.connector.noTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1EjbTest extends com.sun.ts.tests.connector.noTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "security_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        security_ejb_vehicle: 
+        security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        security_jsp_vehicle: 
+        security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        security_servlet_vehicle: 
+        security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/noTx/security/security_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/noTx/security/security_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/noTx/security/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive security_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "security_ejb_vehicle_client.jar");
+            // The class files
+            security_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = securityClient1.class.getResource("security_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              security_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = securityClient1.class.getResource("security_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              security_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            security_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(security_ejb_vehicle_client, securityClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive security_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "security_ejb_vehicle_ejb.jar");
+            // The class files
+            security_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.noTx.security.securityClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = securityClient1.class.getResource("security_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = securityClient1.class.getResource("security_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(security_ejb_vehicle_ejb, securityClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive security_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "security_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            security_ejb_vehicle_ear.addAsModule(security_ejb_vehicle_ejb);
+            security_ejb_vehicle_ear.addAsModule(security_ejb_vehicle_client);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(security_ejb_vehicle_ear, securityClient1.class, earResURL);
+        return security_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1JspTest.java
new file mode 100644
index 0000000000..9ef2459a0d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1JspTest.java
@@ -0,0 +1,151 @@
+package com.sun.ts.tests.connector.noTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1JspTest extends com.sun.ts.tests.connector.noTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "security_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        security_ejb_vehicle: 
+        security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        security_jsp_vehicle: 
+        security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        security_servlet_vehicle: 
+        security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/security/security_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/noTx/security/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive security_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "security_jsp_vehicle_web.war");
+            // The class files
+            security_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.security.securityClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("transinflow_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              security_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("transinflow_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              security_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              security_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              security_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(security_jsp_vehicle_web, securityClient1.class, warResURL);
+
+
+
+        // Ear
+            EnterpriseArchive security_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "security_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            security_jsp_vehicle_ear.addAsModule(security_jsp_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(security_jsp_vehicle_ear, securityClient1.class, earResURL);
+        return security_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1ServletTest.java
new file mode 100644
index 0000000000..ef3457492c
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/security/securityClient1ServletTest.java
@@ -0,0 +1,140 @@
+package com.sun.ts.tests.connector.noTx.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1ServletTest extends com.sun.ts.tests.connector.noTx.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "security_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        security_ejb_vehicle: 
+        security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        security_jsp_vehicle: 
+        security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        security_servlet_vehicle: 
+        security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/security/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive security_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "security_servlet_vehicle_web.war");
+            // The class files
+            security_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.noTx.security.securityClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("security_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              security_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("security_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              security_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(security_servlet_vehicle_web, securityClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive security_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "security_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            security_servlet_vehicle_ear.addAsModule(security_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(security_servlet_vehicle_ear, securityClient1.class, earResURL);
+        return security_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1EjbTest.java
new file mode 100644
index 0000000000..577faefb0b
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1EjbTest.java
@@ -0,0 +1,200 @@
+package com.sun.ts.tests.connector.noTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1EjbTest extends com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "workmgt_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workmgt_ejb_vehicle: 
+        workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workmgt_jsp_vehicle: 
+        workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workmgt_servlet_vehicle: 
+        workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/noTx/workmgt/workmgt_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/noTx/workmgt/workmgt_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/noTx/workmgt/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive workmgt_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "workmgt_ejb_vehicle_client.jar");
+            // The class files
+            workmgt_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = workmgtClient1.class.getResource("workmgt_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = workmgtClient1.class.getResource("workmgt_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            workmgt_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(workmgt_ejb_vehicle_client, workmgtClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive workmgt_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "workmgt_ejb_vehicle_ejb.jar");
+            // The class files
+            workmgt_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = workmgtClient1.class.getResource("workmgt_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = workmgtClient1.class.getResource("workmgt_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(workmgt_ejb_vehicle_ejb, workmgtClient1.class, ejbResURL1);
+        // Ear
+            EnterpriseArchive workmgt_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workmgt_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workmgt_ejb_vehicle_ear.addAsModule(workmgt_ejb_vehicle_ejb);
+            workmgt_ejb_vehicle_ear.addAsModule(workmgt_ejb_vehicle_client);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workmgt_ejb_vehicle_ear, workmgtClient1.class, earResURL);
+        return workmgt_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1JspTest.java
new file mode 100644
index 0000000000..c1ddd22921
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1JspTest.java
@@ -0,0 +1,176 @@
+package com.sun.ts.tests.connector.noTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1JspTest extends com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "workmgt_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workmgt_ejb_vehicle: 
+        workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workmgt_jsp_vehicle: 
+        workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workmgt_servlet_vehicle: 
+        workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/workmgt/workmgt_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/noTx/workmgt/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive workmgt_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "workmgt_jsp_vehicle_web.war");
+            // The class files
+            workmgt_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("workmgt_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("workmgt_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(workmgt_jsp_vehicle_web, workmgtClient1.class, warResURL);
+        // Ear
+            EnterpriseArchive workmgt_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workmgt_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workmgt_jsp_vehicle_ear.addAsModule(workmgt_jsp_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workmgt_jsp_vehicle_ear, workmgtClient1.class, earResURL);
+        return workmgt_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1ServletTest.java
new file mode 100644
index 0000000000..431141c380
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1ServletTest.java
@@ -0,0 +1,165 @@
+package com.sun.ts.tests.connector.noTx.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1ServletTest extends com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "workmgt_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        workmgt_ejb_vehicle: 
+        workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        workmgt_jsp_vehicle: 
+        workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        workmgt_servlet_vehicle: 
+        workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/noTx/workmgt/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive workmgt_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "workmgt_servlet_vehicle_web.war");
+            // The class files
+            workmgt_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.connector.noTx.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("workmgt_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("workmgt_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(workmgt_servlet_vehicle_web, workmgtClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive workmgt_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "workmgt_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            workmgt_servlet_vehicle_ear.addAsModule(workmgt_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(workmgt_servlet_vehicle_ear, workmgtClient1.class, earResURL);
+        return workmgt_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientEjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientEjbTest.java
new file mode 100644
index 0000000000..c997ee8005
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientEjbTest.java
@@ -0,0 +1,177 @@
+package com.sun.ts.tests.connector.permissiondd;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientEjbTest extends com.sun.ts.tests.connector.permissiondd.Client {
+    static final String VEHICLE_ARCHIVE = "permissiondd_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        permissiondd_ejb_vehicle: 
+        permissiondd_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        permissiondd_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        permissiondd_jsp_vehicle: 
+        permissiondd_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        permissiondd_servlet_vehicle: 
+        permissiondd_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/permissiondd/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive permissiondd_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "permissiondd_ejb_vehicle_client.jar");
+            // The class files
+            permissiondd_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml");
+            if(resURL != null) {
+              permissiondd_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = Client.class.getResource("permissiondd_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              permissiondd_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            permissiondd_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(permissiondd_ejb_vehicle_client, Client.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive permissiondd_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "permissiondd_ejb_vehicle_ejb.jar");
+            // The class files
+            permissiondd_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.tests.connector.permissiondd.Client.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = Client.class.getResource("ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              permissiondd_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = Client.class.getResource("permissiondd_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              permissiondd_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(permissiondd_ejb_vehicle_ejb, Client.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive permissiondd_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "permissiondd_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            permissiondd_ejb_vehicle_ear.addAsModule(permissiondd_ejb_vehicle_ejb);
+            permissiondd_ejb_vehicle_ear.addAsModule(permissiondd_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(permissiondd_ejb_vehicle_ear, Client.class, earResURL);
+        return permissiondd_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testValidateCustomPerm() throws java.lang.Exception {
+            super.testValidateCustomPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testValidateRequiredPermSet() throws java.lang.Exception {
+            super.testValidateRequiredPermSet();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testValidateMissingPermFails() throws java.lang.Exception {
+            super.testValidateMissingPermFails();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testValidateRestrictedLocalPerm() throws java.lang.Exception {
+            super.testValidateRestrictedLocalPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testValidateLocalPermsInvalidName() throws java.lang.Exception {
+            super.testValidateLocalPermsInvalidName();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientJspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientJspTest.java
new file mode 100644
index 0000000000..246b3ba2e7
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientJspTest.java
@@ -0,0 +1,150 @@
+package com.sun.ts.tests.connector.permissiondd;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientJspTest extends com.sun.ts.tests.connector.permissiondd.Client {
+    static final String VEHICLE_ARCHIVE = "permissiondd_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        permissiondd_ejb_vehicle: 
+        permissiondd_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        permissiondd_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        permissiondd_jsp_vehicle: 
+        permissiondd_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        permissiondd_servlet_vehicle: 
+        permissiondd_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/permissiondd/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive permissiondd_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "permissiondd_jsp_vehicle_web.war");
+            // The class files
+            permissiondd_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.permissiondd.Client.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              permissiondd_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("permissiondd_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              permissiondd_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              permissiondd_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              permissiondd_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(permissiondd_jsp_vehicle_web, Client.class, warResURL);
+
+        // Ear
+            EnterpriseArchive permissiondd_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "permissiondd_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            permissiondd_jsp_vehicle_ear.addAsModule(permissiondd_jsp_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(permissiondd_jsp_vehicle_ear, Client.class, earResURL);
+        return permissiondd_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testValidateCustomPerm() throws java.lang.Exception {
+            super.testValidateCustomPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testValidateRequiredPermSet() throws java.lang.Exception {
+            super.testValidateRequiredPermSet();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testValidateMissingPermFails() throws java.lang.Exception {
+            super.testValidateMissingPermFails();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testValidateRestrictedLocalPerm() throws java.lang.Exception {
+            super.testValidateRestrictedLocalPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testValidateLocalPermsInvalidName() throws java.lang.Exception {
+            super.testValidateLocalPermsInvalidName();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientServletTest.java
new file mode 100644
index 0000000000..aac3434369
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/permissiondd/ClientServletTest.java
@@ -0,0 +1,140 @@
+package com.sun.ts.tests.connector.permissiondd;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientServletTest extends com.sun.ts.tests.connector.permissiondd.Client {
+    static final String VEHICLE_ARCHIVE = "permissiondd_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        permissiondd_ejb_vehicle: 
+        permissiondd_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        permissiondd_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        permissiondd_jsp_vehicle: 
+        permissiondd_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        permissiondd_servlet_vehicle: 
+        permissiondd_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/permissiondd/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive permissiondd_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "permissiondd_servlet_vehicle_web.war");
+            // The class files
+            permissiondd_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.tests.connector.permissiondd.Client.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("servlet_vehicle_web.xml");
+            if(warResURL != null) {
+              permissiondd_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("permissiondd_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              permissiondd_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+           // Call the archive processor
+           archiveProcessor.processWebArchive(permissiondd_servlet_vehicle_web, Client.class, warResURL);
+
+        // Ear
+            EnterpriseArchive permissiondd_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "permissiondd_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            permissiondd_servlet_vehicle_ear.addAsModule(permissiondd_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(permissiondd_servlet_vehicle_ear, Client.class, earResURL);
+        return permissiondd_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testValidateCustomPerm() throws java.lang.Exception {
+            super.testValidateCustomPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testValidateRequiredPermSet() throws java.lang.Exception {
+            super.testValidateRequiredPermSet();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testValidateMissingPermFails() throws java.lang.Exception {
+            super.testValidateMissingPermFails();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testValidateRestrictedLocalPerm() throws java.lang.Exception {
+            super.testValidateRestrictedLocalPerm();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testValidateLocalPermsInvalidName() throws java.lang.Exception {
+            super.testValidateLocalPermsInvalidName();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/ejb/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/ejb/ClientTest.java
new file mode 100644
index 0000000000..e57b4b4189
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/ejb/ClientTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.connector.resourceDefs.ejb;
+
+import com.sun.ts.tests.connector.resourceDefs.ejb.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("platform")
+@Tag("connector_resourcedef_ejb_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.resourceDefs.ejb.Client {
+    /**
+        EE10 Deployment Descriptors:
+        conn_resourcedefs: META-INF/application.xml
+        conn_resourcedefs_ejb: 
+        conn_resourcedefs_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/resourceDefs/ejb/conn_resourcedefs_web.xml
+        /com/sun/ts/tests/connector/resourceDefs/ejb/conn_resourcedefs_web.war.sun-web.xml
+        Rar:
+
+        Ear:
+
+        /com/sun/ts/tests/connector/resourceDefs/ejb/application.xml
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = "conn_resourcedefs", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive conn_resourcedefs_web = ShrinkWrap.create(WebArchive.class, "conn_resourcedefs_web.war");
+            // The class files
+            conn_resourcedefs_web.addClasses(
+            com.sun.ts.tests.connector.resourceDefs.ejb.CRDTestServlet.class,
+            com.sun.ts.tests.connector.resourceDefs.ejb.Client.class,
+            com.sun.ts.tests.connector.resourceDefs.ejb.AODTestServlet.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("conn_resourcedefs_web.xml");
+            if(warResURL != null) {
+              conn_resourcedefs_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("conn_resourcedefs_web.war.sun-web.xml");
+            if(warResURL != null) {
+              conn_resourcedefs_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = Client.class.getResource("/com/sun/ts/tests/connector/resourceDefs/ejb/conn_resourcedefs_web.xml");
+            if(warResURL != null) {
+              conn_resourcedefs_web.addAsWebResource(warResURL, "//conn_resourcedefs_web.xml");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(conn_resourcedefs_web, Client.class, warResURL);
+
+        // Ear
+            EnterpriseArchive conn_resourcedefs_ear = ShrinkWrap.create(EnterpriseArchive.class, "conn_resourcedefs.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            conn_resourcedefs_ear.addAsModule(conn_resourcedefs_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = Client.class.getResource("/com/sun/ts/tests/connector/resourceDefs/ejb/application.xml");
+            if(earResURL != null) {
+              conn_resourcedefs_ear.addAsManifestResource(earResURL, "application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(conn_resourcedefs_ear, Client.class, null);
+        return conn_resourcedefs_ear;
+        }
+
+        @Test
+        @Override
+        public void ValidateGlobalResourceDef() throws java.lang.Exception {
+            super.ValidateGlobalResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateAppResourceDef() throws java.lang.Exception {
+            super.ValidateAppResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateModuleResourceDef() throws java.lang.Exception {
+            super.ValidateModuleResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateCompResourceDef() throws java.lang.Exception {
+            super.ValidateCompResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateGlobalAdminObj() throws java.lang.Exception {
+            super.ValidateGlobalAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateAppAdminObj() throws java.lang.Exception {
+            super.ValidateAppAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateModuleAdminObj() throws java.lang.Exception {
+            super.ValidateModuleAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateCompAdminObj() throws java.lang.Exception {
+            super.ValidateCompAdminObj();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/servlet/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/servlet/ClientTest.java
new file mode 100644
index 0000000000..57a6cf8138
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/resourceDefs/servlet/ClientTest.java
@@ -0,0 +1,155 @@
+package com.sun.ts.tests.connector.resourceDefs.servlet;
+
+import com.sun.ts.tests.connector.resourceDefs.servlet.Client;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("platform")
+@Tag("connector_resourcedef_servlet_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.resourceDefs.servlet.Client {
+    /**
+        EE10 Deployment Descriptors:
+        servlet_resourcedefs: ear.sun-application.xml
+        servlet_resourcedefs_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/resourceDefs/servlet/servlet_resourcedefs_web.xml
+        /com/sun/ts/tests/connector/resourceDefs/servlet/servlet_resourcedefs_web.war.sun-web.xml
+        Rar:
+
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = "servlet_resourcedefs", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive servlet_resourcedefs_web = ShrinkWrap.create(WebArchive.class, "servlet_resourcedefs_web.war");
+            // The class files
+            servlet_resourcedefs_web.addClasses(
+            com.sun.ts.tests.connector.resourceDefs.servlet.CRDTestServlet.class,
+            com.sun.ts.tests.connector.resourceDefs.servlet.Client.class,
+            com.sun.ts.tests.connector.resourceDefs.servlet.AODTestServlet.class
+            );
+            // The web.xml descriptor
+            URL warResURL = Client.class.getResource("servlet_resourcedefs_web.xml");
+            if(warResURL != null) {
+              servlet_resourcedefs_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = Client.class.getResource("servlet_resourcedefs_web.war.sun-web.xml");
+            if(warResURL != null) {
+              servlet_resourcedefs_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = Client.class.getResource("/com/sun/ts/tests/connector/resourceDefs/servlet/servlet_resourcedefs_web.xml");
+            if(warResURL != null) {
+              servlet_resourcedefs_web.addAsWebResource(warResURL, "//servlet_resourcedefs_web.xml");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(servlet_resourcedefs_web, Client.class, warResURL);
+
+        // Ear
+            EnterpriseArchive servlet_resourcedefs_ear = ShrinkWrap.create(EnterpriseArchive.class, "servlet_resourcedefs.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            servlet_resourcedefs_ear.addAsModule(servlet_resourcedefs_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = Client.class.getResource("servlet_resourcedefs.ear.sun-application.xml");
+            if(earResURL != null) {
+              servlet_resourcedefs_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(servlet_resourcedefs_ear, Client.class, earResURL);
+        return servlet_resourcedefs_ear;
+        }
+
+        @Test
+        @Override
+        public void ValidateGlobalResourceDef() throws java.lang.Exception {
+            super.ValidateGlobalResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateAppResourceDef() throws java.lang.Exception {
+            super.ValidateAppResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateModuleResourceDef() throws java.lang.Exception {
+            super.ValidateModuleResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateCompResourceDef() throws java.lang.Exception {
+            super.ValidateCompResourceDef();
+        }
+
+        @Test
+        @Override
+        public void ValidateGlobalAdminObj() throws java.lang.Exception {
+            super.ValidateGlobalAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateAppAdminObj() throws java.lang.Exception {
+            super.ValidateAppAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateModuleAdminObj() throws java.lang.Exception {
+            super.ValidateModuleAdminObj();
+        }
+
+        @Test
+        @Override
+        public void ValidateCompAdminObj() throws java.lang.Exception {
+            super.ValidateCompAdminObj();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1EjbTest.java
new file mode 100644
index 0000000000..34ffa14b9a
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1EjbTest.java
@@ -0,0 +1,161 @@
+package com.sun.ts.tests.connector.xa.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1EjbTest extends com.sun.ts.tests.connector.xa.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_connection_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_connection_ejb_vehicle: 
+        xa_connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_connection_jsp_vehicle: 
+        xa_connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_connection_servlet_vehicle: 
+        xa_connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/connection/xa_connection_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/connection/xa_connection_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/xa/connection/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive xa_connection_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "xa_connection_ejb_vehicle_client.jar");
+            // The class files
+            xa_connection_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = connectionClient1.class.getResource("xa_connection_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              xa_connection_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = connectionClient1.class.getResource("xa_connection_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              xa_connection_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            xa_connection_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(xa_connection_ejb_vehicle_client, connectionClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive xa_connection_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "xa_connection_ejb_vehicle_ejb.jar");
+            // The class files
+            xa_connection_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.xa.connection.connectionClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = connectionClient1.class.getResource("xa_connection_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              xa_connection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = connectionClient1.class.getResource("xa_connection_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              xa_connection_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(xa_connection_ejb_vehicle_ejb, connectionClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive xa_connection_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_connection_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_connection_ejb_vehicle_ear.addAsModule(xa_connection_ejb_vehicle_ejb);
+            xa_connection_ejb_vehicle_ear.addAsModule(xa_connection_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_connection_ejb_vehicle_ear, connectionClient1.class, earResURL);
+        return xa_connection_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1JspTest.java
new file mode 100644
index 0000000000..bee1d3ab43
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1JspTest.java
@@ -0,0 +1,134 @@
+package com.sun.ts.tests.connector.xa.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1JspTest extends com.sun.ts.tests.connector.xa.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_connection_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_connection_ejb_vehicle: 
+        xa_connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_connection_jsp_vehicle: 
+        xa_connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_connection_servlet_vehicle: 
+        xa_connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/connection/xa_connection_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/xa/connection/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_connection_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_connection_jsp_vehicle_web.war");
+            // The class files
+            xa_connection_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.connection.connectionClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("xa_connection_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              xa_connection_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("xa_connection_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_connection_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              xa_connection_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = connectionClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              xa_connection_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_connection_jsp_vehicle_web, connectionClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_connection_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_connection_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_connection_jsp_vehicle_ear.addAsModule(xa_connection_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_connection_jsp_vehicle_ear, connectionClient1.class, earResURL);
+        return xa_connection_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1ServletTest.java
new file mode 100644
index 0000000000..4f1ab503c9
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/connection/connectionClient1ServletTest.java
@@ -0,0 +1,125 @@
+package com.sun.ts.tests.connector.xa.connection;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class connectionClient1ServletTest extends com.sun.ts.tests.connector.xa.connection.connectionClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_connection_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_connection_ejb_vehicle: 
+        xa_connection_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_connection_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_connection_jsp_vehicle: 
+        xa_connection_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_connection_servlet_vehicle: 
+        xa_connection_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/connection/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_connection_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_connection_servlet_vehicle_web.war");
+            // The class files
+            xa_connection_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.connection.connectionClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = connectionClient1.class.getResource("xa_connection_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              xa_connection_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = connectionClient1.class.getResource("xa_connection_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_connection_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_connection_servlet_vehicle_web, connectionClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_connection_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_connection_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_connection_servlet_vehicle_ear.addAsModule(xa_connection_servlet_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_connection_servlet_vehicle_ear, connectionClient1.class, earResURL);
+        return xa_connection_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testGetConnection1() throws java.lang.Exception {
+            super.testGetConnection1();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testgetConnectionWithParameter1() throws java.lang.Exception {
+            super.testgetConnectionWithParameter1();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1EjbTest.java
new file mode 100644
index 0000000000..88da475def
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1EjbTest.java
@@ -0,0 +1,154 @@
+package com.sun.ts.tests.connector.xa.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1EjbTest extends com.sun.ts.tests.connector.xa.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_event_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_event_ejb_vehicle: 
+        xa_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_event_jsp_vehicle: 
+        xa_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_event_servlet_vehicle: 
+        xa_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/event/xa_event_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/event/xa_event_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/xa/event/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive xa_event_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "xa_event_ejb_vehicle_client.jar");
+            // The class files
+            xa_event_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = eventClient1.class.getResource("xa_event_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              xa_event_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = eventClient1.class.getResource("xa_event_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              xa_event_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            xa_event_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(xa_event_ejb_vehicle_client, eventClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive xa_event_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "xa_event_ejb_vehicle_ejb.jar");
+            // The class files
+            xa_event_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.xa.event.eventClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = eventClient1.class.getResource("xa_event_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              xa_event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = eventClient1.class.getResource("xa_event_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              xa_event_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(xa_event_ejb_vehicle_ejb, eventClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive xa_event_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_event_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_event_ejb_vehicle_ear.addAsModule(xa_event_ejb_vehicle_ejb);
+            xa_event_ejb_vehicle_ear.addAsModule(xa_event_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_event_ejb_vehicle_ear, eventClient1.class, earResURL);
+        return xa_event_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1JspTest.java
new file mode 100644
index 0000000000..e882d3caaa
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1JspTest.java
@@ -0,0 +1,127 @@
+package com.sun.ts.tests.connector.xa.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1JspTest extends com.sun.ts.tests.connector.xa.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_event_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_event_ejb_vehicle: 
+        xa_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_event_jsp_vehicle: 
+        xa_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_event_servlet_vehicle: 
+        xa_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/event/xa_event_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/xa/event/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_event_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_event_jsp_vehicle_web.war");
+            // The class files
+            xa_event_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("xa_event_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              xa_event_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("xa_event_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_event_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              xa_event_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = eventClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              xa_event_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_event_jsp_vehicle_web, eventClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_event_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_event_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_event_jsp_vehicle_ear.addAsModule(xa_event_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_event_jsp_vehicle_ear, eventClient1.class, earResURL);
+        return xa_event_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1ServletTest.java
new file mode 100644
index 0000000000..a7249425b4
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/event/eventClient1ServletTest.java
@@ -0,0 +1,117 @@
+package com.sun.ts.tests.connector.xa.event;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class eventClient1ServletTest extends com.sun.ts.tests.connector.xa.event.eventClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_event_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_event_ejb_vehicle: 
+        xa_event_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_event_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_event_jsp_vehicle: 
+        xa_event_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_event_servlet_vehicle: 
+        xa_event_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/event/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_event_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_event_servlet_vehicle_web.war");
+            // The class files
+            xa_event_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.event.eventClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = eventClient1.class.getResource("xa_event_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              xa_event_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = eventClient1.class.getResource("xa_event_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_event_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_event_servlet_vehicle_web, eventClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_event_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_event_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_event_servlet_vehicle_ear.addAsModule(xa_event_servlet_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_event_servlet_vehicle_ear, eventClient1.class, earResURL);
+        return xa_event_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnectionEventListener() throws java.lang.Exception {
+            super.testConnectionEventListener();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1EjbTest.java
new file mode 100644
index 0000000000..036c8d7ced
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1EjbTest.java
@@ -0,0 +1,196 @@
+package com.sun.ts.tests.connector.xa.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1EjbTest extends com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_lifecycle_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_lifecycle_ejb_vehicle: 
+        xa_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_lifecycle_jsp_vehicle: 
+        xa_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_lifecycle_servlet_vehicle: 
+        xa_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/lifecycle/xa_lifecycle_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/lifecycle/xa_lifecycle_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/xa/lifecycle/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive xa_lifecycle_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "xa_lifecycle_ejb_vehicle_client.jar");
+            // The class files
+            xa_lifecycle_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = lifecycleClient1.class.getResource("xa_lifecycle_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              xa_lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = lifecycleClient1.class.getResource("xa_lifecycle_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              xa_lifecycle_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            xa_lifecycle_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(xa_lifecycle_ejb_vehicle_client, lifecycleClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive xa_lifecycle_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "xa_lifecycle_ejb_vehicle_ejb.jar");
+            // The class files
+            xa_lifecycle_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = lifecycleClient1.class.getResource("xa_lifecycle_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              xa_lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = lifecycleClient1.class.getResource("xa_lifecycle_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              xa_lifecycle_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(xa_lifecycle_ejb_vehicle_ejb, lifecycleClient1.class, ejbResURL1);
+
+        // Ear
+            EnterpriseArchive xa_lifecycle_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_lifecycle_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_lifecycle_ejb_vehicle_ear.addAsModule(xa_lifecycle_ejb_vehicle_ejb);
+            xa_lifecycle_ejb_vehicle_ear.addAsModule(xa_lifecycle_ejb_vehicle_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_lifecycle_ejb_vehicle_ear, lifecycleClient1.class, earResURL);
+        return xa_lifecycle_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1JspTest.java
new file mode 100644
index 0000000000..59115b59dc
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1JspTest.java
@@ -0,0 +1,169 @@
+package com.sun.ts.tests.connector.xa.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1JspTest extends com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_lifecycle_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_lifecycle_ejb_vehicle: 
+        xa_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_lifecycle_jsp_vehicle: 
+        xa_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_lifecycle_servlet_vehicle: 
+        xa_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/lifecycle/xa_lifecycle_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/xa/lifecycle/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_lifecycle_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_lifecycle_jsp_vehicle_web.war");
+            // The class files
+            xa_lifecycle_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("xa_lifecycle_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              xa_lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("xa_lifecycle_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_lifecycle_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              xa_lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = lifecycleClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              xa_lifecycle_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_lifecycle_jsp_vehicle_web, lifecycleClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_lifecycle_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_lifecycle_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_lifecycle_jsp_vehicle_ear.addAsModule(xa_lifecycle_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_lifecycle_jsp_vehicle_ear, lifecycleClient1.class, earResURL);
+        return xa_lifecycle_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1ServletTest.java
new file mode 100644
index 0000000000..93f6104d3a
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1ServletTest.java
@@ -0,0 +1,159 @@
+package com.sun.ts.tests.connector.xa.lifecycle;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class lifecycleClient1ServletTest extends com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_lifecycle_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_lifecycle_ejb_vehicle: 
+        xa_lifecycle_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_lifecycle_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_lifecycle_jsp_vehicle: 
+        xa_lifecycle_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_lifecycle_servlet_vehicle: 
+        xa_lifecycle_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/lifecycle/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_lifecycle_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_lifecycle_servlet_vehicle_web.war");
+            // The class files
+            xa_lifecycle_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.lifecycle.lifecycleClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = lifecycleClient1.class.getResource("xa_lifecycle_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              xa_lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = lifecycleClient1.class.getResource("xa_lifecycle_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_lifecycle_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_lifecycle_servlet_vehicle_web, lifecycleClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive xa_lifecycle_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_lifecycle_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_lifecycle_servlet_vehicle_ear.addAsModule(xa_lifecycle_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_lifecycle_servlet_vehicle_ear, lifecycleClient1.class, earResURL);
+        return xa_lifecycle_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA() throws java.lang.Exception {
+            super.testAssociationMCFandRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAssociationMCFandRA2() throws java.lang.Exception {
+            super.testAssociationMCFandRA2();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testBootstrapforNull() throws java.lang.Exception {
+            super.testBootstrapforNull();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testInstantiationOfRA() throws java.lang.Exception {
+            super.testInstantiationOfRA();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRASharability() throws java.lang.Exception {
+            super.testRASharability();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testMCFcalledOnce() throws java.lang.Exception {
+            super.testMCFcalledOnce();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testRAforJavaBean() throws java.lang.Exception {
+            super.testRAforJavaBean();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1EjbTest.java
new file mode 100644
index 0000000000..cc627a936d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1EjbTest.java
@@ -0,0 +1,175 @@
+package com.sun.ts.tests.connector.xa.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1EjbTest extends com.sun.ts.tests.connector.xa.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_security_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_security_ejb_vehicle: 
+        xa_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_security_jsp_vehicle: 
+        xa_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_security_servlet_vehicle: 
+        xa_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/security/xa_security_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/security/xa_security_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/xa/security/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive xa_security_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "xa_security_ejb_vehicle_client.jar");
+            // The class files
+            xa_security_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = securityClient1.class.getResource("xa_security_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              xa_security_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = securityClient1.class.getResource("xa_security_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              xa_security_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            xa_security_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(xa_security_ejb_vehicle_client, securityClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive xa_security_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "xa_security_ejb_vehicle_ejb.jar");
+            // The class files
+            xa_security_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.xa.security.securityClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = securityClient1.class.getResource("xa_security_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              xa_security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = securityClient1.class.getResource("xa_security_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              xa_security_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(xa_security_ejb_vehicle_ejb, securityClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive xa_security_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_security_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_security_ejb_vehicle_ear.addAsModule(xa_security_ejb_vehicle_ejb);
+            xa_security_ejb_vehicle_ear.addAsModule(xa_security_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_security_ejb_vehicle_ear, securityClient1.class, earResURL);
+        return xa_security_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1JspTest.java
new file mode 100644
index 0000000000..82924ee8b4
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1JspTest.java
@@ -0,0 +1,149 @@
+package com.sun.ts.tests.connector.xa.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1JspTest extends com.sun.ts.tests.connector.xa.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_security_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_security_ejb_vehicle: 
+        xa_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_security_jsp_vehicle: 
+        xa_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_security_servlet_vehicle: 
+        xa_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/security/xa_security_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/xa/security/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_security_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_security_jsp_vehicle_web.war");
+            // The class files
+            xa_security_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.security.securityClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("xa_security_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              xa_security_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("xa_security_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_security_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              xa_security_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = securityClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              xa_security_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_security_jsp_vehicle_web, securityClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_security_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_security_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_security_jsp_vehicle_ear.addAsModule(xa_security_jsp_vehicle_web);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_security_jsp_vehicle_ear, securityClient1.class, earResURL);
+        return xa_security_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1ServletTest.java
new file mode 100644
index 0000000000..d3d0e7b89c
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/security/securityClient1ServletTest.java
@@ -0,0 +1,137 @@
+package com.sun.ts.tests.connector.xa.security;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class securityClient1ServletTest extends com.sun.ts.tests.connector.xa.security.securityClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_security_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_security_ejb_vehicle: 
+        xa_security_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_security_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_security_jsp_vehicle: 
+        xa_security_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_security_servlet_vehicle: 
+        xa_security_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/security/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_security_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_security_servlet_vehicle_web.war");
+            // The class files
+            xa_security_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.security.securityClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = securityClient1.class.getResource("xa_security_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              xa_security_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = securityClient1.class.getResource("xa_security_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_security_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_security_servlet_vehicle_web, securityClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_security_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_security_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_security_servlet_vehicle_ear.addAsModule(xa_security_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_security_servlet_vehicle_ear, securityClient1.class, earResURL);
+        return xa_security_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testContainerManaged() throws java.lang.Exception {
+            super.testContainerManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testComponentManaged() throws java.lang.Exception {
+            super.testComponentManaged();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testAppEISSignon() throws java.lang.Exception {
+            super.testAppEISSignon();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testConnManagerAllocateConnection() throws java.lang.Exception {
+            super.testConnManagerAllocateConnection();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ClientTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ClientTest.java
new file mode 100644
index 0000000000..7fea38651d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/transaction/jta/ClientTest.java
@@ -0,0 +1,140 @@
+package com.sun.ts.tests.connector.xa.transaction.jta;
+
+import com.sun.ts.tests.connector.xa.transaction.jta.JTATestClient;
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector_jta_optional")
+@Tag("platform")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class ClientTest extends com.sun.ts.tests.connector.xa.transaction.jta.JTATestClient {
+    /**
+        EE10 Deployment Descriptors:
+        ejb_JTATest: 
+        ejb_JTATest_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        ejb_JTATest_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml
+        /com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.jar.sun-application-client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml
+        /com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.jar.sun-ejb-jar.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = "ejb_JTATest", order = 2)
+        public static EnterpriseArchive createDeployment(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive ejb_JTATest_client = ShrinkWrap.create(JavaArchive.class, "ejb_JTATest_client.jar");
+            // The class files
+            ejb_JTATest_client.addClasses(
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.transaction.jta.JTATestClient.class,
+            com.sun.ts.tests.connector.xa.transaction.jta.JTATest.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = JTATestClient.class.getResource("com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.xml");
+            if(resURL != null) {
+              ejb_JTATest_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = JTATestClient.class.getResource("/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              ejb_JTATest_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            ejb_JTATest_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.connector.xa.transaction.jta.JTATestClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(ejb_JTATest_client, JTATestClient.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive ejb_JTATest_ejb = ShrinkWrap.create(JavaArchive.class, "ejb_JTATest_ejb.jar");
+            // The class files
+            ejb_JTATest_ejb.addClasses(
+                com.sun.ts.tests.connector.xa.transaction.jta.JTATestEJB.class,
+                com.sun.ts.tests.connector.xa.transaction.jta.JTATest.class,
+                com.sun.ts.tests.connector.util.DBSupport.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = JTATestClient.class.getResource("/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.xml");
+            if(ejbResURL1 != null) {
+              ejb_JTATest_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = JTATestClient.class.getResource("/com/sun/ts/tests/connector/xa/transaction/jta/ejb_JTATest_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              ejb_JTATest_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(ejb_JTATest_ejb, JTATestClient.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive ejb_JTATest_ear = ShrinkWrap.create(EnterpriseArchive.class, "ejb_JTATest.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            ejb_JTATest_ear.addAsModule(ejb_JTATest_ejb);
+            ejb_JTATest_ear.addAsModule(ejb_JTATest_client);
+
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // The sun-application.xml descriptor
+            earResURL = JTATestClient.class.getResource("/.ear.sun-application.xml");
+            if(earResURL != null) {
+              ejb_JTATest_ear.addAsManifestResource(earResURL, "sun-application.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEarArchive(ejb_JTATest_ear, JTATestClient.class, earResURL);
+        return ejb_JTATest_ear;
+        }
+
+        @Test
+        @Override
+        public void testXAResource1() throws java.lang.Exception {
+            super.testXAResource1();
+        }
+
+        @Test
+        @Override
+        public void testXAResource2() throws java.lang.Exception {
+            super.testXAResource2();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1EjbTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1EjbTest.java
new file mode 100644
index 0000000000..6c3bc1264d
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1EjbTest.java
@@ -0,0 +1,203 @@
+package com.sun.ts.tests.connector.xa.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-appclient")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1EjbTest extends com.sun.ts.tests.connector.xa.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_workmgt_ejb_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_workmgt_ejb_vehicle: 
+        xa_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_workmgt_jsp_vehicle: 
+        xa_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_workmgt_servlet_vehicle: 
+        xa_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        Client:
+
+        /com/sun/ts/tests/connector/xa/workmgt/xa_workmgt_ejb_vehicle_client.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_client.xml
+        Ejb:
+
+        /com/sun/ts/tests/connector/xa/workmgt/xa_workmgt_ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/connector/xa/workmgt/ejb_vehicle_ejb.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.jar.sun-ejb-jar.xml
+        /com/sun/ts/tests/common/vehicle/ejb/ejb_vehicle_ejb.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-appclient")
+        @OverProtocol("appclient")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // Client
+            // the jar with the correct archive name
+            JavaArchive xa_workmgt_ejb_vehicle_client = ShrinkWrap.create(JavaArchive.class, "xa_workmgt_ejb_vehicle_client.jar");
+            // The class files
+            xa_workmgt_ejb_vehicle_client.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class,
+            com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRunner.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The application-client.xml descriptor
+            URL resURL = workmgtClient1.class.getResource("xa_workmgt_ejb_vehicle_client.xml");
+            if(resURL != null) {
+              xa_workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "application-client.xml");
+            }
+            // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension?
+            resURL = workmgtClient1.class.getResource("xa_workmgt_ejb_vehicle_client.jar.sun-application-client.xml");
+            if(resURL != null) {
+              xa_workmgt_ejb_vehicle_client.addAsManifestResource(resURL, "sun-application-client.xml");
+            }
+            xa_workmgt_ejb_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF");
+            // Call the archive processor
+            archiveProcessor.processClientArchive(xa_workmgt_ejb_vehicle_client, workmgtClient1.class, resURL);
+
+        // Ejb 1
+            // the jar with the correct archive name
+            JavaArchive xa_workmgt_ejb_vehicle_ejb = ShrinkWrap.create(JavaArchive.class, "xa_workmgt_ejb_vehicle_ejb.jar");
+            // The class files
+            xa_workmgt_ejb_vehicle_ejb.addClasses(
+                com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+                com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicleRemote.class,
+                com.sun.ts.lib.harness.EETest.Fault.class,
+                com.sun.ts.tests.connector.xa.workmgt.workmgtClient1.class,
+                com.sun.ts.tests.connector.util.DBSupport.class,
+                com.sun.ts.lib.harness.EETest.class,
+                com.sun.ts.lib.harness.ServiceEETest.class,
+                com.sun.ts.lib.harness.EETest.SetupException.class,
+                com.sun.ts.tests.common.vehicle.VehicleClient.class,
+                com.sun.ts.tests.common.vehicle.ejb.EJBVehicle.class
+            );
+            // The ejb-jar.xml descriptor
+            URL ejbResURL1 = workmgtClient1.class.getResource("xa_workmgt_ejb_vehicle_ejb.xml");
+            if(ejbResURL1 != null) {
+              xa_workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml");
+            }
+            // The sun-ejb-jar.xml file
+            ejbResURL1 = workmgtClient1.class.getResource("xa_workmgt_ejb_vehicle_ejb.jar.sun-ejb-jar.xml");
+            if(ejbResURL1 != null) {
+              xa_workmgt_ejb_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml");
+            }
+            // Call the archive processor
+            archiveProcessor.processEjbArchive(xa_workmgt_ejb_vehicle_ejb, workmgtClient1.class, ejbResURL1);
+
+
+        // Ear
+            EnterpriseArchive xa_workmgt_ejb_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_workmgt_ejb_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_workmgt_ejb_vehicle_ear.addAsModule(xa_workmgt_ejb_vehicle_ejb);
+            xa_workmgt_ejb_vehicle_ear.addAsModule(xa_workmgt_ejb_vehicle_client);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_workmgt_ejb_vehicle_ear, workmgtClient1.class, earResURL);
+        return xa_workmgt_ejb_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("ejb")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1JspTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1JspTest.java
new file mode 100644
index 0000000000..72e0cb16c6
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1JspTest.java
@@ -0,0 +1,176 @@
+package com.sun.ts.tests.connector.xa.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1JspTest extends com.sun.ts.tests.connector.xa.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_workmgt_jsp_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_workmgt_ejb_vehicle: 
+        xa_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_workmgt_jsp_vehicle: 
+        xa_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_workmgt_servlet_vehicle: 
+        xa_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/workmgt/xa_workmgt_jsp_vehicle_web.xml
+        /com/sun/ts/tests/connector/xa/workmgt/jsp_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_workmgt_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_workmgt_jsp_vehicle_web.war");
+            // The class files
+            xa_workmgt_jsp_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("xa_workmgt_jsp_vehicle_web.xml");
+            if(warResURL != null) {
+              xa_workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("xa_workmgt_jsp_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_workmgt_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+            // Web content
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/client.html");
+            if(warResURL != null) {
+              xa_workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html");
+            }
+            warResURL = workmgtClient1.class.getResource("/com/sun/ts/tests/common/vehicle/jsp/contentRoot/jsp_vehicle.jsp");
+            if(warResURL != null) {
+              xa_workmgt_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp");
+            }
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_workmgt_jsp_vehicle_web, workmgtClient1.class, warResURL);
+
+        // Ear
+            EnterpriseArchive xa_workmgt_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_workmgt_jsp_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_workmgt_jsp_vehicle_ear.addAsModule(xa_workmgt_jsp_vehicle_web);
+
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_workmgt_jsp_vehicle_ear, workmgtClient1.class, earResURL);
+        return xa_workmgt_jsp_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("jsp")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file
diff --git a/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1ServletTest.java b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1ServletTest.java
new file mode 100644
index 0000000000..a6ba31cf6c
--- /dev/null
+++ b/connector/src/main/java/com/sun/ts/tests/connector/xa/workmgt/workmgtClient1ServletTest.java
@@ -0,0 +1,166 @@
+package com.sun.ts.tests.connector.xa.workmgt;
+
+import java.net.URL;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
+import org.jboss.arquillian.junit5.ArquillianExtension;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import tck.arquillian.porting.lib.spi.TestArchiveProcessor;
+import tck.arquillian.protocol.common.TargetVehicle;
+
+
+
+@ExtendWith(ArquillianExtension.class)
+@Tag("connector")
+@Tag("platform")
+@Tag("connector_standalone")
+@Tag("connector_web")
+@Tag("web_optional")
+@Tag("tck-javatest")
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class workmgtClient1ServletTest extends com.sun.ts.tests.connector.xa.workmgt.workmgtClient1 {
+    static final String VEHICLE_ARCHIVE = "xa_workmgt_servlet_vehicle";
+
+        /**
+        EE10 Deployment Descriptors:
+        xa_workmgt_ejb_vehicle: 
+        xa_workmgt_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml
+        xa_workmgt_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml
+        xa_workmgt_jsp_vehicle: 
+        xa_workmgt_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+        xa_workmgt_servlet_vehicle: 
+        xa_workmgt_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml
+
+        Found Descriptors:
+        War:
+
+        /com/sun/ts/tests/connector/xa/workmgt/servlet_vehicle_web.xml
+        /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml
+        Rar:
+
+        /com/sun/ts/tests/common/connector/whitebox/mdcomplete/ra-md-complete.xml
+        Ear:
+
+        */
+        @TargetsContainer("tck-javatest")
+        @OverProtocol("javatest")
+        @Deployment(name = VEHICLE_ARCHIVE, order = 2)
+        public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
+        // War
+            // the war with the correct archive name
+            WebArchive xa_workmgt_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "xa_workmgt_servlet_vehicle_web.war");
+            // The class files
+            xa_workmgt_servlet_vehicle_web.addClasses(
+            com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnable.class,
+            com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class,
+            com.sun.ts.lib.harness.EETest.Fault.class,
+            com.sun.ts.tests.connector.xa.workmgt.workmgtClient1.class,
+            com.sun.ts.tests.connector.util.DBSupport.class,
+            com.sun.ts.lib.harness.EETest.class,
+            com.sun.ts.lib.harness.ServiceEETest.class,
+            com.sun.ts.lib.harness.EETest.SetupException.class,
+            com.sun.ts.tests.common.vehicle.VehicleClient.class
+            );
+            // The web.xml descriptor
+            URL warResURL = workmgtClient1.class.getResource("xa_workmgt_servlet_vehicle_servlet.xml");
+            if(warResURL != null) {
+              xa_workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml");
+            }
+            // The sun-web.xml descriptor
+            warResURL = workmgtClient1.class.getResource("xa_workmgt_servlet_vehicle_web.war.sun-web.xml");
+            if(warResURL != null) {
+              xa_workmgt_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml");
+            }
+
+            // Any libraries added to the war
+
+           // Call the archive processor
+           archiveProcessor.processWebArchive(xa_workmgt_servlet_vehicle_web, workmgtClient1.class, warResURL);
+
+
+        // Ear
+            EnterpriseArchive xa_workmgt_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "xa_workmgt_servlet_vehicle.ear");
+
+            // Any libraries added to the ear
+
+            // The component jars built by the package target
+            xa_workmgt_servlet_vehicle_ear.addAsModule(xa_workmgt_servlet_vehicle_web);
+
+            // The application.xml descriptor
+            URL earResURL = null;
+            // Call the archive processor
+            archiveProcessor.processEarArchive(xa_workmgt_servlet_vehicle_ear, workmgtClient1.class, earResURL);
+        return xa_workmgt_servlet_vehicle_ear;
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkManagerImplementaion() throws java.lang.Exception {
+            super.testWorkManagerImplementaion();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkListenerImplementation() throws java.lang.Exception {
+            super.testWorkListenerImplementation();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWork() throws java.lang.Exception {
+            super.testScheduleWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testScheduleWorkListener() throws java.lang.Exception {
+            super.testScheduleWorkListener();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testWorkCompletedException() throws java.lang.Exception {
+            super.testWorkCompletedException();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testForUnsharedTimer() throws java.lang.Exception {
+            super.testForUnsharedTimer();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testNestedWork() throws java.lang.Exception {
+            super.testNestedWork();
+        }
+
+        @Test
+        @Override
+        @TargetVehicle("servlet")
+        public void testUnknownWorkDuration() throws java.lang.Exception {
+            super.testUnknownWorkDuration();
+        }
+
+
+}
\ No newline at end of file