Index: src/org/eclipse/persistence/testing/models/jpa/jpaadvancedproperties/JPAPropertiesRelationshipTableManager.java
===================================================================
--- src/org/eclipse/persistence/testing/models/jpa/jpaadvancedproperties/JPAPropertiesRelationshipTableManager.java	(revision 3767)
+++ src/org/eclipse/persistence/testing/models/jpa/jpaadvancedproperties/JPAPropertiesRelationshipTableManager.java	(working copy)
@@ -52,7 +52,7 @@
 
         FieldDefinition fieldCUST_ID = new FieldDefinition();
         fieldCUST_ID.setName("CUST_ID");
-        fieldCUST_ID.setTypeName("NUMBER");
+        fieldCUST_ID.setTypeName("NUMERIC");
         fieldCUST_ID.setSize(15);
         fieldCUST_ID.setSubSize(0);
         fieldCUST_ID.setIsPrimaryKey(true);
@@ -102,7 +102,7 @@
 
         FieldDefinition fieldITEM_ID = new FieldDefinition();
         fieldITEM_ID.setName("ID");
-        fieldITEM_ID.setTypeName("NUMBER");
+        fieldITEM_ID.setTypeName("NUMERIC");
         fieldITEM_ID.setSize(15);
         fieldITEM_ID.setSubSize(0);
         fieldITEM_ID.setIsPrimaryKey(true);
@@ -142,7 +142,7 @@
 
         FieldDefinition fieldITEM_ID = new FieldDefinition();
         fieldITEM_ID.setName("ID");
-        fieldITEM_ID.setTypeName("NUMBER");
+        fieldITEM_ID.setTypeName("NUMERIC");
         fieldITEM_ID.setSize(15);
         fieldITEM_ID.setSubSize(0);
         fieldITEM_ID.setIsPrimaryKey(true);
@@ -181,7 +181,7 @@
 
         FieldDefinition fieldCUST_ID = new FieldDefinition();
         fieldCUST_ID.setName("CUSTOMER_CUST_ID");
-        fieldCUST_ID.setTypeName("NUMBER");
+        fieldCUST_ID.setTypeName("NUMERIC");
         fieldCUST_ID.setSize(15);
         fieldCUST_ID.setSubSize(0);
         fieldCUST_ID.setIsPrimaryKey(false);
@@ -192,7 +192,7 @@
         
         FieldDefinition fieldBILLED_CUST_ID = new FieldDefinition();
         fieldBILLED_CUST_ID.setName("BILLEDCUSTOMER_CUST_ID");
-        fieldBILLED_CUST_ID.setTypeName("NUMBER");
+        fieldBILLED_CUST_ID.setTypeName("NUMERIC");
         fieldBILLED_CUST_ID.setSize(15);
         fieldBILLED_CUST_ID.setSubSize(0);
         fieldBILLED_CUST_ID.setIsPrimaryKey(false);
@@ -203,7 +203,7 @@
         
         FieldDefinition fieldSALESPERSON_ID = new FieldDefinition();
         fieldSALESPERSON_ID.setName("SALESPERSON_ID");
-        fieldSALESPERSON_ID.setTypeName("NUMBER");
+        fieldSALESPERSON_ID.setTypeName("NUMERIC");
         fieldSALESPERSON_ID.setSize(15);
         fieldSALESPERSON_ID.setSubSize(0);
         fieldSALESPERSON_ID.setIsPrimaryKey(false);
@@ -214,7 +214,7 @@
         
         FieldDefinition fieldITEM_ID = new FieldDefinition();
         fieldITEM_ID.setName("ITEM_ID");
-        fieldITEM_ID.setTypeName("NUMBER");
+        fieldITEM_ID.setTypeName("NUMERIC");
         fieldITEM_ID.setSize(15);
         fieldITEM_ID.setSubSize(0);
         fieldITEM_ID.setIsPrimaryKey(false);
@@ -225,7 +225,7 @@
 
         FieldDefinition fieldORDER_ID = new FieldDefinition();
         fieldORDER_ID.setName("ORDER_ID");
-        fieldORDER_ID.setTypeName("NUMBER");
+        fieldORDER_ID.setTypeName("NUMERIC");
         fieldORDER_ID.setSize(15);
         fieldORDER_ID.setSubSize(0);
         fieldORDER_ID.setIsPrimaryKey(true);
@@ -236,7 +236,7 @@
 
         FieldDefinition fieldQUANTITY = new FieldDefinition();
         fieldQUANTITY.setName("QUANTITY");
