Zero compile errors after building output of mvn -Djar2shrinkwrap.technology=com.sun.ts.tests.jpa org.openrewrite.maven:rewrite-maven-plugin:runNoFork

gistfile1.txt

diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
index 15f2f94a2..1c4d390ab 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,179 @@ import jakarta.persistence.TransactionRequiredException;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_entityManager_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_ee_entityManager_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_jar");
+      jpa_ee_entityManager_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Order.class);
+      ear.addAsLibrary(jpa_ee_entityManager_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_entityManager_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_client_jar");
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManager_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_ejb_jar");
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_ee_entityManager_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManager_pmservlet_vehicle_web_war");
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_ee_entityManager_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager.jar");
+        jpa_ee_entityManager_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Order.class);
+        jpa_ee_entityManager_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_entityManager_jar.addAsManifestResource("persistence.xml");
+        jpa_ee_entityManager_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManager_jar);
+
+      }
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManager_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_client_jar");
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManager_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_ejb_jar");
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManager_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_client_jar");
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManager_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_ejb_jar");
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManager.Client.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManager_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManager_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Properties props = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
index be6ef03f3..d45ec835e 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.ee.entityManagerFactory;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,6 +36,252 @@ import jakarta.persistence.Persistence;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_entityManagerFactory_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_jar");
+      jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+      ear.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar");
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar");
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar");
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war");
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar");
+        jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+        jpa_ee_entityManagerFactory_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_entityManagerFactory_jar.addAsManifestResource("persistence.xml");
+        jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+
+      }
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_ee_entityManagerFactory_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_entityManagerFactory_puservlet_vehicle_web_war");
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_ee_entityManagerFactory_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar");
+        jpa_ee_entityManagerFactory_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class);
+        jpa_ee_entityManagerFactory_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_entityManagerFactory_jar.addAsManifestResource("persistence.xml");
+        jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addAsLibrary(jpa_ee_entityManagerFactory_jar);
+
+      }
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar");
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar");
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar");
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar");
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.entityManagerFactory.Client.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_entityManagerFactory_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Properties props = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
index 325ce8265..aeb7612a7 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java
@@ -21,7 +21,11 @@
 package ee.jakarta.tck.persistence.ee.packaging.appclient.annotation;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +37,23 @@ import jakarta.persistence.PersistenceUnit;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_annotation.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_appclient_annotation_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_appclient_annotation_client_jar");
+      jpa_ee_packaging_appclient_annotation_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.annotation.Coffee.class);
+      jpa_ee_packaging_appclient_annotation_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.annotation.Client.class);
+      ear.addAsModule(jpa_ee_packaging_appclient_annotation_client_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final Coffee cRef[] = new Coffee[5];
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
index 63c63d5d2..b62a2edb7 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/Client.java
@@ -21,7 +21,11 @@
 package ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,6 +37,23 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_appclient_descriptor.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_appclient_descriptor_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_appclient_descriptor_client_jar");
+      jpa_ee_packaging_appclient_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor.Coffee.class);
+      jpa_ee_packaging_appclient_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.appclient.descriptor.Client.class);
+      ear.addAsModule(jpa_ee_packaging_appclient_descriptor_client_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static final Coffee cRef[] = new Coffee[5];
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
index 5d730f906..310cbd027 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/Client.java
@@ -23,6 +23,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor;
 import java.lang.System.Logger;
 import java.util.Properties;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +36,39 @@ import com.sun.ts.lib.util.TSNamingContext;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_descriptor.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_descriptor_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_descriptor_client_jar");
+      jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.C.class);
+      jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Client.class);
+      jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3IF.class);
+      jpa_ee_packaging_ejb_descriptor_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3IF.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_descriptor_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_descriptor_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_descriptor_ejb_jar");
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.C.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.A.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3IF.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3Bean.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.B.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3IF.class);
+      jpa_ee_packaging_ejb_descriptor_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3Bean.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_descriptor_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String StatefulRef = "java:comp/env/ejb/Stateful3Bean";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
index 906e071c6..b5381c13a 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.exclude;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,34 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_exclude.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_exclude_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_exclude_client_jar");
+      jpa_ee_packaging_ejb_exclude_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Client.class);
+      jpa_ee_packaging_ejb_exclude_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3IF.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_exclude_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_exclude_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_exclude_ejb_jar");
+      jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3IF.class);
+      jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.A.class);
+      jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.Stateful3Bean.class);
+      jpa_ee_packaging_ejb_exclude_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.B.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_exclude_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(beanName = "Stateful3Bean")
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
index 2e0fcee9f..c61647f3e 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/Client.java
@@ -23,6 +23,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local;
 import java.lang.System.Logger;
 import java.util.Properties;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +36,34 @@ import com.sun.ts.lib.util.TSNamingContext;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_resource_local.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_resource_local_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_resource_local_client_jar");
