diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
index 73e0c21..5bc56ee 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/MockClientCacheApplicationIntegrationTests.java
@@ -21,15 +21,15 @@ import java.util.Set;
 
 import javax.annotation.Resource;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java
index f6a1728..78dd1c2 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/CacheAndClientCacheFactorySpiesConfiguresMockCacheNameUnitTests.java
@@ -13,15 +13,12 @@
  *  or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
-
 package org.springframework.data.gemfire.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Properties;
 
-import org.junit.Test;
-
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.client.ClientCache;
@@ -29,6 +26,8 @@ import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 
+import org.junit.Test;
+
 import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport;
 
 /**
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
index c830561..e70a1a3 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockRegionDataAccessOperationsAndEventsUnitTests.java
@@ -32,15 +32,6 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
-
 import org.apache.geode.cache.CacheListener;
 import org.apache.geode.cache.CacheLoader;
 import org.apache.geode.cache.CacheWriter;
@@ -52,6 +43,15 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.RegionService;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+
 import org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport;
 
 /**
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java
index 713c36c..0ba9191 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/ClientServerIntegrationTests.java
@@ -21,14 +21,14 @@ import java.io.IOException;
 
 import javax.annotation.Resource;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.gemfire.PartitionedRegionFactoryBean;
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java
index b2b4819..9b4ee37 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/logging/slf4j/logback/TestAppenderUnitTests.java
@@ -18,7 +18,6 @@ package org.springframework.data.gemfire.tests.logging.slf4j.logback;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,6 +27,7 @@ import org.slf4j.LoggerFactory;
  * @author John Blum
  * @see org.junit.Test
  * @see org.slf4j.Logger
+ * @see org.slf4j.LoggerFactory
  * @see org.springframework.data.gemfire.tests.logging.slf4j.logback.TestAppender
  * @since 0.0.5.RELEASE
  */
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java
index 76844f9..b266515 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportIntegrationTests.java
@@ -13,7 +13,6 @@
  *  or implied. See the License for the specific language governing
  *  permissions and limitations under the License.
  */
-
 package org.springframework.data.gemfire.tests.mock;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,8 +22,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
+
 import org.junit.After;
 import org.junit.Test;
+
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.data.gemfire.tests.support.AbstractSecurityManager;
@@ -39,6 +40,7 @@ import org.springframework.data.gemfire.tests.support.AbstractSecurityManager;
  * @see org.apache.geode.cache.CacheFactory
  * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport
  * @see org.springframework.data.gemfire.tests.mock.GemFireMockObjectsSupport
+ * @see org.springframework.data.gemfire.tests.support.AbstractSecurityManager
  * @since 1.0.0
  */
 public class GemFireMockObjectsSupportIntegrationTests extends IntegrationTestsSupport {
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
index 71e73b7..38255b4 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupportUnitTests.java
@@ -21,15 +21,15 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.junit.After;
-import org.junit.Test;
-
 import org.apache.geode.cache.AttributesMutator;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.RegionService;
 import org.apache.geode.cache.server.ClientSubscriptionConfig;
 
+import org.junit.After;
+import org.junit.Test;
+
 /**
  * Unit tests for {@link GemFireMockObjectsSupport}.
  *
diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java
index 944aefc..68f1310 100644
--- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java
+++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/mock/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java
@@ -20,8 +20,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.util.Properties;
 
 import org.apache.geode.cache.GemFireCache;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.gemfire.config.annotation.EnableSecurity;
 import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
@@ -32,8 +34,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests for GemFire/Geode {@link Object} creation when the GemFire/Geode {@link Object} configuration
- * and {@link Class} type is expressed in GemFire/Geode {@link Properties}.
+ * Integration Tests for Apache Geode & Pivotal GemFire {@link Object} creation when the {@link Object} configuration
+ * and {@link Class} type is expressed in {@link Properties}.
  *
  * @author John Blum
  * @see org.junit.Test