Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java	(revision 7799)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Employee.java	(working copy)
@@ -152,7 +152,7 @@
     // <join-column name="PROFILE_GUID"/>
     // </attribute>
     @OneToOne
-    @JoinColumn(name = "PROFILE_GUID")
+    @JoinColumn(name = "PROFILE_GUID", columnDefinition="binary(16) DEFAULT NULL")
     protected TravelProfile travelProfile;
 
     // <attribute name="hobbies">
@@ -186,8 +186,9 @@
     @JoinTable(name = "TMP_EMP_CREDIT", joinColumns = { @JoinColumn(name = "CLIENT_ID") }, inverseJoinColumns = { @JoinColumn(name = "CREDIT_ID") })
     protected Set<CreditCardAccount> creditCardAccounts;
 
-    @OneToOne
-    @JoinColumn(name = "AUTOMOBILE")
+//    @OneToOne
+//    @JoinColumn(name = "AUTOMOBILE")
+    @Transient // EclipseLink has issue with cyclic FKs FIXME: file bug and add id here
     protected MotorVehicle automobile;
 
     @ManyToOne
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java	(revision 7799)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/TravelProfile.java	(working copy)
@@ -86,7 +86,7 @@
      * @return Returns the guid.
      */
     @Id
-    @Column(length = 16)
+    @Column(length = 16, columnDefinition="binary(16) DEFAULT NULL")
     public byte[] getGuid() {
         return guid;
     }
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java	(revision 7799)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/models/wdf/jpa1/employee/Vehicle.java	(working copy)
@@ -59,8 +59,9 @@
     int version;
 
     @ManyToMany
-    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID") })
+    @JoinTable(name = "TMP_VEHICLE_PROFILE", joinColumns = { @JoinColumn(name = "VEHICLE_ID") }, inverseJoinColumns = { @JoinColumn(name = "PROFILE_ID", columnDefinition="binary(16) DEFAULT NULL") })
     private Set<TravelProfile> profiles;
+    
 
     public void setId(Short id) {
         this.id = id;
Index: jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java
===================================================================
--- jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java	(revision 7783)
+++ jpa/eclipselink.jpa.wdf.test/src/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java	(working copy)
@@ -20,11 +20,11 @@
 public abstract class JPA1Base extends AbstractBaseTest {
 
     private static final String[] CLEARABLE_TABLE_NAMES = { "TMP_EMP_CREDIT", "TMP_CREDIT_ACC", "TMP_BROKER_ACC",
-            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_DEP", "TMP_REVIEW_DETAILS",
+            "TMP_SAVE_ACC", "TMP_MARGIN_ACC", "TMP_CHECK_ACC", "TMP_EMP_PROJECT", "TMP_REVIEW_DETAILS",
             "TMP_EMP_REVIEW", "TMP_BASIC_TYPES_FA", "TMP_TEMPORAL_FA", "TMP_BASIC_TYPES_PA", "TMP_NODE", "TMP_EMBEDD_FA",
             "TMP_EMBEDD_PA", "TMP_ISLAND", "TMP_EMP_PATENT", "TMP_PROJECT_DETAILS", "TMP_PROFILE", "TMP_CASC_NODE",
             "TMP_COURSE_EMP", "TMP_COURSE", "TMP_REVIEW", "TMP_PATENT", "TMP_CASC_NODE_DESC", "TMP_EMP_HOBBY", "TMP_HOBBY",
-            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
+            "TMP_EMP_BICYCLE", "TMP_VEHICLE", "TMP_EMP", "TMP_DEP", "TMP_OFFICE_CUBICLE", "TMP_OFFICE", "TMP_ALLRELATIONS", "TMP_CUBICLE",
             "TMP_ALLRELATIONS_LIST", "TMP_ALLRELATIONS_SET", "TMP_ALLRELATIONS_COLLECTION", "TMP_ALLRELATIONS_MAPID",
             "TMP_ALLRELATIONS_MAPFIELD", "TMP_TASK", "TMP_PROJECT", "TMP_CITY", "TMP_CITY_TMP_COP", "TMP_CITY_TMP_CRIMINAL",
             "TMP_COP", "TMP_COP_TMP_CRIMINAL", "TMP_COP_TMP_INFORMER", "TMP_CRIMINAL", "TMP_CRIMINAL_TMP_CRIMINAL",