+      jpa_ee_packaging_ejb_resource_local_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3IF.class);
+      jpa_ee_packaging_ejb_resource_local_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Client.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_resource_local_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_resource_local_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_resource_local_ejb_jar");
+      jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3Bean.class);
+      jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3IF.class);
+      jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+      jpa_ee_packaging_ejb_resource_local_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_resource_local_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private Stateless3IF bean = null;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
index 6d9e8927b..dd010ae04 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.packaging.ejb.standalone;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +34,23 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_ejb_standalone_ejb.ear");
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_packaging_ejb_standalone_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_ejb_standalone_client_jar");
+      jpa_ee_packaging_ejb_standalone_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.standalone.Client.class);
+      jpa_ee_packaging_ejb_standalone_client_jar.addClass(ee.jakarta.tck.persistence.ee.packaging.ejb.standalone.Stateful3IF.class);
+      ear.addAsModule(jpa_ee_packaging_ejb_standalone_client_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
index f9712863f..06b49a4c5 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/Client.java
@@ -21,13 +21,38 @@
 package ee.jakarta.tck.persistence.ee.packaging.web.scope;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_packaging_web_scope.ear");
+    // Add ear submodules
+
+    {
+
+      WebArchive jpa_ee_packaging_web_scope_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_packaging_web_scope_web_war");
+      jpa_ee_packaging_web_scope_web_war.addAsWebInfResource("persistence.xml");
+      jpa_ee_packaging_web_scope_web_war.addAsWebInfResource("web.xml");
+      jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+      jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+      jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.packaging.web.scope.ServletTest.class);
+      jpa_ee_packaging_web_scope_web_war.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+      ear.addAsModule(jpa_ee_packaging_web_scope_web_war);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
index ddfdb3814..a309b9db9 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/Client.java
@@ -21,13 +21,37 @@
 package ee.jakarta.tck.persistence.ee.packaging.web.standalone;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.jupiter.api.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static WebArchive getWarTestArchive() throws Exception {
+
+    WebArchive jpa_ee_packaging_web_standalone_component_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_packaging_web_standalone_component_web_war");
+    jpa_ee_packaging_web_standalone_component_web_war.addAsWebInfResource("web.xml");
+
+    {
+
+      JavaArchive jpa_ee_packaging_web_standalone_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_web_standalone.jar");
+      jpa_ee_packaging_web_standalone_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+      jpa_ee_packaging_web_standalone_jar.addAsManifestResource("MANIFEST.MF");
+      jpa_ee_packaging_web_standalone_jar.addAsManifestResource("persistence.xml");
+      jpa_ee_packaging_web_standalone_component_web_war.addAsLibrary(jpa_ee_packaging_web_standalone_jar);
+
+    }
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+    jpa_ee_packaging_web_standalone_component_web_war.addClass(ee.jakarta.tck.persistence.ee.packaging.web.standalone.ServletTest.class);
+    return jpa_ee_packaging_web_standalone_component_web_war;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
index 70c7ecb90..1ccc89aa7 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java
@@ -22,7 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +44,227 @@ import jakarta.persistence.spi.PersistenceUnitTransactionType;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider_jar");
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+      ear.addAsLibrary(jpa_alternate_provider_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_jar");
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class);
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class);
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class);
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class);
+      jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+      ear.addAsLibrary(jpa_ee_pluggability_contracts_jta_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar");
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar");
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war");
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider.jar");
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+        jpa_alternate_provider_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_alternate_provider_jar.addAsManifestResource("services/jakarta.persistence.spi.PersistenceProvider");
+        jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsLibrary(jpa_alternate_provider_jar);
+
+      }
+
+      {
+
+        JavaArchive jpa_ee_pluggability_contracts_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta.jar");
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order3.class);
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order2.class);
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order.class);
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order4.class);
+        jpa_ee_pluggability_contracts_jta_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+        jpa_ee_pluggability_contracts_jta_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_pluggability_contracts_jta_jar.addAsManifestResource("persistence.xml");
+        jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addAsLibrary(jpa_ee_pluggability_contracts_jta_jar);
+
+      }
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar");
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar");
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar");
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar");
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private transient EntityManagerImpl emImpl;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
index 012670589..1f2fd42c6 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java
@@ -22,7 +22,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +44,148 @@ import jakarta.persistence.spi.PersistenceUnitTransactionType;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "pluggability_contracts_resource_local_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider_jar");
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+      jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+      ear.addAsLibrary(jpa_alternate_provider_jar);
+
+    }
+
+    {
+
+      JavaArchive pluggability_contracts_resource_local_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_jar");
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order4.class);
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order.class);
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order3.class);
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order2.class);
+      pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+      ear.addAsLibrary(pluggability_contracts_resource_local_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar");
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar");
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Client.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive pluggability_contracts_resource_local_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "pluggability_contracts_resource_local_puservlet_vehicle_web_war");
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_alternate_provider_jar = ShrinkWrap.create(JavaArchive.class, "jpa_alternate_provider.jar");
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.ClassTransformerImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogger.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSXMLFormatter.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.CacheImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceUnitInfoImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.QueryImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityTransactionImpl.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.TSLogRecord.class);
+        jpa_alternate_provider_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider.class);
+        jpa_alternate_provider_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_alternate_provider_jar.addAsManifestResource("services/jakarta.persistence.spi.PersistenceProvider");
+        pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsLibrary(jpa_alternate_provider_jar);
+
+      }
+
+      {
+
+        JavaArchive pluggability_contracts_resource_local_jar = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local.jar");
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order4.class);
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order.class);
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogRecordEntry.class);
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order3.class);
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order2.class);
+        pluggability_contracts_resource_local_jar.addClass(ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor.class);
+        pluggability_contracts_resource_local_jar.addAsManifestResource("MANIFEST.MF");
+        pluggability_contracts_resource_local_jar.addAsManifestResource("myMappingFile1.xml");
+        pluggability_contracts_resource_local_jar.addAsManifestResource("myMappingFile2.xml");
+        pluggability_contracts_resource_local_jar.addAsManifestResource("orm.xml");
+        pluggability_contracts_resource_local_jar.addAsManifestResource("persistence.xml");
+        pluggability_contracts_resource_local_puservlet_vehicle_web_war.addAsLibrary(pluggability_contracts_resource_local_jar);
+
+      }
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Client.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      pluggability_contracts_resource_local_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(pluggability_contracts_resource_local_puservlet_vehicle_web_war);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private transient EntityManagerImpl emImpl;
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
index fe48d91d2..dfcd193cc 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.propagation.am;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,52 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_am.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_ee_propagation_am_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_jar");
+      jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+      jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Member2.class);
+      jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+      jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+      jpa_ee_propagation_am_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Member.class);
+      ear.addAsLibrary(jpa_ee_propagation_am_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_propagation_am_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_client_jar");
+      jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3IF.class);
+      jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF.class);
+      jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF2.class);
+      jpa_ee_propagation_am_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Client.class);
+      ear.addAsModule(jpa_ee_propagation_am_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_propagation_am_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_am_ejb_jar");
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3Bean2.class);
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3Bean.class);
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateless3IF.class);
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF.class);
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3IF2.class);
+      jpa_ee_propagation_am_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.am.Stateful3Bean.class);
+      ear.addAsModule(jpa_ee_propagation_am_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
index 9c33fc423..dbd72ed39 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/Client.java
@@ -22,7 +22,11 @@ package ee.jakarta.tck.persistence.ee.propagation.cm.extended;
 
 import java.lang.System.Logger;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,46 @@ import jakarta.ejb.EJB;
 
 public class Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_cm_ext.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_ee_propagation_cm_ext_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_jar");
+      jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+      jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+      jpa_ee_propagation_cm_ext_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+      ear.addAsLibrary(jpa_ee_propagation_cm_ext_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_propagation_cm_ext_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_client_jar");
+      jpa_ee_propagation_cm_ext_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3IF.class);
+      jpa_ee_propagation_cm_ext_client_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Client.class);
+      ear.addAsModule(jpa_ee_propagation_cm_ext_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_ee_propagation_cm_ext_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_ext_ejb_jar");
+      jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3IF.class);
+      jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.TellerBean.class);
+      jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Teller.class);
+      jpa_ee_propagation_cm_ext_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.extended.Stateful3Bean.class);
+      ear.addAsModule(jpa_ee_propagation_cm_ext_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	@EJB(name = "ejb/Stateful3Bean", beanInterface = Stateful3IF.class)
diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
index fca346443..7a4ec4ebd 100644
--- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
+++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/Client.java
@@ -21,13 +21,83 @@
 package ee.jakarta.tck.persistence.ee.propagation.cm.jta;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.Test;
 
 import ee.jakarta.tck.persistence.ee.util.AbstractUrlClient;
 
 public class Client extends AbstractUrlClient {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_ee_propagation_cm_jta.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_ee_propagation_cm_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_jar");
+      jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+      jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+      jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+      ear.addAsLibrary(jpa_ee_propagation_cm_jta_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_ee_propagation_cm_jta_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_ejb_jar");
+      jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean2.class);
+      jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+      jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean.class);
+      ear.addAsModule(jpa_ee_propagation_cm_jta_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_ee_propagation_cm_jta_web_war = ShrinkWrap.create(WebArchive.class, "jpa_ee_propagation_cm_jta_web_war");
+      jpa_ee_propagation_cm_jta_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_ee_propagation_cm_jta_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta.jar");
+        jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.A.class);
+        jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.Account.class);
+        jpa_ee_propagation_cm_jta_jar.addClass(ee.jakarta.tck.persistence.ee.common.B.class);
+        jpa_ee_propagation_cm_jta_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_propagation_cm_jta_jar.addAsManifestResource("persistence.xml");
+        jpa_ee_propagation_cm_jta_web_war.addAsLibrary(jpa_ee_propagation_cm_jta_jar);
+
+      }
+
+      {
+
+        JavaArchive jpa_ee_propagation_cm_jta_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_ee_propagation_cm_jta_ejb.jar");
+        jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean2.class);
+        jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+        jpa_ee_propagation_cm_jta_ejb_jar.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.TellerBean.class);
+        jpa_ee_propagation_cm_jta_ejb_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_ee_propagation_cm_jta_web_war.addAsLibrary(jpa_ee_propagation_cm_jta_ejb_jar);
+
+      }
+      jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.util.Data.class);
+      jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.util.HttpTCKServlet.class);
+      jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.Teller.class);
+      jpa_ee_propagation_cm_jta_web_war.addClass(ee.jakarta.tck.persistence.ee.propagation.cm.jta.ServletTest.class);
+      ear.addAsModule(jpa_ee_propagation_cm_jta_web_war);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public static final String SERVLET_NAME = "ServletTest";
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
index 06da3f66d..398739d47 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/Client.java
@@ -21,8 +21,12 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -36,6 +40,251 @@ import jakarta.persistence.metamodel.Metamodel;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_EntityGraph_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_jar");
+      jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+      jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+      jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+      jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+      ear.addAsLibrary(jpa_core_EntityGraph_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_client_jar");
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar");
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_EntityGraph_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_pmservlet_vehicle_web_war");
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+        jpa_core_EntityGraph_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_EntityGraph_jar.addAsManifestResource("persistence.xml");
+        jpa_core_EntityGraph_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_EntityGraph_jar);
+
+      }
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_EntityGraph_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_EntityGraph_puservlet_vehicle_web_war");
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_EntityGraph_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph.jar");
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee2.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Department.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee.class);
+        jpa_core_EntityGraph_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class);
+        jpa_core_EntityGraph_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_EntityGraph_jar.addAsManifestResource("persistence.xml");
+        jpa_core_EntityGraph_puservlet_vehicle_web_war.addAsLibrary(jpa_core_EntityGraph_jar);
+
+      }
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_client_jar");
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_ejb_jar");
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_EntityGraph_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_EntityGraph_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_client_jar");
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_EntityGraph_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      ear.addAsModule(jpa_core_EntityGraph_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_EntityGraph_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_ejb_jar");
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.EntityGraph.Client.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_EntityGraph_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      ear.addAsModule(jpa_core_EntityGraph_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	Employee3[] empRef = new Employee3[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
index 9674a1995..f26db256f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java
@@ -21,7 +21,12 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
@@ -29,6 +34,260 @@ import jakarta.persistence.StoredProcedureQuery;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+      ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	List<Employee> empRef = new ArrayList<Employee>();
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
index 154ab65f3..19ef38f0b 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java
@@ -22,8 +22,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -40,6 +44,260 @@ import jakarta.persistence.TransactionRequiredException;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+      ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client1.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
     private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
     public Client1() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
index 9fdaf1472..e07276f85 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,6 +37,260 @@ import jakarta.persistence.TemporalType;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_StoredProcedureQuery_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_jar");
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+      jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+      ear.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war");
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_StoredProcedureQuery_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery.jar");
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee2.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Employee.class);
+        jpa_core_StoredProcedureQuery_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.EmployeeMappedSC.class);
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_StoredProcedureQuery_jar.addAsManifestResource("persistence.xml");
+        jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addAsLibrary(jpa_core_StoredProcedureQuery_jar);
+
+      }
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar");
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.StoredProcedureQuery.Client2.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_StoredProcedureQuery_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public Client2() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
index 838f6364e..fe03af1fb 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client.java
@@ -17,13 +17,270 @@
 package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	protected DataTypes d1;
 
 	protected DataTypes2 d2;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