-        fieldQUANTITY.setTypeName("NUMBER");
+        fieldQUANTITY.setTypeName("NUMERIC");
         fieldQUANTITY.setSize(15);
         fieldQUANTITY.setSubSize(0);
         fieldQUANTITY.setIsPrimaryKey(false);
@@ -304,7 +304,7 @@
 
         FieldDefinition fieldID = new FieldDefinition();
         fieldID.setName("ID");
-        fieldID.setTypeName("NUMBER");
+        fieldID.setTypeName("NUMERIC");
         fieldID.setSize(15);
         fieldID.setSubSize(0);
         fieldID.setIsPrimaryKey(true);
Index: src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java
===================================================================
--- src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(revision 3767)
+++ src/org/eclipse/persistence/testing/tests/jpa/advanced/EntityManagerJUnitTestSuite.java	(working copy)
@@ -1487,7 +1487,16 @@
         em = createEntityManager();
         try {
             em.getTransaction().begin();
-            em.createQuery("DELETE FROM Employee e WHERE e.firstName = '"+firstName+"'").executeUpdate();
+            List<Employee> list = em.createQuery("Select e from Employee e where e.firstName = '"+firstName+"'").getResultList();
+            Iterator<Employee> i = list.iterator();
+            while (i.hasNext()){
+            	Employee e = i.next();
+            	if (e.getManager() != null){
+            		e.getManager().removeManagedEmployee(e);
+            		e.setManager(null);
+            	}
+            	em.remove(e);
+            }
             em.getTransaction().commit();
         } catch (RuntimeException ex){
             if (em.getTransaction().isActive()){
Index: src/org/eclipse/persistence/testing/tests/jpa/datatypes/arraypks/PrimitiveArrayPKCachingJUnitTestCase.java
===================================================================
--- src/org/eclipse/persistence/testing/tests/jpa/datatypes/arraypks/PrimitiveArrayPKCachingJUnitTestCase.java	(revision 3767)
+++ src/org/eclipse/persistence/testing/tests/jpa/datatypes/arraypks/PrimitiveArrayPKCachingJUnitTestCase.java	(working copy)
@@ -52,7 +52,10 @@
 
             protected void setUp(){
                 DatabaseSession session = JUnitTestCase.getServerSession();
-                assertTrue("Warning, RAW type used for Primary keys only supported on Oracle",  (session).getPlatform().isOracle());
+            	if (!(JUnitTestCase.getServerSession()).getPlatform().isOracle()){
+            		session.logMessage("Warning, RAW type used for Primary keys only supported on Oracle");
+            	    return;
+            	}
                 new PrimitiveArraysAsPrimaryKeyTableCreator().replaceTables(session);
             }
 
@@ -67,6 +70,10 @@
      * is returned from the database.  
      */
     public void testPrimitiveByteArrayPK() {
+    	if (!(JUnitTestCase.getServerSession()).getPlatform().isOracle()){
+    		JUnitTestCase.getServerSession().logMessage("Warning, RAW type used for Primary keys only supported on Oracle");
+    	    return;
+    	}
         EntityManager em = createEntityManager();
         
         java.util.UUID uuid = UUID.randomUUID();
Index: src/org/eclipse/persistence/testing/tests/jpa/jpaadvancedproperties/JPAAdvPropertiesJUnitTestCase.java
===================================================================
--- src/org/eclipse/persistence/testing/tests/jpa/jpaadvancedproperties/JPAAdvPropertiesJUnitTestCase.java	(revision 3767)
+++ src/org/eclipse/persistence/testing/tests/jpa/jpaadvancedproperties/JPAAdvPropertiesJUnitTestCase.java	(working copy)
@@ -24,6 +24,7 @@
 import org.eclipse.persistence.internal.jpa.EJBQueryImpl;
 import org.eclipse.persistence.queries.ReadAllQuery;
 import org.eclipse.persistence.sessions.DatabaseSession;
+import org.eclipse.persistence.sessions.server.ServerSession;
 import org.eclipse.persistence.sessions.UnitOfWork;
 import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
 import org.eclipse.persistence.sessions.*;
@@ -63,7 +64,9 @@
         return new TestSetup(suite) {
             
             protected void setUp(){               
-                DatabaseSession session = JUnitTestCase.getServerSession(persistenceUnitName); 
+                ServerSession session = JUnitTestCase.getServerSession(persistenceUnitName);
+                session.logout();
+                session.loginAndDetectDatasource();
                 JPAPropertiesRelationshipTableManager tm = new JPAPropertiesRelationshipTableManager();
                 tm.replaceTables(session);
             }