Index: test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
===================================================================
--- test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java	(Arbeitskopie)
@@ -73,7 +73,7 @@
     public static final float FLOAT_LARGEST  =  999999999999.9f;
     public static final float[] float_values =
         { FLOAT_SMALLEST, FLOAT_LARGEST, 0.0f, 100.0f, 100.0f,
-        50000000.0f, -234.23f, 1000000000.0f, 350.5f, -25.5f };
+        50000000.0f, -234.25f, 1000000000.0f, 350.5f, -25.5f };
     public static final int[] int_values =
         { veryLargeNegativeInt, veryLargePositiveInt, 0, 100, 100, 1000, -1000, 1000000, -1000000, 10000};
     public static final long[] long_values =
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java	(Arbeitskopie)
@@ -170,13 +170,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -1191,4 +1186,12 @@
         query.close(query_result);
         tx.rollback();
     }
+
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java	(Arbeitskopie)
@@ -170,13 +170,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -1203,4 +1198,11 @@
         tx.rollback();
     }
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java	(Arbeitskopie)
@@ -180,13 +180,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -430,7 +425,7 @@
         run_floatQuery(float_filterR, DoubleParameter, new Double(100.0f), 100.0f, 8);
         run_floatQuery(float_filterL, BigIntegerParameter, new BigInteger("0"), 0.0f, 9);
         run_floatQuery(float_filterR, BigIntegerParameter, new BigInteger("1000000000"), 1000000000.0f, 9);
-        run_floatQuery(float_filterL, BigDecimalParameter, new BigDecimal("-234.23"), -234.23f, 9);
+        run_floatQuery(float_filterL, BigDecimalParameter, new BigDecimal("-234.25"), -234.25f, 9);
         run_floatQuery(float_filterR, BigDecimalParameter, new BigDecimal("100.0"), 100.0f, 8);
         alltypes.setfloat(23.23f);
         run_floatQuery(float_filterObj, AllTypesParameter, alltypes, 23.23f, 10);
@@ -1278,5 +1273,12 @@
         tx.rollback();
     }
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java	(Arbeitskopie)
@@ -169,13 +169,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -1197,4 +1192,11 @@
         tx.rollback();
     }
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java	(Arbeitskopie)
@@ -169,13 +169,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -1197,4 +1192,11 @@
         tx.rollback();
     }
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java	(Arbeitskopie)
@@ -180,13 +180,8 @@
     /** */
     public void test() {
         pm = getPM();
-
-        verifyDataLoaded(pm);
         tx = pm.currentTransaction();
         runQueries();
-
-        pm.close();
-        pm = null;
     }
 
     /** */
@@ -398,8 +393,8 @@
         run_longQuery(long_filterObj, AllTypesParameter, alltypes, 100, 2);
         run_longQuery(long_filterVal, null, null, 1000000, 1);
     
-        run_floatQuery(float_filterL, floatParameter, new Float(-234.23f), -234.23f, 1);
-        run_floatQuery(float_filterR, floatParameter, new Float(-234.23f), -234.23f, 1);
+        run_floatQuery(float_filterL, floatParameter, new Float(-234.25f), -234.25f, 1);
+        run_floatQuery(float_filterR, floatParameter, new Float(-234.25f), -234.25f, 1);
         run_floatQuery(float_filterL, FloatParameter, new Float(0.0), 0.0f, 1);
         run_floatQuery(float_filterR, FloatParameter, new Float(4.0), 4.0f, 0);
         run_floatQuery(float_filterL, byteParameter, new Byte((byte)0), 0.0f, 1);
@@ -1283,5 +1278,11 @@
         tx.rollback();
     }
 
-
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(AllTypes.class);
+        AllTypes.load(getPM());
+    }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java	(Revision 357451)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java	(Arbeitskopie)
@@ -28,7 +28,6 @@
 import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
 
 public abstract class ComparisonTests extends JDO_Test {    
-    protected   PersistenceManager  pm;
     protected   Query               query;
     protected   Transaction         tx;
     protected   Collection          query_result;
@@ -57,42 +56,6 @@
     protected static    String      AllTypesParameter = "org.apache.jdo.tck.pc.fieldtypes.AllTypes value";
     
     /** */
-    protected void verifyDataLoaded(PersistenceManager pm)
-    {
-        Transaction tx = pm.currentTransaction();
-        int cnt = 0;
-        try {
-        	tx.begin();
-        	Extent e = pm.getExtent(AllTypes.class, false);
-        	Iterator i = e.iterator();
-        	while(i.hasNext()){
-        		Object o = i.next();
-        		cnt++;
-        	}
-        	e.close(i);
-            tx.rollback();
-        
-        	if (cnt == AllTypes.NUM_VALUES)
-        		return;
-        
-        	tx.begin();
-        	i = e.iterator();
-        	while (i.hasNext()) {
-        		Object o = i.next();
-        		pm.deletePersistent(o);
-        	}
-        	e.close(i);
-        	tx.commit();
-        }
-        finally {
-            if ((tx !=null) && tx.isActive())
-                tx.rollback();
-        }
-        AllTypes.load(pm);
-    }
-
-
-    /** */
     protected void fail(String assertion, String message, String filter, String parameter)
     {
         StringBuffer buf = new StringBuffer();