index c01b0bae4..cb2590a4a 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1.java
@@ -2,8 +2,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -12,6 +16,258 @@ import jakarta.persistence.Query;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client1.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
index c557ca4ed..4b31cdb32 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java
@@ -2,12 +2,269 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client2.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
index 6140c7054..12cc3ba68 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java
@@ -2,12 +2,269 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client3 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client3.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client3.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
index 8f0f34633..8bf984b50 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java
@@ -2,8 +2,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.field;
 
 import java.lang.System.Logger;
 import java.util.GregorianCalendar;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +15,258 @@ import jakarta.persistence.TypedQuery;
 
 public class Client4 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_field_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_jar");
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+      jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_field_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_field_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_field_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field.jar");
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.DataTypes2.class);
+        jpa_core_annotations_access_field_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_field_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_field_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_field_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_field_jar);
+
+      }
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.field.Client4.class);
+      ear.addAsModule(jpa_core_annotations_access_field_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client4.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
index bb7f7b488..8d038c9d4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.mappedsc;
 
 import java.lang.System.Logger;
 import java.sql.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,267 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_anno_access_mappedsc_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_jar");
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+      jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+      ear.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar");
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar");
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war");
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar");
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+        jpa_core_anno_access_mappedsc_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_anno_access_mappedsc_jar.addAsManifestResource("persistence.xml");
+        jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+
+      }
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war");
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_anno_access_mappedsc_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc.jar");
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.FullTimeEmployee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.PartTimeEmployee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Project.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Employee.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Department.class);
+        jpa_core_anno_access_mappedsc_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.AbstractPersonnel.class);
+        jpa_core_anno_access_mappedsc_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_anno_access_mappedsc_jar.addAsManifestResource("persistence.xml");
+        jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addAsLibrary(jpa_core_anno_access_mappedsc_jar);
+
+      }
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar");
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar");
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar");
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar");
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.mappedsc.Client.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static FullTimeEmployee ftRef[] = new FullTimeEmployee[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
index 0a29d19d2..cade3df17 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client.java
@@ -1,13 +1,270 @@
 package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	protected DataTypes d1;
 
 	protected DataTypes2 d2;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
index 3bc2e26ee..3d19ecba0 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +31,258 @@ import ee.jakarta.tck.persistence.core.types.common.Grade;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client1.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
index d197c75e2..c22de50bc 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java
@@ -2,12 +2,269 @@ package ee.jakarta.tck.persistence.core.annotations.access.property;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_access_property_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_jar");
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+      jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+      ear.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_pmservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_access_property_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_access_property_puservlet_vehicle_web_war");
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_access_property_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property.jar");
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes2.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.DataTypes.class);
+        jpa_core_annotations_access_property_jar.addClass(ee.jakarta.tck.persistence.core.types.common.Grade.class);
+        jpa_core_annotations_access_property_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_access_property_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_access_property_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_access_property_jar);
+
+      }
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.access.property.Client2.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_access_property_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
index 42bfb3240..e4b291e72 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.assocoverride;
 
 import java.lang.System.Logger;
 import java.sql.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,258 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_assocoverride_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_jar");
