diff --git a/src/test/org/apache/commons/logging/LoadTest.java b/src/test/org/apache/commons/logging/LoadTest.java
index 24b1121..65fdc3e 100644
--- a/src/test/org/apache/commons/logging/LoadTest.java
+++ b/src/test/org/apache/commons/logging/LoadTest.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/LoadTest.java,v 1.1 2003/03/01 09:55:07 baliuka Exp $
- * $Revision: 1.1 $
- * $Date: 2003/03/01 09:55:07 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/LoadTest.java,v 1.2 2003/07/18 14:11:45 rsitze Exp $
+ * $Revision: 1.2 $
+ * $Date: 2003/07/18 14:11:45 $
  *
  * ====================================================================
  *
@@ -61,14 +61,14 @@
 
 package org.apache.commons.logging;
 
-import junit.framework.*;
-
-import org.apache.commons.logging.impl.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /**
  * testcase to emulate container and application isolated from container
  * @author  baliuka
- * @version $Id: LoadTest.java,v 1.1 2003/03/01 09:55:07 baliuka Exp $
+ * @version $Id: LoadTest.java,v 1.2 2003/07/18 14:11:45 rsitze Exp $
  */
 public class LoadTest extends TestCase{
     //TODO: need some way to add service provider packages
diff --git a/src/test/org/apache/commons/logging/LogTest.java b/src/test/org/apache/commons/logging/LogTest.java
index c015b65..ec85cfa 100644
--- a/src/test/org/apache/commons/logging/LogTest.java
+++ b/src/test/org/apache/commons/logging/LogTest.java
@@ -1,7 +1,7 @@
 package org.apache.commons.logging;
 
-import org.apache.commons.logging.impl.SimpleLog;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 /**
  * 
diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java b/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
index 7a981ca..71252b3 100644
--- a/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
+++ b/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java,v 1.4 2003/04/10 22:40:37 rsitze Exp $
- * $Revision: 1.4 $
- * $Date: 2003/04/10 22:40:37 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java,v 1.5 2003/07/18 14:11:45 rsitze Exp $
+ * $Revision: 1.5 $
+ * $Date: 2003/07/18 14:11:45 $
  *
  * ====================================================================
  *
@@ -66,17 +66,13 @@ import java.io.InputStream;
 import java.util.Iterator;
 import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 
 /**
  * <p>TestCase for JDK 1.4 logging when running on a JDK 1.4 system with
@@ -84,7 +80,7 @@ import org.apache.commons.logging.LogFactory;
  * logger configured per the configuration properties.</p>
  *
  * @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2003/04/10 22:40:37 $
+ * @version $Revision: 1.5 $ $Date: 2003/07/18 14:11:45 $
  */
 
 public class CustomConfigTestCase extends DefaultConfigTestCase {
diff --git a/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java b/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
index 246f7ff..69c8cd3 100644
--- a/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
+++ b/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java,v 1.3 2003/04/10 22:40:37 rsitze Exp $
- * $Revision: 1.3 $
- * $Date: 2003/04/10 22:40:37 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java,v 1.4 2003/07/18 14:11:45 rsitze Exp $
+ * $Revision: 1.4 $
+ * $Date: 2003/07/18 14:11:45 $
  *
  * ====================================================================
  *
@@ -76,7 +76,7 @@ import org.apache.commons.logging.LogFactory;
  * should be automatically configured.</p>
  *
  * @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2003/04/10 22:40:37 $
+ * @version $Revision: 1.4 $ $Date: 2003/07/18 14:11:45 $
  */
 
 public class DefaultConfigTestCase extends TestCase {
@@ -134,10 +134,8 @@ public class DefaultConfigTestCase extends TestCase {
      */
     public void tearDown() {
         log = null;
-        if (factory != null) {
-            factory.releaseAll();
-            factory = null;
-        }
+        factory = null;
+        LogFactory.releaseAll();
     }
 
 
@@ -190,7 +188,7 @@ public class DefaultConfigTestCase extends TestCase {
 
     // Set up log instance
     protected void setUpLog(String name) throws Exception {
-        log = factory.getLog(name);
+        log = LogFactory.getLog(name);
     }
 
 
diff --git a/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java b/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java
index 0828ed1..5783bbb 100644
--- a/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java
+++ b/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java,v 1.3 2003/04/10 22:40:37 rsitze Exp $
- * $Revision: 1.3 $
- * $Date: 2003/04/10 22:40:37 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java,v 1.4 2003/07/18 14:11:45 rsitze Exp $
+ * $Revision: 1.4 $
+ * $Date: 2003/07/18 14:11:45 $
  *
  * ====================================================================
  *
@@ -68,11 +68,8 @@ import java.util.Iterator;
 import java.util.Properties;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
@@ -85,7 +82,7 @@ import org.apache.log4j.spi.LoggingEvent;
  * logger configured per the configuration properties.</p>
  *
  * @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2003/04/10 22:40:37 $
+ * @version $Revision: 1.4 $ $Date: 2003/07/18 14:11:45 $
  */
 
 public class CustomConfigTestCase extends DefaultConfigTestCase {
diff --git a/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java b/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java
index 40f0825..8ddd528 100644
--- a/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java
+++ b/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java,v 1.2 2003/04/10 22:40:37 rsitze Exp $
- * $Revision: 1.2 $
- * $Date: 2003/04/10 22:40:37 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java,v 1.3 2003/07/18 14:11:45 rsitze Exp $
+ * $Revision: 1.3 $
+ * $Date: 2003/07/18 14:11:45 $
  *
  * ====================================================================
  *
@@ -76,7 +76,7 @@ import org.apache.commons.logging.LogFactory;
  * should be automatically configured).</p>
  *
  * @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2003/04/10 22:40:37 $
+ * @version $Revision: 1.3 $ $Date: 2003/07/18 14:11:45 $
  */
 
 public class DefaultConfigTestCase extends TestCase {
@@ -134,10 +134,8 @@ public class DefaultConfigTestCase extends TestCase {
      */
     public void tearDown() {
         log = null;
-        if (factory != null) {
-            factory.releaseAll();
-            factory = null;
-        }
+        factory = null;
+        LogFactory.releaseAll();
     }
 
 
@@ -190,7 +188,7 @@ public class DefaultConfigTestCase extends TestCase {
 
     // Set up log instance
     protected void setUpLog(String name) throws Exception {
-        log = factory.getLog(name);
+        log = LogFactory.getLog(name);
     }