diff --git a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java
index b09e7f6d..cb3eaed3 100644
--- a/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java
@@ -74,7 +74,7 @@ class ClientRegionParser extends AbstractRegionParser {
 		}
 
 		ParsingUtils.setPropertyValue(element, regionBuilder, "name");
-		ParsingUtils.setPropertyValue(element, regionBuilder, "data-policy", "dataPolicyName");
+		ParsingUtils.setPropertyValue(element, regionBuilder, "data-policy");
 		ParsingUtils.setPropertyValue(element, regionBuilder, "ignore-if-exists", "lookupEnabled");
 		ParsingUtils.setPropertyValue(element, regionBuilder, "persistent");
 		ParsingUtils.setPropertyValue(element, regionBuilder, "pool-name");
diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
index b97074e6..2c3366e8 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
@@ -156,8 +156,8 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
 			gatewaySenderFactory.addGatewayTransportFilter(transportFilter);
 		}
 
-		GatewaySenderWrapper wrapper = new GatewaySenderWrapper(gatewaySenderFactory.create(getName(),
-			remoteDistributedSystemId));
+		GatewaySenderWrapper wrapper =
+			new GatewaySenderWrapper(gatewaySenderFactory.create(getName(), remoteDistributedSystemId));
 
         wrapper.setManualStart(manualStart);
         gatewaySender = wrapper;
diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java
index 78b4021b..4967a91b 100644
--- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java
@@ -72,7 +72,7 @@ import org.springframework.util.ObjectUtils;
  * @see org.springframework.data.gemfire.config.xml.ClientRegionParser
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="client-ns.xml", initializers = GemFireMockObjectsApplicationContextInitializer.class)
+@ContextConfiguration(locations = "client-ns.xml", initializers = GemFireMockObjectsApplicationContextInitializer.class)
 @SuppressWarnings("unused")
 public class ClientRegionNamespaceTest {
 
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
index 366c3105..e3e72c6f 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
@@ -46,15 +46,19 @@ import org.springframework.data.gemfire.TestUtils;
  */
 public class GatewaySenderFactoryBeanTest {
 
-	private Cache mockCacheWithGatewayInfrastructure(final GatewaySenderFactory gatewaySenderFactory) {
+	private Cache mockCacheWithGatewayInfrastructure(GatewaySenderFactory gatewaySenderFactory) {
+
 		Cache mockCache = mock(Cache.class);
+
 		when(mockCache.createGatewaySenderFactory()).thenReturn(gatewaySenderFactory);
+
 		return mockCache;
 	}
 
-	private GatewaySenderFactory mockGatewaySenderFactory(final String gatewaySenderName,
-			final int remoteDistributedSystemId) {
+	private GatewaySenderFactory mockGatewaySenderFactory(String gatewaySenderName, int remoteDistributedSystemId) {
+
 		GatewaySenderFactory mockGatewaySenderFactory = mock(GatewaySenderFactory.class);
+
 		GatewaySender mockGatewaySender = mock(GatewaySender.class);
 
 		when(mockGatewaySender.getId()).thenReturn(gatewaySenderName);
@@ -206,11 +210,11 @@ public class GatewaySenderFactoryBeanTest {
 		GatewaySenderFactory mockGatewaySenderFactory =
 			mockGatewaySenderFactory("g7", 51);
 
-		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
-			mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
+		GatewaySenderFactoryBean factoryBean =
+			new GatewaySenderFactoryBean(mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
 
-		factoryBean.setName("g4");
-		factoryBean.setRemoteDistributedSystemId(21);
+		factoryBean.setName("g7");
+		factoryBean.setRemoteDistributedSystemId(51);
 		factoryBean.setParallel(false);
 		factoryBean.setDispatcherThreads(1);
 		factoryBean.doInit();
@@ -220,8 +224,8 @@ public class GatewaySenderFactoryBeanTest {
 		GatewaySender gatewaySender = factoryBean.getObject();
 
 		assertNotNull(gatewaySender);
-		assertEquals("g4", gatewaySender.getId());
-		assertEquals(21, gatewaySender.getRemoteDSId());
+		assertEquals("g7", gatewaySender.getId());
+		assertEquals(51, gatewaySender.getRemoteDSId());
 	}
 
 	@Test
@@ -257,8 +261,8 @@ public class GatewaySenderFactoryBeanTest {
 		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
 			mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
 
-		factoryBean.setName("g7");
-		factoryBean.setRemoteDistributedSystemId(51);
+		factoryBean.setName("g5");
+		factoryBean.setRemoteDistributedSystemId(42);
 		factoryBean.setDiskSynchronous(true);
 		factoryBean.doInit();