+      jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+      jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+      jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+      ear.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war");
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar");
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+        jpa_core_annotations_assocoverride_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_assocoverride_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+
+      }
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_assocoverride_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_assocoverride_puservlet_vehicle_web_war");
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_assocoverride_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride.jar");
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Address.class);
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Employee.class);
+        jpa_core_annotations_assocoverride_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.PartTimeEmployee.class);
+        jpa_core_annotations_assocoverride_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_assocoverride_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_assocoverride_jar);
+
+      }
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar");
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar");
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.assocoverride.Client.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_assocoverride_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private static PartTimeEmployee ptRef[] = new PartTimeEmployee[5];
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
index a340f285d..b46a700e5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client.java
@@ -23,13 +23,264 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+      ear.addAsLibrary(jpa_core_annotations_basic_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
index 6be6a16bb..12953c3f5 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1.java
@@ -24,12 +24,263 @@ import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+      ear.addAsLibrary(jpa_core_annotations_basic_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client1.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client1.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
index ad5bf137c..c19e56d00 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2.java
@@ -20,12 +20,263 @@ import java.lang.System.Logger;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+      ear.addAsLibrary(jpa_core_annotations_basic_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.A.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.basic.Client2.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client2.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
index 82d5ad03b..c004307cd 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -30,6 +34,255 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_collectiontable_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_jar");
+      jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+      jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+      ear.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war");
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar");
+        jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+        jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+        jpa_core_annotations_collectiontable_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_collectiontable_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+
+      }
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_collectiontable_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_collectiontable_puservlet_vehicle_web_war");
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_collectiontable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable.jar");
+        jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Address.class);
+        jpa_core_annotations_collectiontable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.A.class);
+        jpa_core_annotations_collectiontable_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_collectiontable_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_collectiontable_jar);
+
+      }
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar");
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar");
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.collectiontable.Client.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_collectiontable_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
index 4a0d78138..02fa10bd2 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/Client.java
@@ -20,8 +20,12 @@ package ee.jakarta.tck.persistence.core.annotations.convert;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,6 +39,306 @@ import jakarta.persistence.criteria.Root;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_convert_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_jar");
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+      jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+      ear.addAsLibrary(jpa_core_convert_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_convert_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_client_jar");
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_ejb_jar");
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_convert_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_convert_pmservlet_vehicle_web_war");
+      jpa_core_convert_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar");
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+        jpa_core_convert_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_convert_jar.addAsManifestResource("persistence.xml");
+        jpa_core_convert_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_convert_jar);
+
+      }
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_convert_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_convert_puservlet_vehicle_web_war");
+      jpa_core_convert_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_convert_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert.jar");
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.NumberToStateConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.IntegerConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Country.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee3.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SpaceConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DisableAutoApplyConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CharConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Address.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Department.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Employee.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.CommaConverter.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Customer.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.FullTimeEmployee.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.B.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.DotConverter2.class);
+        jpa_core_convert_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.SalaryConverter.class);
+        jpa_core_convert_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_convert_jar.addAsManifestResource("persistence.xml");
+        jpa_core_convert_puservlet_vehicle_web_war.addAsLibrary(jpa_core_convert_jar);
+
+      }
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_client_jar");
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_ejb_jar");
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_client_jar");
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_convert_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_ejb_jar");
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.convert.Client.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_convert_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_convert_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
index c0431a038..36d14d6aa 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.annotations.discriminatorValue;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,6 +31,264 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_jar");
+      jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+      jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+      jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+      jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+      jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+      ear.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war");
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar");
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+        jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+
+      }
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war");
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_discrinimatorValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue.jar");
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PricedPartProduct2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product2.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Product.class);
+        jpa_core_annotations_discrinimatorValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.PartProduct.class);
+        jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_discrinimatorValue_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_discrinimatorValue_jar);
+
+      }
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar");
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar");
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.discriminatorValue.Client.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	public JavaArchive createDeployment() throws Exception {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
index f5c589ade..87ec7b990 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.elementcollection;
 import java.lang.System.Logger;
 import java.util.HashSet;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,263 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client1 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_elementcollection_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_jar");
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+      ear.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war");
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+      }
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_elementcollection_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_puservlet_vehicle_web_war");
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+      }
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client1.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client1() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
index 5e6fb6042..1f433957e 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.elementcollection;
 import java.lang.System.Logger;
 import java.util.ArrayList;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,263 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client2 extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_elementcollection_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_jar");
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+      jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+      ear.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war");
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+      }
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_elementcollection_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_elementcollection_puservlet_vehicle_web_war");
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_elementcollection_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection.jar");
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.A.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Customer.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.CustomerXML.class);
+        jpa_core_annotations_elementcollection_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Address.class);
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("myMappingFile.xml");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_elementcollection_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_elementcollection_jar);
+
+      }
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar");
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.elementcollection.Client2.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_elementcollection_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client2() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
index f8c879e12..9900cb38d 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/Client.java
@@ -17,8 +17,12 @@
 package ee.jakarta.tck.persistence.core.annotations.embeddable;
 
 import java.lang.System.Logger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,258 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_embeddable_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_jar");
