Index: test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
===================================================================
--- test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/lifecycle/StateTransitions.java	(working copy)
@@ -233,8 +233,8 @@
      */
     protected void localSetUp() {
         pm = getPM();
+        addTearDownClass(StateTransitionObj.class);
         generatePersistentInstances();
-        addTearDownClass(StateTransitionObj.class);
     }
     
     public void test() {
Index: test/java/org/apache/jdo/tck/query/sql/NewQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/sql/NewQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/sql/NewQuery.java	(working copy)
@@ -83,7 +83,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java
===================================================================
--- test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java	(working copy)
@@ -93,7 +93,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java	(working copy)
@@ -176,9 +176,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java	(working copy)
@@ -217,9 +217,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
===================================================================
--- test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java	(working copy)
@@ -244,7 +244,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
===================================================================
--- test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java	(working copy)
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/GetFetchPlan.java	(working copy)
@@ -158,7 +158,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java	(working copy)
@@ -104,7 +104,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java	(working copy)
@@ -100,8 +100,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/SetGrouping.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetGrouping.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetGrouping.java	(working copy)
@@ -75,7 +75,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java	(working copy)
@@ -90,7 +90,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/DeclareImports.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/DeclareImports.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/DeclareImports.java	(working copy)
@@ -154,7 +154,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetResultClass.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetResultClass.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetResultClass.java	(working copy)
@@ -81,7 +81,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java	(working copy)
@@ -139,8 +139,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/SetUnique.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetUnique.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetUnique.java	(working copy)
@@ -82,7 +82,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/DeclareParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/DeclareParameters.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/DeclareParameters.java	(working copy)
@@ -155,8 +155,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java	(working copy)
@@ -137,8 +137,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/QueryExtentions.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/QueryExtentions.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/QueryExtentions.java	(working copy)
@@ -80,7 +80,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java	(working copy)
@@ -87,8 +87,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/SetResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetResult.java	(working copy)
@@ -88,7 +88,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java	(working copy)
@@ -86,8 +86,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/CloseAll.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/CloseAll.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/CloseAll.java	(working copy)
@@ -98,8 +98,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SingleStringQuery.java	(working copy)
@@ -116,7 +116,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetFilter.java	(working copy)
@@ -92,8 +92,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java	(working copy)
@@ -117,9 +117,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java	(working copy)
@@ -81,7 +81,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java	(working copy)
@@ -156,8 +156,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/Close.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/Close.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/Close.java	(working copy)
@@ -128,8 +128,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/SetRange.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetRange.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetRange.java	(working copy)
@@ -74,7 +74,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java	(working copy)
@@ -87,7 +87,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/ChangeQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/ChangeQuery.java	(working copy)
@@ -98,7 +98,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java	(working copy)
@@ -121,8 +121,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/CompileQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/CompileQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/CompileQuery.java	(working copy)
@@ -92,7 +92,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java	(working copy)
@@ -158,7 +158,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java	(working copy)
@@ -99,7 +99,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java	(working copy)
@@ -85,8 +85,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewNamedQuery.java	(working copy)
@@ -93,7 +93,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java	(working copy)
@@ -185,7 +185,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/SetOrdering.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/SetOrdering.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/SetOrdering.java	(working copy)
@@ -132,7 +132,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/ExecuteQuery.java	(working copy)
@@ -160,8 +160,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java	(working copy)
@@ -78,8 +78,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
===================================================================
--- test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java	(working copy)
@@ -79,8 +79,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java	(working copy)
@@ -109,8 +109,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java	(working copy)
@@ -125,7 +125,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java	(working copy)
@@ -114,7 +114,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java	(working copy)
@@ -156,7 +156,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java	(working copy)
@@ -88,7 +88,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java	(working copy)
@@ -121,7 +121,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java	(working copy)
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java	(working copy)
@@ -93,7 +93,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java	(working copy)
@@ -66,9 +66,9 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         super.localSetUp();
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
     
     /** */
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java	(working copy)
@@ -304,8 +304,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java	(working copy)
@@ -314,8 +314,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
-        addTearDownClass(MylibReader.getTearDownClasses());
     }
 
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java	(working copy)
@@ -114,7 +114,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java	(working copy)
@@ -198,8 +198,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
     
     /** */
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java	(working copy)
@@ -124,8 +124,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java	(working copy)
@@ -206,7 +206,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java	(working copy)
@@ -94,7 +94,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java	(working copy)
@@ -96,7 +96,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java	(working copy)
@@ -150,8 +150,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java	(working copy)
@@ -79,7 +79,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java	(working copy)
@@ -163,8 +163,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java	(working copy)
@@ -378,8 +378,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java	(working copy)
@@ -190,7 +190,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java	(working copy)
@@ -77,7 +77,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java	(working copy)
@@ -105,7 +105,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java	(working copy)
@@ -136,8 +136,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java	(working copy)
@@ -138,7 +138,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java	(working copy)
@@ -100,7 +100,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java	(working copy)
@@ -160,7 +160,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java	(working copy)
@@ -99,8 +99,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
         NoExtent noExtent = new NoExtent(1);
         makePersistent(noExtent);
         addTearDownInstance(noExtent);
