diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
index 080b85c6..3d473ef4 100644
--- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
@@ -108,11 +108,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean {
 			if (StringUtils.hasText(poolName)) {
 				p = PoolManager.find(poolName);
 			}
-		   // Bind this client cache to a pool that hasn't been created yet.
 			
-		   // initialize a client-like Distributed System before initializing
-		   // the pool
-			 
+		   // Bind this client cache to a pool that hasn't been created yet.
 			if (p == null) {
 				PoolFactoryBean.connectToTemporaryDs();
 			}
diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml b/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml
index 51c8b910..32983f4a 100644
--- a/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest-context.xml
@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 	
-	<context:component-scan base-package="org.springframework.data.gemfire.function.config"/>
+	<context:component-scan base-package="org.springframework.data.gemfire.function.config" resource-pattern="**/AnnotationDrivenFunctionsTest*.class"/>
     
 	<gfe:annotation-driven/>