+      jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+      jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+      jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+      ear.addAsLibrary(jpa_core_annotations_embeddable_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_embeddable_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddable_pmservlet_vehicle_web_war");
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar");
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+        jpa_core_annotations_embeddable_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_embeddable_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddable_jar);
+
+      }
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_embeddable_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddable_puservlet_vehicle_web_war");
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_embeddable_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable.jar");
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.ZipCode.class);
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Address.class);
+        jpa_core_annotations_embeddable_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.B.class);
+        jpa_core_annotations_embeddable_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_embeddable_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddable_jar);
+
+      }
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_client_jar");
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_client_jar");
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddable.Client.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddable_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
index e940be89b..16db5dbce 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/Client.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.embeddableMapValue;
 import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,255 @@ import jakarta.persistence.EntityTransaction;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_jar");
+      jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+      jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+      ear.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war");
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar");
+        jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+        jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+        jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+
+      }
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war");
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_embeddableMapValue_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue.jar");
+        jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Address.class);
+        jpa_core_annotations_embeddableMapValue_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Employee.class);
+        jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_embeddableMapValue_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_embeddableMapValue_jar);
+
+      }
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar");
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar");
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.embeddableMapValue.Client.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
index 6ed641394..63744dc7f 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/Client.java
@@ -24,8 +24,12 @@ import java.lang.System.Logger;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,6 +38,252 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_entity_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_jar");
+      jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+      ear.addAsLibrary(jpa_core_annotations_entity_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_entity_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_entity_pmservlet_vehicle_web_war");
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar");
+        jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+        jpa_core_annotations_entity_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_entity_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_entity_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_entity_jar);
+
+      }
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_entity_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_entity_puservlet_vehicle_web_war");
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_entity_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity.jar");
+        jpa_core_annotations_entity_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Coffee.class);
+        jpa_core_annotations_entity_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_entity_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_entity_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_entity_jar);
+
+      }
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_client_jar");
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_client_jar");
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_entity_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.entity.Client.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_entity_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_entity_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static Coffee cRef[] = new Coffee[5];
 
 	public Client() {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
index 5d75da345..4acaf0792 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/Client.java
@@ -19,8 +19,12 @@ package ee.jakarta.tck.persistence.core.annotations.id;
 import java.lang.System.Logger;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,6 +33,291 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_basic_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_jar");
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+      jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+      ear.addAsLibrary(jpa_core_annotations_basic_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_pmservlet_vehicle_web_war");
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_basic_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_basic_puservlet_vehicle_web_war");
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_basic_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic.jar");
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyStringId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyUtilDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldSQLDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldStringId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertySQLDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigDecimalId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyIntegerId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldIntId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldUtilDateId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.PropertyBigDecimalId.class);
+        jpa_core_annotations_basic_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.FieldBigIntegerId.class);
+        jpa_core_annotations_basic_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_basic_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_basic_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_basic_jar);
+
+      }
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_basic_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.id.Client.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_basic_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_basic_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
index e1ea0ef4c..f56602846 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/Client.java
@@ -18,8 +18,12 @@ package ee.jakarta.tck.persistence.core.annotations.lob;
 
 import java.lang.System.Logger;
 import java.util.Arrays;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -28,6 +32,252 @@ import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_lob_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_jar");