Index: test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java	(working copy)
@@ -185,8 +185,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java	(working copy)
@@ -98,6 +98,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         Employee employee = (Employee) getPersistentCompanyModelInstance("emp1");
         if (isNullCollectionSupported()) {
@@ -105,6 +106,5 @@
             employee.setProjects(null);
             getPM().currentTransaction().commit();
         }
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java	(working copy)
@@ -131,10 +131,10 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
+        addTearDownClass(PrimitiveTypes.class);
         PersistenceManager pm = getPM();
         loadAndPersistCompanyModel(pm);
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistPrimitiveTypes(pm);
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java	(working copy)
@@ -113,8 +113,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java	(working copy)
@@ -82,7 +82,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java	(working copy)
@@ -119,7 +119,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java	(working copy)
@@ -129,7 +129,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java	(working copy)
@@ -156,7 +156,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java	(working copy)
@@ -155,8 +155,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
 
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java	(working copy)
@@ -120,7 +120,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java	(working copy)
@@ -100,7 +100,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java	(working copy)
@@ -120,7 +120,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java	(working copy)
@@ -128,7 +128,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java	(working copy)
@@ -106,7 +106,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java	(working copy)
@@ -100,7 +100,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java	(working copy)
@@ -95,7 +95,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java	(working copy)
@@ -142,7 +142,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java	(working copy)
@@ -153,7 +153,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java	(working copy)
@@ -111,7 +111,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
\ No newline at end of file
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java	(working copy)
@@ -116,7 +116,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java	(working copy)
@@ -97,7 +97,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java	(working copy)
@@ -141,7 +141,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java	(working copy)
@@ -99,7 +99,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java	(working copy)
@@ -181,7 +181,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java	(working copy)
@@ -139,7 +139,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java	(working copy)
@@ -94,11 +94,11 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         getPM().currentTransaction().begin();
         Employee emp1 = (Employee) getPersistentCompanyModelInstance("emp1");
         emp1.setProjects(null);
         getPM().currentTransaction().commit();
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java	(working copy)
@@ -191,7 +191,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java	(working copy)
@@ -196,7 +196,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
-        addTearDownClass(PCPoint.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java	(working copy)
@@ -151,7 +151,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java	(working copy)
@@ -113,7 +113,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java	(working copy)
@@ -108,7 +108,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/Cast.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/Cast.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/Cast.java	(working copy)
@@ -108,7 +108,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java	(working copy)
@@ -155,7 +155,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
===================================================================
--- test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java	(working copy)
@@ -122,11 +122,11 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
         getPM().currentTransaction().begin();
         Employee emp1 = (Employee) getPersistentCompanyModelInstance("emp1");
         emp1.setProjects(null);
         getPM().currentTransaction().commit();
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java	(working copy)
@@ -173,7 +173,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
-        addTearDownClass(PrimitiveTypes.class);
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/Unique.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/Unique.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/Unique.java	(working copy)
@@ -141,7 +141,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/DistinctQuery.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DistinctQuery.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/DistinctQuery.java	(working copy)
@@ -148,7 +148,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java	(working copy)
@@ -114,7 +114,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java	(working copy)
@@ -471,7 +471,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/DefaultUnique.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DefaultUnique.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/DefaultUnique.java	(working copy)
@@ -141,7 +141,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/VariableInResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/VariableInResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/VariableInResult.java	(working copy)
@@ -121,7 +121,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/Having.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/Having.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/Having.java	(working copy)
@@ -127,7 +127,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/ResultExpressions.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/ResultExpressions.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/ResultExpressions.java	(working copy)
@@ -490,7 +490,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/DefaultResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DefaultResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/DefaultResult.java	(working copy)
@@ -91,7 +91,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/ShapeOfResult.java	(working copy)
@@ -328,7 +328,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/AggregateResult.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/AggregateResult.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/AggregateResult.java	(working copy)
@@ -634,7 +634,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java	(working copy)
@@ -138,8 +138,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
     
     private List addAll(List list1, List list2) {
Index: test/java/org/apache/jdo/tck/query/result/Grouping.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/Grouping.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/Grouping.java	(working copy)
@@ -129,7 +129,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/query/result/NullResults.java
===================================================================
--- test/java/org/apache/jdo/tck/query/result/NullResults.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/query/result/NullResults.java	(working copy)
@@ -140,7 +140,7 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
-        addTearDownClass(CompanyModelReader.getTearDownClasses());
     }
 }
Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
===================================================================
--- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java	(working copy)
@@ -64,8 +64,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint2.class);
         super.localSetUp();
