diff --git a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
index ac1a7f69..c897c6b4 100644
--- a/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
+++ b/core/src/test/java/org/springframework/ldap/NamingExceptionTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
index b386272c..53cf6314 100644
--- a/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
+++ b/core/src/test/java/org/springframework/ldap/authentication/DefaultValuesAuthenticationSourceDecoratorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.authentication;
 
 import org.junit.Before;
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
index 5679c548..86766f4a 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.control;
 
 import java.util.LinkedList;
diff --git a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
index 92480158..35727505 100644
--- a/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/PagedResultsDirContextProcessorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.control;
 
 import java.io.IOException;
diff --git a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
index 90ca4719..aff46d7e 100644
--- a/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.control;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
index 3831a617..e05d79a5 100644
--- a/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/control/SortControlDirContextProcessorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.control;
 
 import java.io.IOException;
diff --git a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
index f8ec2be9..4960b71b 100644
--- a/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/ContextMapperCallbackHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core;
 
 import javax.naming.Binding;
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
index 1dfce613..8da11e17 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterBugTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core;
 
 import javax.naming.Name;
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
index 6645c330..74532b5d 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameEditorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core;
 
 import org.junit.Before;
diff --git a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
index e68a46ce..b1b2fc25 100644
--- a/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/LdapRdnComponentTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core;
 
 import org.junit.Test;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
index 03e6fa6a..bc5d86de 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/AggregateDirContextProcessorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
index 779c13ea..8ade9b00 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/BaseLdapPathBeanPostProcessorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support;
 
 import java.util.HashMap;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
index 8c2ea608..aef8fbcf 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/CountNameClassPairResultCallbackHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support;
 
 import javax.naming.directory.SearchResult;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
index c4f28a3d..64bcda3b 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
index 372757e1..db3ac0ee 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/SimpleDirContextAuthenticationStrategyTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support;
 
 import java.util.Hashtable;
diff --git a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
index 97ef962e..6c14ccf8 100644
--- a/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
+++ b/core/src/test/java/org/springframework/ldap/core/support/ldap294/Ldap294Tests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.core.support.ldap294;
 
 import java.util.Hashtable;
diff --git a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
index b2dca65c..4aa178df 100644
--- a/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/HardcodedFilterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.filter;
 
 import com.gargoylesoftware.base.testing.EqualsTester;
diff --git a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
index a8208214..d7929cee 100644
--- a/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/NotPresentFilterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.filter;
 
 import com.gargoylesoftware.base.testing.EqualsTester;
diff --git a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
index 79947889..e7e22cc9 100644
--- a/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
+++ b/core/src/test/java/org/springframework/ldap/filter/PresentFilterTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.filter;
 
 import com.gargoylesoftware.base.testing.EqualsTester;
diff --git a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
index f121b514..ae460256 100644
--- a/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
+++ b/core/src/test/java/org/springframework/ldap/odm/core/impl/BaseUnitTestPerson.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2005-2015 the original author or authors.
  *
- * 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
+ * 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
  *
- * https://www.apache.org/licenses/LICENSE-2.0
+ *      https://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.
+ * 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.
  */
+
 package org.springframework.ldap.odm.core.impl;
 
 import java.util.List;
diff --git a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
index a7db16bc..1239adbe 100644
--- a/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool/AbstractPoolTestCase.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
index a2fe4551..169d4bc2 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
index ca3a1ddc..f174f78e 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingDirContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
index 714ac3c8..028de096 100644
--- a/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/DelegatingLdapContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
index 775bbdb5..30da15d5 100644
--- a/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/MutableDelegatingLdapContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool;
 
 import org.junit.Test;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
index 3d3d4ca2..a351b74a 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/DirContextPoolableObjectFactoryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool.factory;
 
 import java.lang.reflect.Field;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
index c38d02d1..771544bb 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/MutablePoolingContextSourceTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool.factory;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
index 1a3ec4fd..c73eff4b 100644
--- a/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/factory/PoolingContextSourceTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool.factory;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
index c64c3870..ad3bc9bb 100644
--- a/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool/validation/DefaultDirContextValidatorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool.validation;
 
 import javax.naming.NamingEnumeration;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
index 8154168a..1d71aa54 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/AbstractPoolTestCase.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
index 46528782..2c8b4e7b 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
index 41b05bc9..b6a9b442 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingDirContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import javax.naming.Context;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
index 95c8b48c..24779538 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DelegatingLdapContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java b/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
index bec859b2..63a01852 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/DummyEvictionPolicy.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import org.apache.commons.pool2.PooledObject;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
index 4f14c8e1..4db7475e 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/MutableDelegatingLdapContextTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2;
 
 import org.junit.Test;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
index dab65937..1a4e1f64 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/DirContextPooledObjectFactoryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2.factory;
 
 import java.lang.reflect.Field;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
index 0b63b924..c0b85d40 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/MutablePooledContextSourceTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2.factory;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
index 8f0c5093..579d9802 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PoolConfigTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2.factory;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
diff --git a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
index baf76172..9bdd6193 100644
--- a/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
+++ b/core/src/test/java/org/springframework/ldap/pool2/factory/PooledContextSourceTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.pool2.factory;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
index bf33b677..b183b08a 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationExecutorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.directory.BasicAttributes;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
index 771c3d13..777a69b4 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/BindOperationRecorderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.directory.BasicAttributes;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
index 07c4794f..f82e1bec 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapCompensatingTransactionOperationFactoryTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
index ba42ccbf..16bfd6c6 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/LdapTransactionUtilsTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
index 7df8cad2..18c22548 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/ModifyAttributesOperationExecutorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.Name;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
index dfa5424e..bfab43c9 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationExecutorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.directory.BasicAttributes;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
index f2104329..b9c0e115 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RebindOperationRecorderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.directory.BasicAttributes;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
index fcb91304..59517ab4 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/RenameOperationRecorderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import org.junit.Before;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
index 6f9e9a8e..3a26108d 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationExecutorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.ldap.LdapName;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
index 2e0b37e8..baa79e52 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/UnbindOperationRecorderTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating;
 
 import javax.naming.ldap.LdapName;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
index fb8b10be..e1443ae4 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/CompensatingTransactionUtilsTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.manager;
 
 import java.lang.reflect.Method;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
index f227bc05..ce2df7f0 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManagerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.manager;
 
 import java.sql.Connection;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
index 97bb9628..1d0e944b 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareContextSourceProxyTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.manager;
 
 import javax.naming.directory.DirContext;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
index 2fe32120..4c3b472d 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/manager/TransactionAwareDirContextInvocationHandlerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.manager;
 
 import javax.naming.NamingException;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
index 2e58cb16..3f85065c 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DefaultTempEntryRenamingStrategyTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.support;
 
 import javax.naming.Name;
diff --git a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
index 8beaf05c..f71da758 100644
--- a/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
+++ b/core/src/test/java/org/springframework/ldap/transaction/compensating/support/DifferentSubtreeTempEntryRenamingStrategyTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.transaction.compensating.support;
 
 import javax.naming.Name;
diff --git a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
index 3666f935..c53d2fc2 100644
--- a/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
+++ b/core/src/test/java/org/springframework/ldap/util/ListComparatorTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ldap.util;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
index 76c49bf2..0432d5d7 100644
--- a/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
+++ b/core/src/test/java/org/springframework/transaction/compensating/support/DefaultCompensatingTransactionOperationManagerTests.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.transaction.compensating.support;
 
 import java.util.Stack;