+      jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+      ear.addAsLibrary(jpa_core_annotations_lob_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_lob_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_lob_pmservlet_vehicle_web_war");
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar");
+        jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+        jpa_core_annotations_lob_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_lob_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_lob_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_lob_jar);
+
+      }
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_lob_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_lob_puservlet_vehicle_web_war");
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_lob_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob.jar");
+        jpa_core_annotations_lob_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.DataTypes.class);
+        jpa_core_annotations_lob_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_lob_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_lob_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_lob_jar);
+
+      }
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_client_jar");
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_client_jar");
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_lob_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.lob.Client.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_lob_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_lob_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	private static final Logger logger = (Logger) System.getLogger(Client.class.getName());
 
 	private DataTypes dataTypes;
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
index 7f24ec7c7..da36bdd5c 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client.java
@@ -23,13 +23,276 @@ package ee.jakarta.tck.persistence.core.annotations.mapkey;
 import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.Map;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+      ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
index b08893af2..7362ffba4 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java
@@ -25,12 +25,275 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client1 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+      ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client1.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client1() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
index 8c62598be..6d74a48a9 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2.java
@@ -22,12 +22,275 @@ package ee.jakarta.tck.persistence.core.annotations.mapkey;
 
 import java.lang.System.Logger;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class Client2 extends Client {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkey_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_jar");
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+      jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+      ear.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_pmservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkey_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkey_puservlet_vehicle_web_war");
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkey_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey.jar");
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Department.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee4.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee2.class);
+        jpa_core_annotations_mapkey_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Employee3.class);
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkey_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkey_jar);
+
+      }
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.puservlet.PUServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_puservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_puservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateful3_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar");
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkey.Client2.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkey_stateless3_vehicle_ejb_jar);
+
+    }
+    return ear;
+  }
+
 	public Client2() {
 	}
 
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
index cc6e41bdf..99e3bb408 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/Client.java
@@ -20,8 +20,12 @@ import java.lang.System.Logger;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
-
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+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.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,6 +35,258 @@ import jakarta.persistence.EntityManager;
 
 public class Client extends PMClientBase {
 
+  @Deployment(testable = false)
+  public static Archive<?> getEarTestArchive() {
+
+    final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_annotations_mapkeyclass_vehicles.ear");
+    // TODO: filter/eliminate the library jar classes that shouldn't be included
+    // Add ear/lib jars
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_jar");
+      jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+      jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester.class);
+      jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course.class);
+      ear.addAsLibrary(jpa_core_annotations_mapkeyclass_jar);
+
+    }
+    // Add ear submodules
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar");
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar");
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleIF.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class);
+      ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar");
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client_jar);
+
+    }
+
+    {
+
+      JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar");
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleIF.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleBean.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb_jar);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war");
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar");
+        jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+        jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Semester.class);
+        jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Course.class);
+        jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("MANIFEST.MF");
+        jpa_core_annotations_mapkeyclass_jar.addAsManifestResource("persistence.xml");
+        jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addAsLibrary(jpa_core_annotations_mapkeyclass_jar);
+
+      }
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareBaseBean.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EJB3ShareIF.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.common.PMClientBase.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleRunnable.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Client.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.VehicleClient.class);
+      jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war.addClass(com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class);
+      ear.addAsModule(jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web_war);
+
+    }
+
+    {
+
+      WebArchive jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war = ShrinkWrap.create(WebArchive.class, "jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war");
+      jpa_core_annotations_mapkeyclass_puservlet_vehicle_web_war.addAsWebInfResource("web.xml");
+
+      {
+
+        JavaArchive jpa_core_annotations_mapkeyclass_jar = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass.jar");
+        jpa_core_annotations_mapkeyclass_jar.addClass(ee.jakarta.tck.persistence.core.annotations.mapkeyclass.Student.class);
+        jpa_core_annotations_mapkeyclass_jar.ad