diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java
index 10c2d3eb..04afda31 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EvictionConfiguration.java
@@ -63,6 +63,7 @@ import org.springframework.util.StringUtils;
  * Spring {@link Configuration} class used to enable Eviction policy configuration on cache {@link Region Regions}.
  *
  * @author John Blum
+ * @see org.apache.geode.cache.AttributesMutator
  * @see org.apache.geode.cache.EvictionAttributes
  * @see org.apache.geode.cache.Region
  * @see org.apache.geode.cache.RegionAttributes
@@ -387,7 +388,6 @@ public class EvictionConfiguration extends AbstractAnnotationConfigSupport
 		 * @param evictionAttributes {@link EvictionAttributes} specifying the Eviction policy configuration
 		 * for a {@link Region}.
 		 * @see org.apache.geode.cache.EvictionAttributes
-		 * @see EvictionPolicyMetadata#EvictionPolicyMetadata(EvictionAttributes, String[])
 		 */
 		protected EvictionPolicyMetadata(EvictionAttributes evictionAttributes) {
 			this(evictionAttributes, ALL_REGIONS);
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java
index 47315fd3..79197a2f 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java
@@ -566,11 +566,10 @@ public class SimpleGemfireRepositoryUnitTests {
 
 		Region mockRegion = mockRegion("Example");
 
-		SelectResults mockSelectResults = mock(SelectResults.class);
+		SelectResults mockSelectResults = mockSelectResults(results);
 
 		doReturn(mockRegion).when(mockTemplate).getRegion();
 		doReturn(mockSelectResults).when(mockTemplate).find(anyString());
-		doReturn(results).when(mockSelectResults).asList();
 
 		SimpleGemfireRepository repository = new SimpleGemfireRepository(mockTemplate, mockEntityInformation());
 
@@ -595,11 +594,10 @@ public class SimpleGemfireRepositoryUnitTests {
 
 		Region mockRegion = mockRegion("Example");
 
-		SelectResults mockSelectResults = mock(SelectResults.class);
+		SelectResults mockSelectResults = mockSelectResults(results);
 
 		doReturn(mockRegion).when(mockTemplate).getRegion();
 		doReturn(mockSelectResults).when(mockTemplate).find(anyString());
-		doReturn(results).when(mockSelectResults).asList();
 
 		SimpleGemfireRepository repository = new SimpleGemfireRepository(mockTemplate, mockEntityInformation());
 
@@ -617,6 +615,7 @@ public class SimpleGemfireRepositoryUnitTests {
 	}
 
 	// Page Numbers are 0 based indexed
+	@SuppressWarnings("varargs")
 	private void assertPage(Page page, int pageNumber, int pageSize, int total, Sort orderBy, User... content) {
 
 		int totalPages = (total / pageSize) + (total % pageSize > 0 ? 1 : 0);
@@ -1145,9 +1144,7 @@ public class SimpleGemfireRepositoryUnitTests {
 
 		List<User> users = Arrays.asList(User.newUser("Jon Doe"), User.newUser("Jane Doe"));
 
-		SelectResults<User> mockSelectResults = mock(SelectResults.class);
-
-		doReturn(users).when(mockSelectResults).asList();
+		SelectResults<User> mockSelectResults = mockSelectResults(users);
 
 		List<User> userList = new SimpleGemfireRepository<>(newGemfireTemplate(mockRegion()), mockEntityInformation())
 			.toList((SelectResults) mockSelectResults);
@@ -1161,13 +1158,24 @@ public class SimpleGemfireRepositoryUnitTests {
 	@Test
 	public void toListFromNullSelectResultsIsNullSafe() {
 
-		List<User> users = new SimpleGemfireRepository<>(newGemfireTemplate(mockRegion()), mockEntityInformation())
-			.toList((SelectResults) null);
+		List<User> users = new SimpleGemfireRepository<>(newGemfireTemplate(mockRegion()), mock(EntityInformation.class))
+			.toList(mockSelectResults(null));
 
 		assertThat(users).isNotNull();
 		assertThat(users).isEmpty();
 	}
 
+	private <T> SelectResults<T> mockSelectResults(@Nullable List<T> list) {
+
+		if (list != null) {
+			SelectResults<T> mockSelectResults = mock(SelectResults.class);
+			doReturn(list).when(mockSelectResults).asList();
+			return mockSelectResults;
+		}
+
+		return null;
+	}
+
 	@Test
 	public void toPageFromIterable() {