Index: test/java/org/apache/jdo/tck/pc/company/Department.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Department.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Department.java	(working copy)
@@ -87,7 +87,9 @@
      * @param id the id.
      */
     public void setDeptid(long id) {
-        throw new IllegalStateException("Id is already set.");
+        if (this.deptid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.deptid = id;
     }
 
     /**
Index: test/java/org/apache/jdo/tck/pc/company/Project.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Project.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Project.java	(working copy)
@@ -62,7 +62,9 @@
      * @param id the id.
      */
     public void setProjid(long id) {
-        throw new IllegalStateException("Id is already set.");
+        if (this.projid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.projid = id;
     }
 
     /**
Index: test/java/org/apache/jdo/tck/pc/company/Person.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Person.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Person.java	(working copy)
@@ -90,7 +90,9 @@
      * @param id the id.
      */
     public void setPersonid(long id) {
-        throw new IllegalStateException("Id is already set.");
+        if (this.personid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.personid = id;
     }
 
     /**
Index: test/java/org/apache/jdo/tck/pc/company/Company.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Company.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Company.java	(working copy)
@@ -86,7 +86,9 @@
      * @param id the id.
      */
     public void setCompanyid(long id) {
-        throw new IllegalStateException("Id is already set.");
+        if (this.companyid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.companyid = id;
     }
 
     /**
Index: test/java/org/apache/jdo/tck/pc/company/Address.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Address.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Address.java	(working copy)
@@ -71,7 +71,9 @@
      * @param id the id.
      */
     public void setAddrid(long id) {
-        throw new IllegalStateException("Id is already set.");
+        if (this.addrid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.addrid = id;
     }
 
     /** 
Index: test/java/org/apache/jdo/tck/pc/company/Insurance.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/company/Insurance.java	(revision 364688)
+++ test/java/org/apache/jdo/tck/pc/company/Insurance.java	(working copy)
@@ -71,8 +71,10 @@
      * Set the insurance ID.
      * @param insid The insurance ID value.
      */
-    public void setInsid(long insid) {
-        throw new IllegalStateException("Id is already set.");
+    public void setInsid(long id) {
+        if (this.insid != 0) 
+            throw new IllegalStateException("Id is already set.");
+        this.insid = id;
     }
 
     /**