diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
similarity index 98%
rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
rename to maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index a1a15d1857..d074ba89d8 100644
--- a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/ArtifactComponentTestCase.java
+++ b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -32,10 +32,10 @@ import java.util.List;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
- * @version $Id: ArtifactComponentTestCase.java,v 1.5 2004/10/23 13:33:59
+ * @version $Id: AbstractArtifactComponentTestCase.java,v 1.5 2004/10/23 13:33:59
  *          jvanzyl Exp $
  */
-public abstract class ArtifactComponentTestCase
+public abstract class AbstractArtifactComponentTestCase
     extends PlexusTestCase
 {
     protected abstract String component();
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java
deleted file mode 100644
index 9c5f39b1d0..0000000000
--- a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/NewLayoutArtifactComponentTestCase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.artifact;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
- * @version $Id: ArtifactComponentTestCase.java,v 1.5 2004/10/23 13:33:59
- *          jvanzyl Exp $
- */
-public abstract class NewLayoutArtifactComponentTestCase
-    extends ArtifactComponentTestCase
-{
-    protected String getRepositoryLayout()
-    {
-        return "default";
-    }
-}
-
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
index 7d0635afd7..c795db31b1 100644
--- a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
+++ b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
@@ -16,8 +16,8 @@ package org.apache.maven.artifact.deployer;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactComponentTestCase;
 
 import java.io.File;
 
@@ -26,7 +26,7 @@ import java.io.File;
  * @version $Id$
  */
 public class ArtifactDeployerTest
-    extends ArtifactComponentTestCase
+    extends AbstractArtifactComponentTestCase
 {
     private ArtifactDeployer artifactDeployer;
 
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
index 47105364dd..f252d03a27 100644
--- a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
+++ b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
@@ -16,8 +16,8 @@ package org.apache.maven.artifact.installer;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactComponentTestCase;
 
 import java.io.File;
 
@@ -26,7 +26,7 @@ import java.io.File;
  * @version $Id$
  */
 public class ArtifactInstallerTest
-    extends ArtifactComponentTestCase
+    extends AbstractArtifactComponentTestCase
 {
     private ArtifactInstaller artifactInstaller;
 
diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 2730153ea5..2343351533 100644
--- a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -16,11 +16,11 @@ package org.apache.maven.artifact.resolver;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactComponentTestCase;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.metadata.ResolutionGroup;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import java.util.Set;
  * @version $Id$
  */
 public class ArtifactResolverTest
-    extends ArtifactComponentTestCase
+    extends AbstractArtifactComponentTestCase
 {
     private ArtifactResolver artifactResolver;
 
@@ -98,7 +98,8 @@ public class ArtifactResolverTest
 
         ArtifactMetadataSource mds = new ArtifactMetadataSource()
         {
-            public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
+            public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
+                                             List remoteRepositories )
                 throws ArtifactMetadataRetrievalException
             {
                 Set dependencies = new HashSet();
@@ -145,7 +146,8 @@ public class ArtifactResolverTest
 
         ArtifactMetadataSource mds = new ArtifactMetadataSource()
         {
-            public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
+            public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
+                                             List remoteRepositories )
                 throws ArtifactMetadataRetrievalException
             {
                 Set dependencies = new HashSet();