diff --git a/src/test/org/apache/commons/lang/enum/Broken1Enum.java b/src/test/org/apache/commons/lang/enum/Broken1Enum.java
index 783a17808..ea4377136 100644
--- a/src/test/org/apache/commons/lang/enum/Broken1Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Broken1Enum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Broken color enumeration.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: Broken1Enum.java,v 1.1 2002/11/02 13:17:06 scolebourne Exp $
+ * @version $Id: Broken1Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public final class Broken1Enum extends Enum {
     public static final Broken1Enum RED = new Broken1Enum("Red");
diff --git a/src/test/org/apache/commons/lang/enum/Broken2Enum.java b/src/test/org/apache/commons/lang/enum/Broken2Enum.java
index 5f7eee683..d83cd2f00 100644
--- a/src/test/org/apache/commons/lang/enum/Broken2Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Broken2Enum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Broken color enumeration.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: Broken2Enum.java,v 1.1 2002/11/02 13:17:06 scolebourne Exp $
+ * @version $Id: Broken2Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public final class Broken2Enum extends Enum {
     public static final Broken2Enum RED = new Broken2Enum("Red");
diff --git a/src/test/org/apache/commons/lang/enum/Broken3Enum.java b/src/test/org/apache/commons/lang/enum/Broken3Enum.java
index c09afce14..3c35a9b39 100644
--- a/src/test/org/apache/commons/lang/enum/Broken3Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Broken3Enum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Broken color enumeration.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: Broken3Enum.java,v 1.1 2002/11/02 13:17:06 scolebourne Exp $
+ * @version $Id: Broken3Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public final class Broken3Enum extends Enum {
     public static final Broken3Enum RED = new Broken3Enum("Red");
diff --git a/src/test/org/apache/commons/lang/enum/ColorEnum.java b/src/test/org/apache/commons/lang/enum/ColorEnum.java
index 3c3f6a0cd..038ac2cc5 100644
--- a/src/test/org/apache/commons/lang/enum/ColorEnum.java
+++ b/src/test/org/apache/commons/lang/enum/ColorEnum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Color enumeration.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: ColorEnum.java,v 1.1 2002/08/11 23:17:54 scolebourne Exp $
+ * @version $Id: ColorEnum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 
 public final class ColorEnum extends Enum {
diff --git a/src/test/org/apache/commons/lang/enum/EnumTest.java b/src/test/org/apache/commons/lang/enum/EnumTest.java
index 954e1fac7..ca1b79026 100644
--- a/src/test/org/apache/commons/lang/enum/EnumTest.java
+++ b/src/test/org/apache/commons/lang/enum/EnumTest.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,11 +62,12 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.commons.lang.SerializationUtils;
+
 /**
  * Test cases for the {@link Enum} class.
  *
  * @author Stephen Colebourne
- * @version $Id: EnumTest.java,v 1.6 2003/02/04 18:30:08 scolebourne Exp $
+ * @version $Id: EnumTest.java,v 1.7 2003/05/22 22:00:06 scolebourne Exp $
  */
 
 public final class EnumTest extends TestCase {
diff --git a/src/test/org/apache/commons/lang/enum/EnumTestSuite.java b/src/test/org/apache/commons/lang/enum/EnumTestSuite.java
index 898b8a089..e879e0138 100644
--- a/src/test/org/apache/commons/lang/enum/EnumTestSuite.java
+++ b/src/test/org/apache/commons/lang/enum/EnumTestSuite.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,11 +57,12 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
+
 /**
  * Test suite for the Enum package.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: EnumTestSuite.java,v 1.1 2002/08/11 23:17:54 scolebourne Exp $
+ * @version $Id: EnumTestSuite.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public class EnumTestSuite extends TestCase {
     
diff --git a/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java b/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java
index 2db357bf9..eec3e2983 100644
--- a/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java
+++ b/src/test/org/apache/commons/lang/enum/EnumUtilsTest.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@ import junit.framework.TestSuite;
  * Test cases for the {@link Enum} class.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: EnumUtilsTest.java,v 1.2 2003/04/08 23:45:16 ggregory Exp $
+ * @version $Id: EnumUtilsTest.java,v 1.3 2003/05/22 22:00:06 scolebourne Exp $
  */
 
 public final class EnumUtilsTest extends TestCase {
diff --git a/src/test/org/apache/commons/lang/enum/Extended1Enum.java b/src/test/org/apache/commons/lang/enum/Extended1Enum.java
index 28b8aa0a3..22bb163a3 100644
--- a/src/test/org/apache/commons/lang/enum/Extended1Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Extended1Enum.java
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Base extended enumeration.
  *
  * @author Stephen Colebourne
- * @version $Id: Extended1Enum.java,v 1.1 2003/02/04 18:30:08 scolebourne Exp $
+ * @version $Id: Extended1Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public class Extended1Enum extends Enum {
     public static final Extended1Enum ALPHA = new Extended1Enum("Alpha");
diff --git a/src/test/org/apache/commons/lang/enum/Extended2Enum.java b/src/test/org/apache/commons/lang/enum/Extended2Enum.java
index 2c83bb390..0f9e28f27 100644
--- a/src/test/org/apache/commons/lang/enum/Extended2Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Extended2Enum.java
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Extended enumeration.
  *
  * @author Stephen Colebourne
- * @version $Id: Extended2Enum.java,v 1.1 2003/02/04 18:30:08 scolebourne Exp $
+ * @version $Id: Extended2Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public class Extended2Enum extends Extended1Enum {
     public static final Extended1Enum GAMMA = new Extended2Enum("Gamma");
diff --git a/src/test/org/apache/commons/lang/enum/Extended3Enum.java b/src/test/org/apache/commons/lang/enum/Extended3Enum.java
index c9c671ba8..d1b412900 100644
--- a/src/test/org/apache/commons/lang/enum/Extended3Enum.java
+++ b/src/test/org/apache/commons/lang/enum/Extended3Enum.java
@@ -53,15 +53,15 @@
  */
 package org.apache.commons.lang.enum;
 
-import java.util.Map;
-import java.util.List;
-import java.lang.String;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Extended enumeration.
  *
  * @author Stephen Colebourne
- * @version $Id: Extended3Enum.java,v 1.1 2003/02/04 18:30:08 scolebourne Exp $
+ * @version $Id: Extended3Enum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public class Extended3Enum extends Extended2Enum {
     public static final Extended1Enum DELTA = new Extended3Enum("Delta");
diff --git a/src/test/org/apache/commons/lang/enum/OperationEnum.java b/src/test/org/apache/commons/lang/enum/OperationEnum.java
index 23bfcbf4d..0ab964f10 100644
--- a/src/test/org/apache/commons/lang/enum/OperationEnum.java
+++ b/src/test/org/apache/commons/lang/enum/OperationEnum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Operator enumeration.
  *
  * @author Stephen Colebourne
- * @version $Id: OperationEnum.java,v 1.1 2002/12/31 22:39:39 scolebourne Exp $
+ * @version $Id: OperationEnum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 public abstract class OperationEnum extends Enum {
     public static final OperationEnum PLUS = new OperationEnum("Plus") {
diff --git a/src/test/org/apache/commons/lang/enum/ValuedColorEnum.java b/src/test/org/apache/commons/lang/enum/ValuedColorEnum.java
index 34ec46619..7ef73b866 100644
--- a/src/test/org/apache/commons/lang/enum/ValuedColorEnum.java
+++ b/src/test/org/apache/commons/lang/enum/ValuedColorEnum.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,11 +56,12 @@ package org.apache.commons.lang.enum;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 /**
  * Color enumeration.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: ValuedColorEnum.java,v 1.1 2002/08/11 23:17:54 scolebourne Exp $
+ * @version $Id: ValuedColorEnum.java,v 1.2 2003/05/22 22:00:06 scolebourne Exp $
  */
 
 public final class ValuedColorEnum extends ValuedEnum {
diff --git a/src/test/org/apache/commons/lang/enum/ValuedEnumTest.java b/src/test/org/apache/commons/lang/enum/ValuedEnumTest.java
index 523302bf7..e96b4f668 100644
--- a/src/test/org/apache/commons/lang/enum/ValuedEnumTest.java
+++ b/src/test/org/apache/commons/lang/enum/ValuedEnumTest.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,11 +62,12 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.commons.lang.SerializationUtils;
+
 /**
  * Test cases for the {@link Enum} class.
  *
  * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
- * @version $Id: ValuedEnumTest.java,v 1.2 2002/10/13 18:42:06 sullis Exp $
+ * @version $Id: ValuedEnumTest.java,v 1.3 2003/05/22 22:00:06 scolebourne Exp $
  */
 
 public final class ValuedEnumTest extends TestCase {