-        addTearDownClass(PCPoint2.class);
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
===================================================================
--- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java	(working copy)
@@ -64,8 +64,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint2.class);
         super.localSetUp();
-        addTearDownClass(PCPoint2.class);
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
===================================================================
--- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java	(working copy)
@@ -68,8 +68,8 @@
      * @see JDO_Test#localSetUp()
      */
     protected void localSetUp() {
+        addTearDownClass(PCPoint2.class);
         super.localSetUp();
-        addTearDownClass(PCPoint2.class);
     }
 
     /** */
Index: test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
===================================================================
--- test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java	(working copy)
@@ -93,13 +93,13 @@
     }
 
     protected void makePersistent() {
+        addTearDownClass(PCPoint.class);
         pm = pmf.getPersistenceManager();
         Transaction tx = pm.currentTransaction();
         tx.begin();
         PCPoint comp = new PCPoint(1, 2);
         pm.makePersistent(comp);
         tx.commit();
-        addTearDownInstance(comp);
     }
 
     /**
Index: test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
===================================================================
--- test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java	(working copy)
@@ -36,12 +36,12 @@
      * @return the object id of the persistent instance
      */
     protected Object makePersistent(Object pc) {
+        addTearDownClass(pc.getClass());
         PersistenceManager pm = getPM();
         pm.currentTransaction().begin();
         pm.makePersistent(pc);
         Object result = JDOHelper.getObjectId(pc);
         pm.currentTransaction().commit();
-        addTearDownInstance(pc);
         return result;
     }
     
Index: test/java/org/apache/jdo/tck/mapping/CompletenessTest.java
===================================================================
--- test/java/org/apache/jdo/tck/mapping/CompletenessTest.java	(revision 355127)
+++ test/java/org/apache/jdo/tck/mapping/CompletenessTest.java	(working copy)
@@ -86,13 +86,13 @@
      */
     protected void localSetUp() {
         if (isTestToBePerformed()) {
+            addTearDownClass(CompanyModelReader.getTearDownClasses());
             getPM();
             CompanyFactoryRegistry.registerFactory(pm);
             CompanyModelReader reader = new CompanyModelReader(inputFilename);
             // persist test data
             pm.currentTransaction().begin();
             List rootList = reader.getRootList();
-            addTearDownClass(CompanyModelReader.getTearDownClasses());
             pm.makePersistentAll(rootList);
             rootOids = new ArrayList();
             for (Iterator i = rootList.iterator(); i.hasNext(); ) {