diff --git a/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java
index c4f785be..c3fb3836 100644
--- a/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/CacheIntegrationTest.java
@@ -16,6 +16,8 @@
 
 package org.springframework.data.gemfire;
 
+import static org.junit.Assert.assertEquals;
+
 import junit.framework.Assert;
 
 import org.junit.After;
@@ -36,10 +38,10 @@ import com.gemstone.gemfire.cache.Cache;
  * Made abstract to avoid multiple caches running at the same time.
  * 
  * @author Costin Leau
+ * @author John Blum
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="/org/springframework/data/gemfire/basic-cache.xml",
-		initializers=GemfireTestApplicationContextInitializer.class)
+@ContextConfiguration(locations = "basic-cache.xml", initializers = GemfireTestApplicationContextInitializer.class)
 public class CacheIntegrationTest {
 
 	@Autowired ApplicationContext ctx;
@@ -54,15 +56,15 @@ public class CacheIntegrationTest {
 	public void testCacheWithProps() throws Exception {
 		cache = ctx.getBean("cache-with-props", Cache.class);
 		// the name property seems to be ignored
-		Assert.assertEquals("cache-with-props", cache.getDistributedSystem().getName());
-		Assert.assertEquals("cache-with-props", cache.getName());
+		assertEquals("cache-with-props", cache.getDistributedSystem().getName());
+		assertEquals("cache-with-props", cache.getName());
 	}
 
 	@Test
 	public void testNamedCache() throws Exception {
 		cache = ctx.getBean("named-cache", Cache.class);
-		Assert.assertEquals("cache-with-props", cache.getDistributedSystem().getName());
-		Assert.assertEquals("cache-with-props", cache.getName());
+		assertEquals("named-cache", cache.getDistributedSystem().getName());
+		assertEquals("named-cache", cache.getName());
 	}
 
 	@Test
@@ -74,4 +76,4 @@ public class CacheIntegrationTest {
 	public void tearDown() {
 		if (cache!=null) cache.close();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java
index 18f972ef..f036ec63 100644
--- a/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/ColocatedRegionIntegrationTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.cache.Region;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.3.3
  */
-@ContextConfiguration("/org/springframework/data/gemfire/colocated-region.xml")
+@ContextConfiguration("colocated-region.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
 @SuppressWarnings("unused")
 public class ColocatedRegionIntegrationTest {
diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientReadyForEventsTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientReadyForEventsTest.java
index 35847128..b5fa7c66 100644
--- a/src/test/java/org/springframework/data/gemfire/client/ClientReadyForEventsTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/ClientReadyForEventsTest.java
@@ -31,16 +31,19 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="client-readyforevents-cache.xml",
-	initializers=GemfireTestApplicationContextInitializer.class)
+@ContextConfiguration(locations = "client-cache-ready-for-events.xml",
+	initializers = GemfireTestApplicationContextInitializer.class)
+@SuppressWarnings("unused")
 public class ClientReadyForEventsTest {
 	
-	@Autowired ApplicationContext ctx;
+	@Autowired
+	private ApplicationContext context;
 	
 	@Test
 	public void testReadyForEvents() throws Exception {
-		ClientCacheFactoryBean cfb = (ClientCacheFactoryBean) ctx.getBean("&gemfireCache");
-		Boolean readyforevents = (Boolean) TestUtils.readField("readyForEvents", cfb);
-		assertTrue( readyforevents );
+		ClientCacheFactoryBean clientCacheFactoryBean = context.getBean("&gemfireCache", ClientCacheFactoryBean.class);
+		Boolean readyForEvents = TestUtils.readField("readyForEvents", clientCacheFactoryBean);
+		assertTrue(readyForEvents);
 	}
+
 }
diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java
index 4707b4ac..259d6ca1 100644
--- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java
@@ -58,9 +58,9 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
  * @see com.gemstone.gemfire.cache.Region
  * @since 1.3.3
  */
-@ContextConfiguration(locations = "/org/springframework/data/gemfire/client/clientcache-with-region-using-cache-loader-writer.xml",
-	initializers = GemfireTestApplicationContextInitializer.class)
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "clientcache-with-region-using-cache-loader-writer.xml",
+	initializers = GemfireTestApplicationContextInitializer.class)
 @SuppressWarnings("unused")
 public class ClientRegionWithCacheLoaderWriterTest {
 
diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java
index 75841a29..f762b364 100644
--- a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java
+++ b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java
@@ -46,8 +46,8 @@ import com.gemstone.gemfire.cache.client.ClientCache;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.4.0
  */
-@ContextConfiguration("clientcache-with-subregion-config.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("clientcache-with-subregion-config.xml")
 @SuppressWarnings("unused")
 public class ClientSubRegionTest {
 
diff --git a/src/test/java/org/springframework/data/gemfire/config/CacheUsingPdxNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/CacheUsingPdxNamespaceTest.java
index 62021f6f..2b02e5a4 100644
--- a/src/test/java/org/springframework/data/gemfire/config/CacheUsingPdxNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/CacheUsingPdxNamespaceTest.java
@@ -43,9 +43,8 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.3.3
  */
-@ContextConfiguration(locations = "/org/springframework/data/gemfire/config/cache-using-pdx-ns.xml",
-	initializers = GemfireTestApplicationContextInitializer.class)
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "cache-using-pdx-ns.xml", initializers = GemfireTestApplicationContextInitializer.class)
 @SuppressWarnings("unused")
 public class CacheUsingPdxNamespaceTest {
 
diff --git a/src/test/java/org/springframework/data/gemfire/config/FunctionServiceNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/FunctionServiceNamespaceTest.java
index de690450..7ba1dd6e 100644
--- a/src/test/java/org/springframework/data/gemfire/config/FunctionServiceNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/FunctionServiceNamespaceTest.java
@@ -32,11 +32,13 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
 /**
  * @author Costin Leau
  * @author David Turanski
+ * @author John Blum
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="/org/springframework/data/gemfire/config/function-service-ns.xml",
-	initializers=GemfireTestApplicationContextInitializer.class)
+@ContextConfiguration(locations="function-service-ns.xml", initializers=GemfireTestApplicationContextInitializer.class)
+@SuppressWarnings("unused")
 public class FunctionServiceNamespaceTest  {
+
 	@Test
 	public void testFunctionsRegistered() throws Exception {
 		assertEquals(2, FunctionService.getRegisteredFunctions().size());
@@ -49,8 +51,6 @@ public class FunctionServiceNamespaceTest  {
 
 		@Override
 		public void execute(FunctionContext arg0) {
-			// TODO Auto-generated method stub
-
 		}
 
 		@Override
@@ -65,8 +65,6 @@ public class FunctionServiceNamespaceTest  {
 
 		@Override
 		public void execute(FunctionContext arg0) {
-			// TODO Auto-generated method stub
-
 		}
 
 		@Override
@@ -75,4 +73,5 @@ public class FunctionServiceNamespaceTest  {
 		}
 
 	}
-}
\ No newline at end of file
+
+}
diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java b/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java
index 6f41c48b..edca1118 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformationTest.java
@@ -84,6 +84,7 @@ public class DefaultGemfireEntityInformationTest {
 		assertEquals("Algorithms", entityInfo.getRegionName());
 		assertTrue(Algorithm.class.isAssignableFrom(entityInfo.getJavaType()));
 		assertEquals(String.class, entityInfo.getIdType());
+		assertEquals("QuickSort", entityInfo.getId(new QuickSort()));
 		assertEquals("Quick Sort", entityInfo.getId(createAlgorithm("Quick Sort")));
 	}
 
@@ -157,4 +158,12 @@ public class DefaultGemfireEntityInformationTest {
 		}
 	}
 
+	protected static class QuickSort implements Algorithm {
+
+		@Override
+		public String getName() {
+			return getClass().getSimpleName();
+		}
+	}
+
 }
diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java
index 079ab464..09faa738 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java
@@ -43,8 +43,8 @@ import com.gemstone.gemfire.cache.Region;
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @since 1.4.0
  */
-@ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
 @SuppressWarnings("unused")
 public class AlgorithmRepositoryTest {
 
diff --git a/src/test/resources/org/springframework/data/gemfire/GemfireTemplateIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/GemfireTemplateIntegrationTest-context.xml
index 2866f7ca..4f0b7f22 100644
--- a/src/test/resources/org/springframework/data/gemfire/GemfireTemplateIntegrationTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/GemfireTemplateIntegrationTest-context.xml
@@ -10,13 +10,13 @@
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 ">
 
-	<util:properties id="gemfireCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">GemfireTemplateIntegrationTest</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfireCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Users" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml b/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml
index 743a36af..2f7a2de0 100644
--- a/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/RegionLookupIntegrationTests-server-context.xml
@@ -4,18 +4,18 @@
 	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireRegionLookupsTestServer</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:cache-server auto-startup="true" port="54321" max-connections="1"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml b/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml
index 76d085d7..b56bc90c 100644
--- a/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/allowRegionBeanDefinitionOverridesTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
-		<prop key="name">springGemFireRegionBeanDefinitionOverridesAllowedTest</prop>
-		<prop key="log-level">config</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">AllowBeanDefinitionOverridesTest</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings" use-bean-factory-locator="false"/>
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
 	<gfe:replicated-region id="regionOne" name="AppDataRegion" persistent="false"
 						   multicast-enabled="true" scope="distributed-no-ack"
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-cache.xml b/src/test/resources/org/springframework/data/gemfire/basic-cache.xml
index 54ab4d52..01ecba1c 100644
--- a/src/test/resources/org/springframework/data/gemfire/basic-cache.xml
+++ b/src/test/resources/org/springframework/data/gemfire/basic-cache.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+	   default-lazy-init="true">
 
 	<!-- all beans are lazy to allow the same config to be used between multiple tests -->
 	<!-- as there can be only one cache per VM -->
 	<bean id="default-cache" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="properties">
 			<props>
+				<prop key="name">default-cache</prop>
+				<prop key="mcast-port">0</prop>
 				<prop key="log-level">warning</prop>
 			</props>
 		</property>
 	</bean>
-	
+
 	<bean id="cache-with-props" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="properties">
 			<props>
 				<prop key="name">cache-with-props</prop>
+				<prop key="mcast-port">0</prop>
 				<prop key="log-level">warning</prop>
 			</props>
 		</property>
@@ -26,7 +29,8 @@
 	<bean id="named-cache" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="properties">
 			<props>
-				<prop key="name">cache-with-props</prop>
+				<prop key="name">named-cache</prop>
+				<prop key="mcast-port">0</prop>
 				<prop key="log-level">warning</prop>
 			</props>
 		</property>
@@ -34,9 +38,23 @@
 
 	<bean id="cache-with-xml" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="cacheXml" value="classpath:gemfire-cache.xml"/>
+		<property name="properties">
+			<props>
+				<prop key="name">cache-with-xml</prop>
+				<prop key="mcast-port">0</prop>
+				<prop key="log-level">warning</prop>
+			</props>
+		</property>
 	</bean>
 
 	<bean id="pdx-cache" class="org.springframework.data.gemfire.CacheFactoryBean">
+		<property name="properties">
+			<props>
+				<prop key="name">pdx-cache</prop>
+				<prop key="mcast-port">0</prop>
+				<prop key="log-level">warning</prop>
+			</props>
+		</property>
 	</bean>
-	
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-region.xml b/src/test/resources/org/springframework/data/gemfire/basic-region.xml
index 9b457c76..46579e5f 100644
--- a/src/test/resources/org/springframework/data/gemfire/basic-region.xml
+++ b/src/test/resources/org/springframework/data/gemfire/basic-region.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-    default-lazy-init="true"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-        
-        <gfe:cache/>
-        <bean id="replicate-persistent-region" class="org.springframework.data.gemfire.RegionFactoryBean">
-            <property name="cache" ref="gemfireCache"/>
-            <property name="dataPolicy" value="REPLICATE_PERSISTENT"/>
-        </bean>
-        
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">BasicRegionConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<bean id="replicate-persistent-region" class="org.springframework.data.gemfire.RegionFactoryBean">
+		<property name="cache" ref="gemfireCache"/>
+		<property name="dataPolicy" value="REPLICATE_PERSISTENT"/>
+	</bean>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml b/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml
index ad750a24..07551124 100644
--- a/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml
+++ b/src/test/resources/org/springframework/data/gemfire/basic-subregion.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-    default-lazy-init="true"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">BasicSubRegionConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+    <gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
-	
-    <gfe:cache use-bean-factory-locator="false"/>
     <gfe:replicated-region id="parent"/>
+
     <bean name="/parent/child" class="org.springframework.data.gemfire.SubRegionFactoryBean">
         <property name="parent" ref="parent"/>
         <property name="regionName" value="child"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml b/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml
index 652d3a11..40b89dc3 100644
--- a/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml
+++ b/src/test/resources/org/springframework/data/gemfire/basic-tx-config.xml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
+	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
 
-	<bean id="cache" class="org.springframework.data.gemfire.CacheFactoryBean"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">BasicSubRegionConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<bean id="cache" class="org.springframework.data.gemfire.CacheFactoryBean">
+		<property name="properties" ref="gemfireProperties"/>
+	</bean>
 	
 	<bean id="transactionManager" class="org.springframework.data.gemfire.GemfireTransactionManager" p:cache-ref="cache"/>
 	
diff --git a/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml b/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml
index 22b93ed3..a0fbdc58 100644
--- a/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cache-server-with-subscription-disk-store.xml
@@ -9,12 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="cacheServerConfigurationSettings">
-		<prop key="name">springGemFireCacheServerWithClientSubscriptionTest</prop>
-		<prop key="log-level">config</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">CacheServerWithClientSubscriptionAndDiskStoreTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="cacheServerConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:disk-store id="testSubscriptionDiskStore" auto-compact="true" compaction-threshold="75" queue-size="50" max-oplog-size="10" time-interval="600000">
 		<gfe:disk-dir location="./gemfire/subscription-disk-store" max-size="50"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml b/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
index 20eb072f..09ac23a0 100644
--- a/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cache-with-declarable-ctx.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
-   <gfe:cache cache-xml-location="classpath:cache-with-declarable.xml"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">CacheWithDeclarableContextConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache cache-xml-location="classpath:cache-with-declarable.xml" properties-ref="gemfireProperties"/>
 
 	<bean id="bean" class="java.lang.Object"/>
-	
+
 	<bean abstract="true" class="org.springframework.data.gemfire.UserObject" p:prop1="Enescu" p:prop2-ref="bean"/>
-	
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml
index abea9752..68b74971 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectDisabledIntegrationTests.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfirePeerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">CacheAutoReconnectIntegrationTests</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
 			   enable-auto-reconnect="false" lazy-init="false"/>
 
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml
index e0bc54c7..19e7604a 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheAutoReconnectEnabledIntegrationTests.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfirePeerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">CacheAutoReconnectIntegrationTests</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
 			   enable-auto-reconnect="true" lazy-init="false"/>
 
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
index cfa051cf..748c6b63 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml
@@ -9,14 +9,14 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfirePeerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">CacheUsingSharedConfigurationIntegrationTest</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 		<prop key="locators">localhost[20668]</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
 			   use-cluster-configuration="true" cache-xml-location="/clusterconfig-cache.xml" lazy-init="false"/>
 
 	<gfe:lookup-region id="ClusterConfigRegion"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
index 9c839ccb..c2c42707 100644
--- a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml
@@ -9,14 +9,14 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfirePeerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">CacheNotUsingSharedConfigurationIntegrationTest</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 		<prop key="locators">localhost[20668]</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings" use-bean-factory-locator="false"
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"
 			   use-cluster-configuration="false" cache-xml-location="/clusterconfig-cache.xml" lazy-init="false"/>
 
 	<!-- Should throw an Exception! -->
diff --git a/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml b/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
index 367acbcb..d15c0ff0 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/basic-region.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
+	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
+	   default-lazy-init="true">
 
 	<!-- all beans are lazy to allow the same config to be used between multiple tests -->
 	<!-- as there can be only one cache per VM -->
 	<bean id="cache" class="org.springframework.data.gemfire.CacheFactoryBean">
 		<property name="properties">
 			<props>
+				<prop key="name">BasicRegionConfig</prop>
+				<prop key="mcast-port">0</prop>
 				<prop key="log-level">warning</prop>
 			</props>
 		</property>
@@ -58,4 +61,4 @@
 		</property>
 	</bean>
 	
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/client/client-cache-ready-for-events.xml b/src/test/resources/org/springframework/data/gemfire/client/client-cache-ready-for-events.xml
new file mode 100644
index 00000000..5ee14337
--- /dev/null
+++ b/src/test/resources/org/springframework/data/gemfire/client/client-cache-ready-for-events.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+">
+
+	<gfe:pool id="gemfire-pool" subscription-enabled="false">
+		<gfe:locator host="localhost" port="40403"/>
+	</gfe:pool>
+
+	<gfe:client-cache ready-for-events="true"/>
+
+	<gfe:client-region id="simple"/>
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/client/client-readyforevents-cache.xml b/src/test/resources/org/springframework/data/gemfire/client/client-readyforevents-cache.xml
deleted file mode 100644
index b1f3aef1..00000000
--- a/src/test/resources/org/springframework/data/gemfire/client/client-readyforevents-cache.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-	
-	 <gfe:client-cache ready-for-events="true"/>
-	 <gfe:client-region id="simple"/>
-
-	<gfe:pool id="gemfire-pool" subscription-enabled="false">
-		<gfe:locator host="localhost" port="40403"/>
-	</gfe:pool>
-	
-</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/client/datasource-server.xml b/src/test/resources/org/springframework/data/gemfire/client/datasource-server.xml
index a13f755c..64be3365 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/datasource-server.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/datasource-server.xml
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-lazy-init="true">
-	
-	<gfe:cache/>
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">DataSourceServerConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:cache-server/>
+
 	<gfe:replicated-region id="r1"/>
 	<gfe:replicated-region id="r2"/>
 	<gfe:replicated-region id="simple"/>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/client/servercache-with-region-for-client.xml b/src/test/resources/org/springframework/data/gemfire/client/servercache-with-region-for-client.xml
index d19f05ad..2961008c 100644
--- a/src/test/resources/org/springframework/data/gemfire/client/servercache-with-region-for-client.xml
+++ b/src/test/resources/org/springframework/data/gemfire/client/servercache-with-region-for-client.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">GemFireServerWithRegionForClientConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:cache-server auto-startup="true" port="54321"/>
+
 	<gfe:local-region id="localAppDataRegion" name="LocalAppData"/>
 
 	<gfe:replicated-region id="Parent" persistent="false">
diff --git a/src/test/resources/org/springframework/data/gemfire/colocated-region.xml b/src/test/resources/org/springframework/data/gemfire/colocated-region.xml
index 2206b09b..6a0bd857 100644
--- a/src/test/resources/org/springframework/data/gemfire/colocated-region.xml
+++ b/src/test/resources/org/springframework/data/gemfire/colocated-region.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd">
+        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">CollocatedRegionTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<!-- NOTE the order of Region bean definitions is important in reproducing the issue in JIRA 195 -->
 	<gfe:partitioned-region id="colocatedRegion" name="Colocated" colocated-with="Source"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml b/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml
index 22b6810c..046c3f93 100644
--- a/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml
+++ b/src/test/resources/org/springframework/data/gemfire/complex-subregion.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">ComplexSubRegionConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Customers" persistent="false">
 		<gfe:replicated-region name="Accounts"
diff --git a/src/test/resources/org/springframework/data/gemfire/config/DiskStoreBeanPostProcessorTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/DiskStoreBeanPostProcessorTest-context.xml
index a5495500..7d180319 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/DiskStoreBeanPostProcessorTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/DiskStoreBeanPostProcessorTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">DiskStoreBeanPostProcessorTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:disk-store id="DiskStoreOne">
 		<gfe:disk-dir location="./gemfire/disk-stores/ds1"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml
index 3793725c..2756b1a6 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/LocalRegionWithEvictionPolicyActionNamespaceTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">LocalRegionWithEvictionPolicyActionNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:local-region id="LocalDestroy" persistent="false">
 		<gfe:eviction action="LOCAL_DESTROY"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/MultipleCacheTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/MultipleCacheTest-context.xml
index ad53c2dc..70ff5ad8 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/MultipleCacheTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/MultipleCacheTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache close="false" use-bean-factory-locator="false"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">MultipleCacheTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache close="false" properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
 	<gfe:replicated-region id="region" ignore-if-exists="true"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/RegionEvictionAttributesNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/RegionEvictionAttributesNamespaceTest-context.xml
index e15c2b50..385654fe 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/RegionEvictionAttributesNamespaceTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/RegionEvictionAttributesNamespaceTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">RegionEvictionAttributesNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="One">
 		<gfe:eviction threshold="4096" type="ENTRY_COUNT"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml
index 53164758..cef30947 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/RegionWithSubRegionBeanDefinitionHashCodeTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">RegionWithSubRegionBeanDefinitionHashCodeTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<!-- NOTE non-parent Regions do not cause an infinite loop when calling hashCode on the BeanDefinition -->
 	<gfe:replicated-region id="NON_PARENT"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml
index abc1859d..74bb42c0 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest-context.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">RegionWithDiskStoreAndPersistenceEvictionSettingsTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:disk-store id="DiskStoreOne" auto-compact="true" compaction-threshold="75">
 		<gfe:disk-dir location="." max-size="1024"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml b/src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml
index 479f0cdb..a3376a9b 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/cache-eager-init.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">CacheEagerInitConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" lazy-init="false"/>
 
-	<gfe:cache lazy-init="false"/>
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/cache-using-pdx-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/cache-using-pdx-ns.xml
index 9cb6144e..e774ef83 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/cache-using-pdx-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/cache-using-pdx-ns.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
+	<util:properties id="gemfireProperties">
+		<prop key="name">CacheUsingPdxNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
 	<bean id="autoSerializer" class="com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer"/>
 
-	<gfe:cache pdx-serializer-ref="autoSerializer" pdx-read-serialized="true" pdx-persistent="true" pdx-disk-store="pdxStore"/>
+	<gfe:cache properties-ref="gemfireProperties" pdx-serializer-ref="autoSerializer" pdx-read-serialized="true"
+			   pdx-persistent="true" pdx-disk-store="pdxStore"/>
 
 </beans>
-
diff --git a/src/test/resources/org/springframework/data/gemfire/config/dynamic-region-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/dynamic-region-ns.xml
index 7e343493..fa4e840c 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/dynamic-region-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/dynamic-region-ns.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	default-lazy-init="true"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	    http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
 
-	<gfe:cache>
+	<util:properties id="gemfireProperties">
+		<prop key="name">DynamicRegionNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties">
         <gfe:dynamic-region-factory persistent="false" register-interest="false" disk-dir="/foo"/>
     </gfe:cache>
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/function-service-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/function-service-ns.xml
index 37e5af17..36b9b0d5 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/function-service-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/function-service-ns.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	default-lazy-init="true"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+" default-lazy-init="true">
 
     <gfe:function-service>
         <gfe:function>
@@ -15,7 +13,7 @@
          <ref bean="function2"/>
         </gfe:function>
     </gfe:function-service>
-    
+
     <bean id="function2" class="org.springframework.data.gemfire.config.FunctionServiceNamespaceTest.Function2"/>
+
 </beans>
-    
\ No newline at end of file
diff --git a/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
index de3deaa9..d3aa8ca3 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/gateway-v6-ns.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">GatewayV6NamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
-	<gfe:cache use-bean-factory-locator="false"/>
 	<gfe:replicated-region id="region-with-gateway" enable-gateway="true" hub-id="gateway-hub"/>
+
     <gfe:gateway-hub id="gateway-hub" manual-start="true">
         <gfe:gateway gateway-id="gateway">
             <gfe:gateway-listener>
@@ -23,9 +32,9 @@
             <gfe:gateway-endpoint port="2345" host="host2" endpoint-id="endpoint2"/>
         </gfe:gateway>
     </gfe:gateway-hub>
- 
- <!-- SGF-169 -->   
+
+ 	<!-- SGF-169 -->
     <gfe:gateway-hub id="uniDirectionalHub" manual-start="true" port="22222" startup-policy="none">
 	</gfe:gateway-hub>
  
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
index 343a5879..449f859d 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/index-ns.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		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.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-		default-lazy-init="true">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
 
 	<!-- all beans are lazy to allow the same config to be used between multiple tests -->
 	<!-- as there can be only one cache per VM -->
-	
-	
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">IndexNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:index id="simple" expression="status" from="/test-index" type="FUNCTIONAL"/>
-	
+
 	<gfe:index id="complex" name="complex-index" expression="tsi.name" from="/test-index tsi" type="HASH" imports="import java.util"/>
-	
-	<gfe:cache />
-	
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-ns.xml
index 2e6786ef..f3aca7fe 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-ns.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache>
+	<util:properties id="gemfireProperties">
+		<prop key="name">JndiBindingNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties">
 		<gfe:jndi-binding jndi-name="SimpleDataSource"
 						  type="SimpleDataSource"
 						  blocking-timeout-seconds="40"
diff --git a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml
index cea728ac..9adb6832 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/jndi-binding-with-property-placeholders-ns.xml
@@ -11,6 +11,12 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
+	<util:properties id="gemfireProperties">
+		<prop key="name">JndiBindingWithPropertyPlaceholdersNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
 	<util:properties id="jndi-binding-settings">
 		<prop key="jndi.binding.name">testDataSource</prop>
 		<prop key="jndi.binding.type">XAPoolDataSource</prop>
@@ -36,7 +42,7 @@
 
 	<context:property-placeholder properties-ref="jndi-binding-settings"/>
 
-	<gfe:cache lazy-init="true">
+	<gfe:cache properties-ref="gemfireProperties" lazy-init="true">
 		<gfe:jndi-binding jndi-name="${jndi.binding.name}"
 						  type="${jndi.binding.type}"
 						  blocking-timeout-seconds="${jndi.binding.blocking.timeout.seconds}"
diff --git a/src/test/resources/org/springframework/data/gemfire/config/local-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/local-ns.xml
index 236406c4..cf8872a3 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/local-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/local-ns.xml
@@ -2,14 +2,22 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
 	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 " default-lazy-init="true">
 
-	<gfe:cache/>
-	
+	<util:properties id="gemfireProperties">
+		<prop key="name">LocalNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:local-region id="simple"/>
 
 	<gfe:local-region id="pub" name="publisher"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/membership-attributes-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/membership-attributes-ns.xml
index 3eba8ee3..1eceacd8 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/membership-attributes-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/membership-attributes-ns.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd" default-lazy-init="true">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">MembershipAttributesNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
-	<gfe:cache />
-	
 	<gfe:replicated-region id="secure">
-        <gfe:membership-attributes 
-        required-roles="ROLE1,ROLE2" 
-        loss-action="limited-access"
-        resumption-action="reinitialize"/>
+        <gfe:membership-attributes required-roles="ROLE1,ROLE2" loss-action="limited-access"
+								   resumption-action="reinitialize"/>
     </gfe:replicated-region>
 
     <gfe:replicated-region id="simple"/>
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
index 60fb0f55..fffe7af1 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/partitioned-ns.xml
@@ -12,6 +12,12 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
+	<util:properties id="gemfireProperties">
+		<prop key="name">PartitionedNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
 	<util:properties id="props">
 		<prop key="copies">1</prop>
 		<prop key="totalBuckets">4</prop>
@@ -19,7 +25,7 @@
 
 	<context:property-placeholder properties-ref="props"/>
 
-	<gfe:cache/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:partitioned-region id="simple"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml
index ea2bff73..0245c853 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/pool-ns.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		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.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">PoolNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<context:property-placeholder location="classpath:port.properties"/>
 
-	<!-- all beans are lazy to allow the same config to be used between multiple tests -->
-	<!-- as there can be only one cache per VM -->
-	
-	
 	<gfe:pool>
 		<gfe:locator host="localhost" port="${gfe.port}"/>
 	</gfe:pool>
-	
-	<gfe:cache />
-	
+
 	<gfe:pool id="complex" free-connection-timeout="6000" retry-attempts="30" ping-interval="5000" subscription-enabled="true" multi-user-authentication="false" pr-single-hop-enabled="true">
 		<gfe:server host="localhost" port="${gfe.port.4}"/>
 		<gfe:server host="localhost" port="40405"/>
 	</gfe:pool>
-	
-	<context:property-placeholder location="classpath:port.properties"/>
-</beans>
\ No newline at end of file
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
index 483390e1..14391315 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/replicated-ns.xml
@@ -2,13 +2,21 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
 	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 " default-lazy-init="true">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">ReplicatedNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="simple" concurrency-checks-enabled="false" close="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/config/server-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/server-ns.xml
index eac20c8c..04a78435 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/server-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/server-ns.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		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.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">ServerNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<context:property-placeholder location="classpath:port.properties"/>
 
 	<bean id="bean1" class="org.springframework.data.gemfire.Init"/>
 
@@ -23,6 +32,4 @@
 
 	<bean id="bean2" class="org.springframework.data.gemfire.Init"/>
 
-	<context:property-placeholder location="classpath:port.properties"/>
-
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml
index ef750f40..8c98310a 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/subregion-ns.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SubRegionNamespaceConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
     <gfe:replicated-region id="parent">
         <gfe:replicated-region name="child">
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregion-with-inconsistent-datapolicy-persistent-settings.xml b/src/test/resources/org/springframework/data/gemfire/config/subregion-with-inconsistent-datapolicy-persistent-settings.xml
index 5217e35e..7078f054 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/subregion-with-inconsistent-datapolicy-persistent-settings.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/subregion-with-inconsistent-datapolicy-persistent-settings.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
 	<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SubRegionWithInconsistentDataPolicyAndPersistentSettingsTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Parent" persistent="false" destroy="true">
 		<gfe:replicated-region name="Child" data-policy="REPLICATE" persistent="true"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregion-with-invalid-datapolicy.xml b/src/test/resources/org/springframework/data/gemfire/config/subregion-with-invalid-datapolicy.xml
index d3377812..59079d94 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/subregion-with-invalid-datapolicy.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/subregion-with-invalid-datapolicy.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
 	<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SubRegionWithInvalidDataPolicyTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Parent" persistent="false" destroy="true">
 		<gfe:replicated-region name="Child" data-policy="PERSISTENT_PARTITION"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml
index 13840793..f3795302 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/subregionsubelement-ns.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
+	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SubRegionSubElementNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Parent" persistent="false">
 		<gfe:replicated-region name="Child" persistent="false">
diff --git a/src/test/resources/org/springframework/data/gemfire/config/subscription-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/subscription-ns.xml
index 79c3a368..b9d0ddda 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/subscription-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/subscription-ns.xml
@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	default-lazy-init="true"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd">
+" default-lazy-init="true">
 
-		<gfe:cache/>
-        <gfe:replicated-region id="replicALL">
-			<gfe:subscription type="ALL"/>	
-        </gfe:replicated-region>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SubscriptionNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
 
-        <gfe:partitioned-region id="partCACHE_CONTENT">
-        	<gfe:subscription type="CACHE_CONTENT"/>
-        	<gfe:eviction threshold="70"/>
-        </gfe:partitioned-region>
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<gfe:replicated-region id="replicALL">
+		<gfe:subscription type="ALL"/>
+	</gfe:replicated-region>
+
+	<gfe:partitioned-region id="partCACHE_CONTENT">
+		<gfe:subscription type="CACHE_CONTENT"/>
+		<gfe:eviction threshold="70"/>
+	</gfe:partitioned-region>
 
 
-        <gfe:partitioned-region id="partDEFAULT">
-        	<gfe:subscription/>
-        </gfe:partitioned-region>
-        
-</beans>
\ No newline at end of file
+	<gfe:partitioned-region id="partDEFAULT">
+		<gfe:subscription/>
+	</gfe:partitioned-region>
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/tx-listeners-and-writers.xml b/src/test/resources/org/springframework/data/gemfire/config/tx-listeners-and-writers.xml
index 78ece0d3..e53148e9 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/tx-listeners-and-writers.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/tx-listeners-and-writers.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:p="http://www.springframework.org/schema/p"
-	default-lazy-init="true"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+" default-lazy-init="true">
 
-	<gfe:cache>
-        <gfe:transaction-listener ref="txListener1"/>
-        <gfe:transaction-listener ref="txListener2"/>
-        <gfe:transaction-writer ref="txWriter"/>
-     </gfe:cache>
-     
-     <gfe:client-cache id="client-cache" >
-        <gfe:transaction-listener ref="txListener1"/>
-        <gfe:transaction-listener ref="txListener2"/>
-        <gfe:transaction-writer ref="txWriter"/>
-     </gfe:client-cache>
+	<util:properties id="gemfireProperties">
+		<prop key="name">TransactionListenersAndWritersTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
 
-    <bean id="txListener1" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestListener"/>
-    <bean id="txListener2" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestListener"/>
-    <bean id="txWriter" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestWriter"/>
-</beans>
\ No newline at end of file
+	<gfe:cache properties-ref="gemfireProperties">
+		<gfe:transaction-listener ref="txListener1"/>
+		<gfe:transaction-listener ref="txListener2"/>
+		<gfe:transaction-writer ref="txWriter"/>
+	</gfe:cache>
+
+	<gfe:client-cache id="client-cache">
+		<gfe:transaction-listener ref="txListener1"/>
+		<gfe:transaction-listener ref="txListener2"/>
+		<gfe:transaction-writer ref="txWriter"/>
+	</gfe:client-cache>
+
+	<bean id="txListener1" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestListener"/>
+	<bean id="txListener2" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestListener"/>
+	<bean id="txWriter" class="org.springframework.data.gemfire.config.TxEventHandlersTest.TestWriter"/>
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/config/tx-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/tx-ns.xml
index ffeb4a37..121474a1 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/tx-ns.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/tx-ns.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
-	<gfe:cache />
-	
-	<gfe:transaction-manager cache-ref="gemfireCache" copy-on-read="false" />
-</beans>
\ No newline at end of file
+	<util:properties id="gemfireProperties">
+		<prop key="name">TransactionNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<gfe:transaction-manager cache-ref="gemfireCache" copy-on-read="false"/>
+
+</beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml b/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml
index 8d0afaba..d7c67965 100644
--- a/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml
+++ b/src/test/resources/org/springframework/data/gemfire/diskstore-using-propertyplaceholders-config.xml
@@ -23,7 +23,13 @@
 
 	<context:property-placeholder properties-ref="diskStoreConfiguration"/>
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">DiskStoreUsingPropertyPlaceholdersTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:disk-store id="TestDataStore"
 					allow-force-compaction="${allowForceCompaction}"
diff --git a/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml b/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml
index 904c52ea..4173111d 100644
--- a/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/enableClientRegionLookupsTest.xml
@@ -9,17 +9,17 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="clientCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoClientRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
 	<gfe:pool min-connections="1" max-connections="1">
 		<gfe:server host="localhost" port="54321"/>
 	</gfe:pool>
 
-	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="clientCacheConfigurationSettings"/>
+	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:client-region id="NativeClientRegion" ignore-if-exists="true"
 		cloning-enabled="true"
diff --git a/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml b/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml
index e0605291..97dc6e03 100644
--- a/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/enableRegionLookupsTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireEnableRegionLookupsTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:local-region id="NativeLocalRegion" ignore-if-exists="true"
 		cloning-enabled="true"
diff --git a/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml b/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml
index b6d1e5a1..7f74af98 100644
--- a/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/function/GemfireFunctionProxyFactoryBeanTest-context.xml
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
-  
- <gfe:cache/>
- 
- <gfe:replicated-region id="someRegion" />
-   
- 
- <bean id="functionTemplate" 
- 	class="org.springframework.data.gemfire.function.GemfireFunctionTemplate">
- 	<constructor-arg ref="gemfire-cache"/>
- 	<property name="timeout" value="1000"/>
- </bean>
- 
- <bean id="foo" class="org.springframework.data.gemfire.function.GemfireFunctionProxyFactoryBean">
-    <constructor-arg value="org.springframework.data.gemfire.function.foo.IFoo"/>
-    <constructor-arg value="org.springframework.data.gemfire.function.foo.Foo"/>
-    <constructor-arg ref="functionTemplate"/>
-    <property name="regionName" value="someRegion"/>
- </bean>
+	<util:properties id="gemfireProperties">
+		<prop key="name">GemfireFunctionProxyFactoryBeanTest</prop>
+		<prop key="statistic-sampling-enabled">false</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
+	<gfe:replicated-region id="someRegion"/>
+
+	<bean id="functionTemplate"
+		  class="org.springframework.data.gemfire.function.GemfireFunctionTemplate">
+		<constructor-arg ref="gemfire-cache"/>
+		<property name="timeout" value="1000"/>
+	</bean>
+
+	<bean id="foo" class="org.springframework.data.gemfire.function.GemfireFunctionProxyFactoryBean">
+		<constructor-arg value="org.springframework.data.gemfire.function.foo.IFoo"/>
+		<constructor-arg value="org.springframework.data.gemfire.function.foo.Foo"/>
+		<constructor-arg ref="functionTemplate"/>
+		<property name="regionName" value="someRegion"/>
+	</bean>
 
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml b/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml
index 3b9f2b6a..9438ab38 100644
--- a/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests-context.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">FunctionExecutionIntegrationTests</prop>
+		<prop key="statistic-sampling-enabled">false</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
-	<gfe:cache use-bean-factory-locator="false"/>
 	<gfe:replicated-region id="r1"/>
-	 
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml b/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml
index c53c5c1c..fc1b659e 100644
--- a/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests-context.xml
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd">
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">XmlConfiguredFunctionExecutionIntegrationTests</prop>
+		<prop key="statistic-sampling-enabled">false</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
-	<gfe:cache/>
 	<gfe:local-region id="r1"/>
+
 	<gfe-data:function-executions base-package="org.springframework.data.gemfire.function.config.two"/>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml b/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml
index 45b43530..86f7f362 100644
--- a/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests-server-context.xml
@@ -12,15 +12,18 @@
 ">
 
 	<util:properties id="gemfireProperties">
-		<prop key="name">FunctionIntegrationTestsServer</prop>
+		<prop key="name">FunctionIntegrationTestsServerContext</prop>
 		<prop key="statistic-sampling-enabled">false</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
 	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:cache-server port="15243"/>
+
 	<gfe:partitioned-region id="test-region"/>
+
 	<gfe:annotation-driven/>
 
 	<context:component-scan base-package="org.springframework.data.gemfire.function.execution"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml b/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml
index 5cef86a7..29b1fbbd 100644
--- a/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml
+++ b/src/test/resources/org/springframework/data/gemfire/invalid-region-shortcut-with-persistent-attribute.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
   ">
 
 	<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">InvalidRegionShortcutAndPersistentAttributeTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="InvalidReplicate" persistent="false" shortcut="REPLICATE_PERSISTENT_OVERFLOW"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml b/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml
index 2e3fa76e..e51f15c7 100644
--- a/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml
+++ b/src/test/resources/org/springframework/data/gemfire/invalid-use-of-region-datapolicy-and-shortcut.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
   ">
 
 	<bean class="org.springframework.data.gemfire.test.GemfireTestBeanPostProcessor"/>
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">InvalidUseOfRegionDataPolicyAndShortcutTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:partitioned-region id="InvalidPartition" data-policy="PARTITION" shortcut="PARTITION_REDUNDANT_PERSISTENT"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/listener/container.xml b/src/test/resources/org/springframework/data/gemfire/listener/container.xml
index dfd27d2c..31973ba8 100644
--- a/src/test/resources/org/springframework/data/gemfire/listener/container.xml
+++ b/src/test/resources/org/springframework/data/gemfire/listener/container.xml
@@ -1,39 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:gfe="http://www.springframework.org/schema/gemfire"
-		xmlns:task="http://www.springframework.org/schema/task"
-		xmlns:util="http://www.springframework.org/schema/util"
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-				http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-				http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+	   	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
 
 	<util:properties id="props">
-		<prop key="mcast-port">0</prop>
 		<prop key="name">cq-client</prop>
+		<prop key="mcast-port">0</prop>
 		<prop key="log-level">warning</prop>
 	</util:properties>
-	
+
 	<gfe:client-cache use-bean-factory-locator="false"/>
 
 	<gfe:pool id="client" subscription-enabled="true">
 		<gfe:server host="localhost" port="40404"/>
 	</gfe:pool>
-	 
-	<task:executor id="testTaskExecutor" />
-	 			
+
+	<task:executor id="testTaskExecutor"/>
+
 	<gfe:cq-listener-container id="testContainerId" cache="gemfireCache" pool-name="client">
 		<!-- default handle method -->
 		<gfe:listener ref="testBean1" query="SELECT * from /test-cq"/>
 		<gfe:listener ref="testBean1" query="SELECT * from /test-cq" name="test-bean-1" method="handleQuery"/>
 		<gfe:listener ref="testBean2" query="SELECT * from /test-cq" durable="false"/>
 	</gfe:cq-listener-container>
-	
+
 	<bean id="testBean1" class="org.springframework.data.gemfire.listener.GemfireMDP"/>
 	<bean id="testBean2" class="org.springframework.data.gemfire.listener.ThrowableEventListener"/>
-	
+
 	<bean id="handler" class="org.springframework.data.gemfire.listener.StubErrorHandler"/>
-	
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml b/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml
index 51fb4f06..e87f7a84 100644
--- a/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml
+++ b/src/test/resources/org/springframework/data/gemfire/lookupSubRegion.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireLookupSubRegionTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/subregion-cache.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/subregion-cache.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:lookup-region id="/Customers/Accounts"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml
index f92bdb99..7a7f7529 100644
--- a/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noClientRegionLookupTest.xml
@@ -9,17 +9,17 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="clientCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoClientRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
 	<gfe:pool min-connections="1" max-connections="1">
 		<gfe:server host="localhost" port="54321"/>
 	</gfe:pool>
 
-	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="clientCacheConfigurationSettings"/>
+	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:client-region id="NativeClientRegion" persistent="false" shortcut="PROXY"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml
index 0aaf02d8..aa32b344 100644
--- a/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noClientSubRegionLookupTest.xml
@@ -9,17 +9,17 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="clientCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoClientSubRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
 	<gfe:pool min-connections="1" max-connections="1">
 		<gfe:server host="localhost" port="54321"/>
 	</gfe:pool>
 
-	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="clientCacheConfigurationSettings"/>
+	<gfe:client-cache cache-xml-location="/clientcache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:lookup-region id="NativeClientParentRegion">
 		<gfe:client-region name="NativeClientChildRegion" persistent="false" shortcut="PROXY"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml b/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml
index 6fdf1b4b..9484ee5c 100644
--- a/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noDuplicateRegionDefinitionsTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoDuplicateRegionDefinitionsTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="regionOne" name="AppDataRegion" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml
index 2219c378..13d61176 100644
--- a/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noLocalRegionLookupTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoLocalRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:local-region id="NativeLocalRegion" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml
index 7d88412c..f1d74c39 100644
--- a/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noPartitionRegionLookupTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoPartitionRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:partitioned-region id="NativePartitionRegion" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml
index 13abe32b..2e4d19d9 100644
--- a/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noReplicateRegionLookupTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoReplicateRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="NativeReplicateRegion" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml b/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml
index 7de79b80..d8af099d 100644
--- a/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/noSubRegionLookupTest.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireNoSubRegionLookupTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache cache-xml-location="/cache-with-regions.xml" properties-ref="gemfireProperties"/>
 
 	<gfe:lookup-region id="NativeParentRegion">
 		<gfe:replicated-region name="NativeChildRegion" persistent="true"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml b/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml
index 0a55bce2..ee0ff446 100644
--- a/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml
+++ b/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	   xmlns:p="http://www.springframework.org/schema/p"
 	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
   ">
 
-	<util:properties id="peerCacheConfigurationSettings">
-		<prop key="log-level">config</prop>
+	<util:properties id="gemfireProperties">
 		<prop key="name">pdxDiskStoreTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 	<!--
 	  <util:properties id="peerCacheConfigurationSettings" location="classpath:gemfire.properties"/>
@@ -40,7 +40,7 @@
 	  </gfe:disk-store>
 	  -->
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings" pdx-serializer-ref="autoSerializer" pdx-persistent="true" pdx-disk-store="pdxStore"/>
+	<gfe:cache properties-ref="gemfireProperties" pdx-serializer-ref="autoSerializer" pdx-persistent="true" pdx-disk-store="pdxStore"/>
 
 	<gfe:disk-store id="dataStore" auto-compact="true" compaction-threshold="75" queue-size="50" max-oplog-size="10" time-interval="600000">
 		<gfe:disk-dir location="./gemfire/data-store/" max-size="50"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml b/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml
index 6903943f..79bdfb09 100644
--- a/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml
+++ b/src/test/resources/org/springframework/data/gemfire/region-datapolicy-shortcuts.xml
@@ -4,18 +4,18 @@
 	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
   ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireRegionDataPolicyShortcutsIntegrationTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:local-region id="LocalWithDataPolicy" data-policy="NORMAL"/>
 	<gfe:local-region id="LocalWithShortcut" shortcut="LOCAL_PERSISTENT"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml
index 4bb68ce9..d7a7225f 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-	<gfe:cache/>
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">RepositoryClientRegionTestsServerContext</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<gfe:cache-server/>
+
 	<gfe:replicated-region id="region" name="simple"/>
+
 	<bean class="org.springframework.data.gemfire.repository.sample.RegionPopulator">
 		<property name="region" ref="region"/>
 	</bean>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
index 4da44dfa..516ec5fd 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/partitioned-region-repo-context.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xmlns:repo="http://www.springframework.org/schema/data/repository"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
 		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache use-bean-factory-locator="false"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">PartitionedRegionRepoContextConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
 	<gfe:partitioned-region id="simple"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
index 9f653301..a1a7f6fe 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/config/repo-context.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:gfe="http://www.springframework.org/schema/gemfire"
-    xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xmlns:repo="http://www.springframework.org/schema/data/repository"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
 		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
 		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache use-bean-factory-locator="false"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">RepoContextConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
 
 	<gfe:replicated-region id="simple"/>
     <gfe:replicated-region id="person"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml
index 13885704..e2d81fe2 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest-context.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
-		<prop key="name">springGemFireAlgorithmRepositoryTest</prop>
-		<prop key="log-level">config</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SpringGemFireAlgorithmRepositoryTest</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Algorithms" persistent="false" key-constraint="java.lang.String"
 						   value-constraint="org.springframework.data.gemfire.repository.sample.Algorithm"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml
index d8fcee60..20e4bd30 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/AnimalRepositoryTest-context.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireAnimalRepositoryTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region
 		id="Cats"
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/IncompatibleRegionKeyEntityIdAnimalRepositoryTest-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/IncompatibleRegionKeyEntityIdAnimalRepositoryTest-context.xml
index 18f872ab..70002ee1 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/IncompatibleRegionKeyEntityIdAnimalRepositoryTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/IncompatibleRegionKeyEntityIdAnimalRepositoryTest-context.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFireIncompatibleRegionKeyEntityIdAnimalRepositoryTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region
 		id="Rabbits"
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/PersonRepositoryTest-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/PersonRepositoryTest-context.xml
index a726db4b..6abf9370 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/PersonRepositoryTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/PersonRepositoryTest-context.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfireConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFirePersonRepositoryTest</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfireConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="simple" persistent="false" key-constraint="java.lang.Long"
 						   value-constraint="org.springframework.data.gemfire.repository.sample.Person"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/PlantRepositoryTest-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/PlantRepositoryTest-context.xml
index b948050a..d81a8ed7 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/PlantRepositoryTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/PlantRepositoryTest-context.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">springGemFirePlantRepositoryTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region
 		id="Plants"
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml
index 0f23e203..6e652ac5 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/repositoryQueriesWithJoins.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfireConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">RepositoryQueriesWithJoinsIntegrationTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfireConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Customers" persistent="false" key-constraint="java.lang.Long"
 						   value-constraint="org.springframework.data.gemfire.repository.sample.Customer"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml
index 24d47355..4ee97590 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/subregionRepository.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">cacheInitializationTest</prop>
-		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Users" persistent="false">
 		<gfe:replicated-region name="Programmers" persistent="false"/>
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
index b5a2db3f..f5626c27 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/sample/userRepositoryQueriesIntegrationTest.xml
@@ -13,13 +13,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
+	<util:properties id="gemfireProperties">
 		<prop key="name">UserRepositoryQueriesIntegrationTest</prop>
 		<prop key="mcast-port">0</prop>
-		<prop key="log-level">config</prop>
+		<prop key="log-level">warning</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Users" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml b/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml
index 1764ef8f..165a60b6 100644
--- a/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/repository/support/PersonRepositoryIntegrationTests-context.xml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
-	xmlns:repo="http://www.springframework.org/schema/data/repository"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
+	   xmlns:repo="http://www.springframework.org/schema/data/repository"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire-1.3.xsd
-		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire-1.3.xsd
+		http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
 		http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">PersonRepositoryIntegrationTestsContextConfig</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:local-region id="simple"/>
 
 	<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample">
-		<repo:include-filter type="assignable" expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
+		<repo:include-filter type="assignable"
+							 expression="org.springframework.data.gemfire.repository.sample.PersonRepository"/>
 	</gfe-data:repositories>
 
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml
index f2b1e83e..dfc9f745 100644
--- a/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/support/GemfirePersistenceExceptionTranslationTest-context.xml
@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:gfe="http://www.springframework.org/schema/gemfire"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		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.xsd">
-	
-	<context:component-scan base-package="org.springframework.data.gemfire.support"/>
-	<gfe:cache/>
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+">
+
+	<util:properties id="gemfireProperties">
+		<prop key="name">GemfirePersistenceExceptionTranslation</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
+
 	<bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
+
+	<context:component-scan base-package="org.springframework.data.gemfire.support"/>
+
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml b/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml
index 52c5e8d3..96d9987d 100644
--- a/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/support/sample/initializer-gemfire-context.xml
@@ -2,13 +2,23 @@
 <!-- data source Spring XML configuration file and meta-data, using GemFire -->
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache use-bean-factory-locator="false"/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">SpringContextBootstrappingInitializerTest</prop>
+		<prop key="statistic-sampling-enabled">false</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">config</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties" use-bean-factory-locator="false"/>
+
 	<gfe:replicated-region id="TestRegion" persistent="false"/>
 
 </beans>
diff --git a/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml
index f644d847..f53756fc 100644
--- a/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest-context.xml
@@ -9,13 +9,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="gemfirePeerCacheConfigurationSettings">
-		<prop key="name">SpringDataGemFirePeerCache</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">ManualGatewayReceiverStartIntegrationTest</prop>
 		<prop key="mcast-port">0</prop>
 		<prop key="log-level">config</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="gemfirePeerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:replicated-region id="Example" persistent="false"/>
 
diff --git a/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml b/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml
index 45184d08..7bc8032e 100644
--- a/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml
+++ b/src/test/resources/org/springframework/data/gemfire/wan/asyncEventQueueWithListener.xml
@@ -10,13 +10,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<util:properties id="peerCacheConfigurationSettings">
-		<prop key="name">springGemFirePeerCache</prop>
+	<util:properties id="gemfireProperties">
+		<prop key="name">AsyncEventQueueWithListenerTest</prop>
 		<prop key="log-level">config</prop>
 		<prop key="mcast-port">0</prop>
 	</util:properties>
 
-	<gfe:cache properties-ref="peerCacheConfigurationSettings"/>
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:async-event-queue id="Q1" name="QueueOne" persistent="false" parallel="false" maximum-queue-memory="50"
 						   dispatcher-threads="4">