Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java	(Arbeitskopie)
@@ -89,14 +89,16 @@
         result = q.execute();
         expected = new HashSet();
         expected.add(reader.getDepartment("dept1"));
+        expected.add(reader.getDepartment("dept2"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
 
         q = pm.newQuery(Employee.class, "team.isEmpty()");
         result = q.execute();
         expected = new HashSet();
         expected.add(reader.getFullTimeEmployee("emp1"));
-        expected.add(reader.getFullTimeEmployee("emp2"));
         expected.add(reader.getPartTimeEmployee("emp3"));
+        expected.add(reader.getPartTimeEmployee("emp4"));
+        expected.add(reader.getFullTimeEmployee("emp5"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         tx.commit();
Index: test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java	(Arbeitskopie)
@@ -95,6 +95,8 @@
         result = q.execute();
         expected = new HashSet();
         expected.add(reader.getMedicalInsurance("medicalIns1"));
+        expected.add(reader.getMedicalInsurance("medicalIns2"));
+        expected.add(reader.getMedicalInsurance("medicalIns3"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         tx.commit();
Index: test/java/org/apache/jdo/tck/query/jdoql/Cast.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/Cast.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/Cast.java	(Arbeitskopie)
@@ -87,6 +87,7 @@
         result = q.execute();
         expected = new HashSet();
         expected.add(reader.getFullTimeEmployee("emp1"));
+        expected.add(reader.getFullTimeEmployee("emp5"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         q = pm.newQuery(Department.class);
@@ -96,6 +97,7 @@
         result = q.execute();
         expected = new HashSet();
         expected.add(reader.getDepartment("dept1"));
+        expected.add(reader.getDepartment("dept2"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         tx.commit();
Index: test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java	(Arbeitskopie)
@@ -113,6 +113,7 @@
         q.declareVariables("Employee e1; Employee e2");
         result = q.execute();
         expected = new HashSet();
+        expected.add(reader.getDepartment("dept1"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         // Changed second contains to look for null medicalInsurance => 
@@ -125,7 +126,6 @@
         q.declareVariables("Employee e1; Employee e2");
         result = q.execute();
         expected = new HashSet();
-        expected.add(reader.getDepartment("dept1"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
         
         tx.commit();
Index: test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java	(Arbeitskopie)
@@ -102,6 +102,8 @@
         expected.add(reader.getFullTimeEmployee("emp1"));
         expected.add(reader.getFullTimeEmployee("emp2"));
         expected.add(reader.getPartTimeEmployee("emp3"));
+        expected.add(reader.getPartTimeEmployee("emp4"));
+        expected.add(reader.getFullTimeEmployee("emp5"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
             
         tx.commit();
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java	(Arbeitskopie)
@@ -113,6 +113,7 @@
         expected.add(reader.getFullTimeEmployee("emp1"));
         expected.add(reader.getFullTimeEmployee("emp2"));
         expected.add(reader.getPartTimeEmployee("emp3"));
+        expected.add(reader.getPartTimeEmployee("emp4"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
             
         // date parameter < date field
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java	(Revision 294784)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java	(Arbeitskopie)
@@ -98,6 +98,8 @@
         expected.add(reader.getFullTimeEmployee("emp1"));
         expected.add(reader.getFullTimeEmployee("emp2"));
         expected.add(reader.getPartTimeEmployee("emp3"));
+        expected.add(reader.getPartTimeEmployee("emp4"));
+        expected.add(reader.getFullTimeEmployee("emp5"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
             
         // string parameter < stringe field
@@ -106,6 +108,8 @@
         result = q.execute("emp2First");
         expected = new HashSet();
         expected.add(reader.getPartTimeEmployee("emp3"));
+        expected.add(reader.getPartTimeEmployee("emp4"));
+        expected.add(reader.getFullTimeEmployee("emp5"));
         checkQueryResultWithoutOrder(ASSERTION_FAILED, result, expected);
 
         tx.commit();
Index: test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
===================================================================
--- test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml	(Revision 294784)
+++ test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml	(Arbeitskopie)
@@ -7,14 +7,28 @@
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="dept1"/>
+                <ref local="company1"/>
             </list>
         </constructor-arg>
     </bean>
 
+    <bean id="company1" factory-bean="companyFactory" factory-method="newCompany">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <property name="departments">
+            <set>
+                <ref local="dept1"/>
+                <ref local="dept2"/>
+            </set>
+        </property>
+    </bean>
+
     <bean id="dept1" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
+        <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
                 <ref local="emp1"/>
@@ -22,8 +36,33 @@
                 <ref local="emp3"/>
             </set>
         </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
     </bean>
 
+    <bean id="dept2" factory-bean="companyFactory" factory-method="newDepartment">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+        <property name="company"><ref bean="company1"/></property>
+        <property name="employees">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+    </bean>
+
     <bean id="emp1" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp1First</value></constructor-arg>
@@ -33,14 +72,31 @@
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
+        <property name="weeklyhours"><value>40</value></property>
         <property name="medicalInsurance"><ref bean="medicalIns1"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns1"/></property>
         <property name="phoneNumbers">
-	    <map>
+	        <map>
                 <entry key="home"><value>1111</value></entry>
                 <entry key="work"><value>123456-1</value></entry>
             </map>
-	</property>
+	    </property>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp2"/></property>
+        <property name="protege"><ref bean="emp5"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+            </set>
+        </property>
     </bean>
     <bean id="emp2" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
@@ -51,13 +107,34 @@
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
+        <property name="weeklyhours"><value>40</value></property>
+        <property name="medicalInsurance"><ref bean="medicalIns2"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns2"/></property>
         <property name="phoneNumbers">
-	    <map>
+	        <map>
                 <entry key="home"><value>2222</value></entry>
                 <entry key="work"><value>123456-2</value></entry>
             </map>
-	</property>
+	    </property>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="mentor"><ref bean="emp3"/></property>
+        <property name="protege"><ref bean="emp1"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </property>
+        <property name="team">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
     </bean>
     <bean id="emp3" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
@@ -68,14 +145,103 @@
         <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
+        <property name="weeklyhours"><value>19</value></property>
+        <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
         <property name="phoneNumbers">
-	    <map>
+	        <map>
                 <entry key="home"><value>3333</value></entry>
                 <entry key="work"><value>123456-3</value></entry>
             </map>
-	</property>
+	    </property>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp4"/></property>
+        <property name="protege"><ref bean="emp2"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </property>
     </bean>
+    <bean id="emp4" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
+        <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
+        <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>13000</value></constructor-arg>
+        <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3343</value></entry>
+                <entry key="work"><value>124456-3</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp5"/></property>
+        <property name="protege"><ref bean="emp3"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="emp5" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
+        <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
+        <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
+        <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns5"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3363</value></entry>
+                <entry key="work"><value>126456-3</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp1"/></property>
+        <property name="protege"><ref bean="emp4"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </property>
+        <property name="hradvisees">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+            </set>
+        </property>
+    </bean>
 
     <bean id="addr1" factory-bean="companyFactory" factory-method="newAddress">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
@@ -108,4 +274,114 @@
         <constructor-arg index="2" type="java.lang.String"><value>PPO</value></constructor-arg>
         <property name="employee"><ref bean="emp1"/></property>
     </bean>
+
+    <bean id="medicalIns2" factory-bean="companyFactory" factory-method="newMedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="medicalIns3" factory-bean="companyFactory" factory-method="newMedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="medicalIns4" factory-bean="companyFactory" factory-method="newMedicalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="medicalIns5" factory-bean="companyFactory" factory-method="newMedicalInsurance">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="dentalIns1" factory-bean="companyFactory" factory-method="newDentalInsurance">
+        <constructor-arg index="0" type="long"><value>11</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp1"/></property>
+    </bean>
+
+    <bean id="dentalIns2" factory-bean="companyFactory" factory-method="newDentalInsurance">
+        <constructor-arg index="0" type="long"><value>12</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="dentalIns3" factory-bean="companyFactory" factory-method="newDentalInsurance">
+        <constructor-arg index="0" type="long"><value>13</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="dentalIns4" factory-bean="companyFactory" factory-method="newDentalInsurance">
+        <constructor-arg index="0" type="long"><value>14</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="dentalIns5" factory-bean="companyFactory" factory-method="newDentalInsurance">
+        <constructor-arg index="0" type="long"><value>15</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="proj1" factory-bean="companyFactory" factory-method="newProject">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+        <property name="members">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj2" factory-bean="companyFactory" factory-method="newProject">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj3" factory-bean="companyFactory" factory-method="newProject">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp1"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+    </bean>
 </beans>
+