Index: src/java/org/apache/jdo/tck/query/result/VariableInResult.java
===================================================================
--- src/java/org/apache/jdo/tck/query/result/VariableInResult.java	(revision 386531)
+++ src/java/org/apache/jdo/tck/query/result/VariableInResult.java	(working copy)
@@ -20,6 +20,7 @@
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.query.QueryElementHolder;
 import org.apache.jdo.tck.query.QueryTest;
@@ -52,12 +53,12 @@
     private static final QueryElementHolder[] VALID_QUERIES = {
         new QueryElementHolder(
         /*UNIQUE*/      null,
-        /*RESULT*/      "distinct p",
+        /*RESULT*/      "distinct e",
         /*INTO*/        null, 
-        /*FROM*/        Employee.class,
+        /*FROM*/        Department.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "projects.contains(p) & p.name == 'orange'",
-        /*VARIABLES*/   "Project p",
+        /*WHERE*/       "deptid==2 & employees.contains(e)",
+        /*VARIABLES*/   "Employee e",
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
         /*GROUP BY*/    null,
@@ -66,12 +67,12 @@
         /*TO*/          null),
         new QueryElementHolder(
         /*UNIQUE*/      null,
-        /*RESULT*/      "p",
+        /*RESULT*/      "e",
         /*INTO*/        null, 
-        /*FROM*/        Employee.class,
+        /*FROM*/        Department.class,
         /*EXCLUDE*/     null,
-        /*WHERE*/       "projects.contains(p) & p.name == 'orange'",
-        /*VARIABLES*/   "Project p",
+        /*WHERE*/       "deptid==2 & employees.contains(e)",
+        /*VARIABLES*/   "Employee e",
         /*PARAMETERS*/  null,
         /*IMPORTS*/     null,
         /*GROUP BY*/    null,
@@ -113,8 +114,10 @@
      */
     private Object[] expectedResult = {
         // this
-        getTransientCompanyModelInstancesAsList(new String[]{"proj1"}),
-        getTransientCompanyModelInstancesAsList(new String[]{"proj1","proj1","proj1"}),
+        getTransientCompanyModelInstancesAsList(
+                new String[]{"emp4","emp5"}),
+        getTransientCompanyModelInstancesAsList(
+                new String[]{"emp4","emp5"}),
         // Note: "orange" is not a bean name!
         Arrays.asList(new Object[]{new Object[]{new Long(1), "orange"}}),
         Arrays.asList(new Object[]{